Skip to content

C
CRM
Commit 1ff3b5a2 authored by zhengke's avatar zhengke
Browse files
Options

no message

parent 25a8916c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 139 deletions
src/components/contractManagement/contractManagement.vue
View file @ 1ff3b5a2
......@@ -186,7 +186,7 @@
</div>
<div>
<el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
:page-sizes="[15, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
......
src/components/customerManage/customerOrder.vue
View file @ 1ff3b5a2
......@@ -200,7 +200,7 @@
<orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore" :superManage="superManage"></orderList>
<div>
<el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
:page-sizes="[15, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
......@@ -214,6 +214,24 @@
},
data() {
return {
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
}, {
Name: '签证',
Id: '2'
}, {
Name: '地接',
Id: '3'
}, {
Name: '套餐',
Id: '4'
}, {
Name: '其他',
Id: '5'
}
],
superManage:"订单统计",
StatModel:{},// 合计
loading:false,
......@@ -351,6 +369,18 @@
});
};
addList(data);
data.forEach(item=>{
if(item.OrderType){
let list = item.OrderType&&item.OrderType.split(',')
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList.push(this.MultipleChoiceList[i])
}
}
}
}
})
this.dataList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count;
this.StatModel = res.data.data.StatModel
......
src/components/customerManage/myCustomerOrder.vue
View file @ 1ff3b5a2
......@@ -183,7 +183,7 @@
<orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore"></orderList>
<div>
<el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
:page-sizes="[15, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
......@@ -197,6 +197,24 @@
},
data() {
return {
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
}, {
Name: '签证',
Id: '2'
}, {
Name: '地接',
Id: '3'
}, {
Name: '套餐',
Id: '4'
}, {
Name: '其他',
Id: '5'
}
],
StatModel:{},// 合计
loading:false,
total:0,
......@@ -332,6 +350,18 @@
});
};
addList(data);
data.forEach(item=>{
if(item.OrderType){
let list = item.OrderType&&item.OrderType.split(',')
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList.push(this.MultipleChoiceList[i])
}
}
}
}
})
this.dataList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count;
this.StatModel = res.data.data.StatModel
......
src/components/customerManage/orderList.vue
View file @ 1ff3b5a2
This diff is collapsed.
src/components/guestManagement/Agreement.vue
View file @ 1ff3b5a2
......@@ -162,7 +162,7 @@
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.OrderId}}
<!-- <p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.OrderId}}</p> -->
<!-- <p v-for="(item,index) in scope.row.MultipleChoiceList">{{item.Name}}</p> -->
</template>
</el-table-column>
<el-table-column fixed label="业务员" show-overflow-tooltip :width="120">
......@@ -416,7 +416,6 @@
$this.MsgBus.$on("closeBillMaking", function() {
for(let i=0;i<$this.dataList.length;i++){
$this.dataList[i].checkList = []
$this.dataList[i].MultipleChoiceList = []
$this.dataList[i].selectedType = ""
$this.dataList[i].actuallyReceived = false
$this.dataList[i].cost = false
......@@ -428,7 +427,6 @@
popCancelClick(row, index, num){
this.dataList.forEach(item=>{
item.checkList = []
item.MultipleChoiceList = []
item.selectedType = ''
item.actuallyReceived =false
item.cost =false
......@@ -441,17 +439,8 @@
return
}
this.makeAdocumentFun(row, index, num)
if(num==1){
if(this.dataList[index].checkList.length==1){
}else{
this.dataList[index].actuallyReceived =false
}
}
if(num==3){
this.dataList[index].cost =false
}
this.dataList[index].actuallyReceived =false
this.dataList[index].cost =false
},
// 查看出票凭据
......@@ -535,7 +524,6 @@
},
// 制作单据
makeAdocument(row, index, num) {
this.dataList[index].MultipleChoiceList=[]
let list = row.OrderType&&row.OrderType.split(',')
if(list!=null&&list.length>1&&num==1){
this.dataList.forEach(item=>{
......@@ -545,13 +533,6 @@
return item.actuallyReceived = false
})
this.dataList[index].actuallyReceived = true
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
this.dataList[index].MultipleChoiceList.push(this.MultipleChoiceList[i])
}
}
}
}
else if(list!=null&&list.length>1&&num==3){
......@@ -562,18 +543,16 @@
return item.cost = false
})
this.dataList[index].cost = true
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
this.dataList[index].MultipleChoiceList.push(this.MultipleChoiceList[i])
}
}
}
}else{
this.makeAdocumentFun(row, index, num)
}
},
makeAdocumentFun(row, index, num){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url = this.domainManager().erpRoutingUrl
let data
let list = row.OrderType&&row.OrderType.split(',')
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator()
......@@ -582,17 +561,11 @@
if(list&&list.length>1){
let typeList = row.selectedType.split(',')
if(num=='1'&&typeList.length>=2){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本anceId2 = num
let $this = this;
row.ReFinanceId2 = num
this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true);
}if(typeList.length==1&&num=='1'||num=='3'){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url = this.domainManager().erpRoutingUrl
let data = [{
data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
OtherType: 55,
......@@ -605,17 +578,12 @@
window.open(href);
for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false
}
}if(num=='2'){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url = this.domainManager().erpRoutingUrl
let data = [{
data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
OtherType: 55,
......@@ -627,7 +595,6 @@
window.open(href);
for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false
......@@ -635,11 +602,6 @@
}
}else{
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url = this.domainManager().erpRoutingUrl
let data
if(num==1||num==2){
data = [{
path: 'ChoiceAddFinancialDocuments',
......@@ -665,7 +627,6 @@
window.open(href);
for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false
......@@ -819,6 +780,19 @@
});
};
addList(data);
data.forEach(item=>{
if(item.OrderType){
let list = item.OrderType&&item.OrderType.split(',')
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList.push(this.MultipleChoiceList[i])
}
}
}
}
})
this.dataList = data;
this.total = res.data.data.count;
this.loading = false
......
src/components/guestManagement/ticketOrder.vue
View file @ 1ff3b5a2
......@@ -1064,7 +1064,7 @@
ground:{
title:"地接",
WBMoney:0,//原币总金额
OriginalFee:"",//原币手续费
OriginalFee:0,//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"",
detailList:[
......@@ -1096,7 +1096,7 @@
airTickets:{
title:"机票",
WBMoney:0,//原币总金额
OriginalFee:"",//原币手续费
OriginalFee:0,//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"",
detailList:[
......@@ -1458,7 +1458,7 @@
OtherType:this.BillMaking.OtherType,//默认=55
ReFinanceId:this.obj.OrderId,//订单ID
ReFinanceId2:this.obj.ReFinanceId2,//类型 1收款
GuestId:this.GuestId,//客人ID
GuestId:this.obj.GuestId,//客人ID
RelevanceFrId:"",//订单类型 1机票 2签证 3地接 4套餐 5其他
vorcherInos:[],
detailList:[]
......@@ -2003,10 +2003,6 @@
this.$message.warning('请输入机票单价');
return
}
if(item.Remark==""){
this.$message.warning('请输入机票备注');
return
}
})
this.obj.checkList.indexOf('2')!=-1&&this.visa.detailList.forEach(item=>{
if(!item.CostTypeId){
......@@ -2021,10 +2017,6 @@
this.$message.warning('请输入签证单价');
return
}
if(item.Remark==""){
this.$message.warning('请输入签证备注');
return
}
})
this.obj.checkList.indexOf('3')!=-1&&this.ground.detailList.forEach(item=>{
if(!item.CostTypeId){
......
src/components/planeTicketOrder/index.vue
View file @ 1ff3b5a2
......@@ -319,16 +319,10 @@
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:page-sizes="[30, 60,90,100]"
:page-size="msg.pageSize"
layout="total,prev,sizes,pager,next"
:total="total"
style="margin-top: 12px; float: right">
</el-pagination>
<div v-if="total>0">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" :page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" @size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment