Skip to content

S
SuperMan
Commit eed3d651 authored by youjie's avatar youjie
Browse files
Options

no message

parent 84bff7f4
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 27 deletions
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ eed3d651
...@@ -829,11 +829,11 @@ ...@@ -829,11 +829,11 @@
</tr> </tr>
<template v-for="item in DataList.FinicePayList"> <template v-for="item in DataList.FinicePayList">
<!-- <tr v-if='item.OrderSource===4 || isExists(item.CostTypeList,'国际段机票')'> --> <!-- <tr v-if='item.OrderSource===4 || isExists(item.CostTypeList,'国际段机票')'> -->
<tr v-if="(isExists(item.CostTypeList,'国际段机票') <tr v-if="(isExists(item.CostTypeList,'国际段机票')
|| item.OrderSource===4 || item.OrderSource===4
|| isExists(item.CostTypeList,'机票退税') || isExists(item.CostTypeList,'机票退税')
|| isExists(item.CostTypeList,'机票罚金') || isExists(item.CostTypeList,'机票罚金')
|| isExists(item.CostTypeList,'机票税金')) || isExists(item.CostTypeList,'机票税金'))
|| isExists(item.CostTypeList,'国内联运段机票')"> || isExists(item.CostTypeList,'国内联运段机票')">
<td> <td>
<el-checkbox v-model="item.checked"></el-checkbox> <el-checkbox v-model="item.checked"></el-checkbox>
...@@ -1211,24 +1211,24 @@ ...@@ -1211,24 +1211,24 @@
<tr v-if="NotExists(item.CostTypeList,'领队奖励金') <tr v-if="NotExists(item.CostTypeList,'领队奖励金')
&&NotExists(item.CostTypeList,'机票折让费') &&NotExists(item.CostTypeList,'机票折让费')
&&NotExists(item.CostTypeList,'签证费') &&NotExists(item.CostTypeList,'签证费')
&&NotExists(item.CostTypeList,'签证佣金') &&NotExists(item.CostTypeList,'签证佣金')
&& NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（领取）')
&& NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'地接费（结算）')
&& NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'提成')
&& NotExists(item.CostTypeList,'国内联运') && NotExists(item.CostTypeList,'国内联运')
&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'车资')
&& NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'邀请函费用')
&& NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'名单表费')
&& NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'领队佣金')
&& NotExists(item.CostTypeList,'导游佣金') && NotExists(item.CostTypeList,'导游佣金')
&&item.OrderSource!==4 &&item.OrderSource!==4
&& NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'国际段机票')
&& NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票退税')
&& NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票罚金')
&& NotExists(item.CostTypeList,'机票税金') && NotExists(item.CostTypeList,'机票税金')
&& item.OrderSource!==11 && item.OrderSource!==11
&& NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'赔偿')
&& NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'保险费')
&& NotExists(item.CostTypeList,'旅游责任险') && NotExists(item.CostTypeList,'旅游责任险')
&& NotExists(item.CostTypeList,'团队保险')"> && NotExists(item.CostTypeList,'团队保险')">
<td> <td>
...@@ -2026,7 +2026,8 @@ ...@@ -2026,7 +2026,8 @@
}, },
zhaunBox: function () { zhaunBox: function () {
let flag = false let flag = false
this.DataList.FinicePayList.forEach(x => { // FinicePayList 未排除重复数据
this.DataList.newFinicePayList2.forEach(x => {
if (x.checked) { if (x.checked) {
flag = true flag = true
this.zhuanMsg.FrIds += x.FrID + ',' this.zhuanMsg.FrIds += x.FrID + ','
...@@ -2130,7 +2131,12 @@ ...@@ -2130,7 +2131,12 @@
data.FiniceReciveList.forEach(x => { data.FiniceReciveList.forEach(x => {
x.checked = false; x.checked = false;
}) })
let objData2 = function (obj) {
obj.forEach(x=>{
x.checked = false
})
}
objData2(data.newFinicePayList2)
this.DataList = data; this.DataList = data;
data.FinicePayList.forEach(item => { data.FinicePayList.forEach(item => {
if ((that.isExists(item.CostTypeList, '国际段机票') || if ((that.isExists(item.CostTypeList, '国际段机票') ||
...@@ -2294,18 +2300,18 @@ ...@@ -2294,18 +2300,18 @@
}) })
// if(this.moneyAll.dijieys>0 || this.moneyAll.dijiess>0){ // if(this.moneyAll.dijieys>0 || this.moneyAll.dijiess>0){
// } // }
// if(this.moneyAll.zifeiys>0 || this.moneyAll.zifeiss>0){ // if(this.moneyAll.zifeiys>0 || this.moneyAll.zifeiss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.zifeiys; // this.moneyAll.otheryTotalyf+=this.moneyAll.zifeiys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.zifeiss; // this.moneyAll.otheryTotalsf+=this.moneyAll.zifeiss;
// } // }
// if(this.moneyAll.xiaofeiys>0 || this.moneyAll.xiaofeiss>0){ // if(this.moneyAll.xiaofeiys>0 || this.moneyAll.xiaofeiss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.xiaofeiys; // this.moneyAll.otheryTotalyf+=this.moneyAll.xiaofeiys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.xiaofeiss; // this.moneyAll.otheryTotalsf+=this.moneyAll.xiaofeiss;
// } if(this.moneyAll.yongjinys>0 || this.moneyAll.yongjinss>0){ // } if(this.moneyAll.yongjinys>0 || this.moneyAll.yongjinss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.yongjinys; // this.moneyAll.otheryTotalyf+=this.moneyAll.yongjinys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.yongjinss; // this.moneyAll.otheryTotalsf+=this.moneyAll.yongjinss;
// } // }
} }
}); });
}, },
......
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