Skip to content

S
SuperMan
Commit ee2c8d15 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent fce84cd9
Show whitespace changes
Inline Side-by-side
Showing with 256 additions and 75 deletions
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ ee2c8d15
......@@ -1526,6 +1526,36 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "RoomFee",
formatter: this.moneyFormat,
title: "房费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "MealFee",
formatter: this.moneyFormat,
title: "餐费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "TicketFee",
formatter: this.moneyFormat,
title: "门票费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "JiPiao",
formatter: this.moneyFormat,
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ ee2c8d15
......@@ -795,7 +795,10 @@
</tr>
<template v-for="item in DataList.FiniceReciveList">
<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,'佣金收入')&& item.OrderSource!==7">
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,'佣金收入')&& item.OrderSource!==7">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
......@@ -940,6 +943,164 @@
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">房费：
<span v-if="moneyAll.cheziyf>0 || moneyAll.chezisf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.fangyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.fangsf)}}</span>
</span>
</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">费用类型</th>
<th width="500">交易明细</th>
<th width="300">金额</th>
<th width="200">交易日期</th>
<th width="250">制单人员</th>
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'房')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
<td>
<div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率 {{childItem.Rate}}</span>
</div>
</td>
<td style="font-size:14px;">
应付：{{item.Money}}<br />
实付：{{item.PayMoney}}
</td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.EmName}}</div>
<div class="Team_btmDiv">{{item.CreateDate}}</div>
</td>
<td>{{item.StatusStr}}</td>
<td>
<div v-for="AuditItem in item.AuditList">
{{AuditItem.EmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
</td>
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">餐费：
<span v-if="moneyAll.cheziyf>0 || moneyAll.chezisf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.canyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.cansf)}}</span>
</span>
</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">费用类型</th>
<th width="500">交易明细</th>
<th width="300">金额</th>
<th width="200">交易日期</th>
<th width="250">制单人员</th>
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'餐费')
||isExists(item.CostTypeList,'订餐')
||isExists(item.CostTypeList,'餐厅')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
<td>
<div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率 {{childItem.Rate}}</span>
</div>
</td>
<td style="font-size:14px;">
应付：{{item.Money}}<br />
实付：{{item.PayMoney}}
</td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.EmName}}</div>
<div class="Team_btmDiv">{{item.CreateDate}}</div>
</td>
<td>{{item.StatusStr}}</td>
<td>
<div v-for="AuditItem in item.AuditList">
{{AuditItem.EmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
</td>
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">门票：
<span v-if="moneyAll.cheziyf>0 || moneyAll.chezisf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.menpiaoyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.menpiaosf)}}</span>
</span>
</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">费用类型</th>
<th width="500">交易明细</th>
<th width="300">金额</th>
<th width="200">交易日期</th>
<th width="250">制单人员</th>
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'门票')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
<td>
<div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率 {{childItem.Rate}}</span>
</div>
</td>
<td style="font-size:14px;">
应付：{{item.Money}}<br />
实付：{{item.PayMoney}}
</td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.EmName}}</div>
<div class="Team_btmDiv">{{item.CreateDate}}</div>
</td>
<td>{{item.StatusStr}}</td>
<td>
<div v-for="AuditItem in item.AuditList">
{{AuditItem.EmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
</td>
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">机票款：
<span v-if="moneyAll.ticketyf>0 || moneyAll.ticketsf>0">
......@@ -1345,19 +1506,24 @@
</tr>
<template v-for="item in DataList.newFinicePayList2">
<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,'导游佣金')
&&item.OrderSource!==4
&& item.OrderSource!==4
&& NotExists(item.CostTypeList,'国际段机票')
&& NotExists(item.CostTypeList,'机票退税')
&& NotExists(item.CostTypeList,'机票罚金')
......@@ -1815,6 +1981,15 @@
// 成本 车资
cheziyf: 0,
chezisf: 0,
// 成本 房费
fangyf: 0,
fangsf: 0,
// 成本 餐费
canyf: 0,
cansf: 0,
// 成本 门票
menpiaoyf: 0,
menpiaosf: 0,
// 成本 机票款
ticketyf: 0,
......@@ -2152,7 +2327,7 @@
NotExists(array, str) {
var flag = true;
array.forEach(item => {
if (item == str && flag) {
if (item.indexOf(str)!=-1 && flag) {
flag = false;
}
});
......@@ -2252,6 +2427,12 @@
this.moneyAll.yqhsf = 0;
this.moneyAll.cheziyf = 0;
this.moneyAll.chezisf = 0;
this.moneyAll.fangyf = 0;
this.moneyAll.fangsf = 0;
this.moneyAll.canyf = 0;
this.moneyAll.cansf = 0;
this.moneyAll.menpiaoyf = 0;
this.moneyAll.menpiaosf = 0;
this.moneyAll.ticketyf = 0;
this.moneyAll.ticketsf = 0;
this.moneyAll.qzyf = 0;
......@@ -2317,7 +2498,12 @@
that.NotExists(item.CostTypeList, '地接费（结算）') &&
that.NotExists(item.CostTypeList, '提成') &&
that.NotExists(item.CostTypeList, '国内联运') &&
that.NotExists(item.CostTypeList, '车资') &&
that.NotExists(item.CostTypeList, '车') &&
that.NotExists(item.CostTypeList, '房') &&
that.NotExists(item.CostTypeList, '餐费') &&
that.NotExists(item.CostTypeList, '订餐') &&
that.NotExists(item.CostTypeList, '餐厅') &&
that.NotExists(item.CostTypeList, '门票') &&
that.NotExists(item.CostTypeList, '邀请函费用') &&
that.NotExists(item.CostTypeList, '名单表费') &&
that.NotExists(item.CostTypeList, '领队佣金') &&
......@@ -2384,11 +2570,27 @@
this.moneyAll.yqhsf += item.PayMoney;
}
// 车资
if (that.isExists(item.CostTypeList, '车资')) {
if (that.isExists(item.CostTypeList, '车')) {
this.moneyAll.cheziyf += item.Money;
this.moneyAll.chezisf += item.PayMoney;
}
// 房
if (that.isExists(item.CostTypeList, '房')) {
this.moneyAll.fangyf += item.Money;
this.moneyAll.fangsf += item.PayMoney;
}
// 餐
if (that.isExists(item.CostTypeList, '餐费')
||that.isExists(item.CostTypeList, '订餐')
||that.isExists(item.CostTypeList, '餐厅')) {
this.moneyAll.canyf += item.Money;
this.moneyAll.cansf += item.PayMoney;
}
// 门票
if (that.isExists(item.CostTypeList, '门票')) {
this.moneyAll.menpiaoyf += item.Money;
this.moneyAll.menpiaosf += item.PayMoney;
}
// 机票款 数组
if (that.isExists(item.CostTypeList, '国际段机票') || item.OrderSource === 4 || that.isExists(item
......@@ -2436,16 +2638,19 @@
}
// 其他
if (that.NotExists(item.CostTypeList, '签证费') && that.NotExists(item.CostTypeList, '签证佣金') && that
.NotExists(item.CostTypeList, '地接费（领取）') && that.NotExists(item.CostTypeList, '地接费（结算）') && that
.NotExists(item.CostTypeList, '提成') && that.NotExists(item.CostTypeList, '国内联运') && that
.NotExists(item.CostTypeList, '车资') && that.NotExists(item.CostTypeList, '邀请函费用') && that
.NotExists(item.CostTypeList, '名单表费') && that.NotExists(item.CostTypeList, '领队佣金') && that
.NotExists(item.CostTypeList, '导游佣金') && item.OrderSource !== 4 && that.NotExists(item
.CostTypeList, '国际段机票') && that.NotExists(item.CostTypeList, '机票退税') && that.NotExists(item
.CostTypeList, '机票罚金') && that.NotExists(item.CostTypeList, '机票税金') && item.OrderSource !==
11 && that.NotExists(item.CostTypeList, '赔偿') && that.NotExists(item.CostTypeList, '保险费') &&
that.NotExists(item.CostTypeList, '旅游责任险')&& that.NotExists(item.CostTypeList, '团队保险') && that.NotExists(item.CostTypeList, '机票折让费')) {
if (that.NotExists(item.CostTypeList, '签证费') && that.NotExists(item.CostTypeList, '签证佣金')
&& that.NotExists(item.CostTypeList, '地接费（领取）') && that.NotExists(item.CostTypeList, '地接费（结算）')
&& that.NotExists(item.CostTypeList, '提成') && that.NotExists(item.CostTypeList, '国内联运')
&& that.NotExists(item.CostTypeList, '车')&& that.NotExists(item.CostTypeList, '房')
&& that.NotExists(item.CostTypeList, '餐费')&& that.NotExists(item.CostTypeList, '订餐')
&& that.NotExists(item.CostTypeList, '餐厅')&& that.NotExists(item.CostTypeList, '门票')
&& that.NotExists(item.CostTypeList, '邀请函费用') && that.NotExists(item.CostTypeList, '名单表费')
&& that.NotExists(item.CostTypeList, '领队佣金') && that
.NotExists(item.CostTypeList, '导游佣金') && item.OrderSource !== 4 && that.NotExists(item.CostTypeList, '国际段机票')
&& that.NotExists(item.CostTypeList, '机票退税') && that.NotExists(item.CostTypeList, '机票罚金')
&& that.NotExists(item.CostTypeList, '机票税金') && item.OrderSource !==11 && that.NotExists(item.CostTypeList, '赔偿')
&& that.NotExists(item.CostTypeList, '保险费') &&that.NotExists(item.CostTypeList, '旅游责任险')
&& that.NotExists(item.CostTypeList, '团队保险')&& that.NotExists(item.CostTypeList, '机票折让费')) {
this.moneyAll.otheryf += item.Money;
this.moneyAll.othersf += item.PayMoney;
}
......@@ -2461,20 +2666,6 @@
}
})
// if(this.moneyAll.dijieys>0 || this.moneyAll.dijiess>0){
// }
// if(this.moneyAll.zifeiys>0 || this.moneyAll.zifeiss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.zifeiys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.zifeiss;
// }
// if(this.moneyAll.xiaofeiys>0 || this.moneyAll.xiaofeiss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.xiaofeiys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.xiaofeiss;
// } if(this.moneyAll.yongjinys>0 || this.moneyAll.yongjinss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.yongjinys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.yongjinss;
// }
}
});
......@@ -2587,45 +2778,6 @@
}
});
},
//权限验证
checkHasAuth() {
// this.apipost(
// 'travel_get_CheckBalancePaymentAuth', {
// TCID: this.TCID
// },
// res => {
// if (res.data.resultCode == 1) {
// this.IsHaveAuth=true;
// }
// else
// {
// this.IsHaveAuth=false;
// }
// },
// err => {}
// )
},
//判断数组是否存在 值
// isExists(arr, item) {
// var flag = false;
// for (var i = 0; i < arr.length; i++) {
// if (arr[i].indexOf(item)!=-1) {
// flag = true;
// break;
// }
// }
// return flag;
// }
// isExists: function (arr, item) {
// var flag = false;
// for (var i = 0; i < arr.length; i++) {
// if (arr[i] == item) {
// flag = true;
// break;
// }
// }
// return flag;
// },
},
mounted() {
......@@ -2644,7 +2796,6 @@
if (ActionMenuCode.indexOf('isIncomeExpenditure') != -1) {
this.isIncomeExpenditure = true
}
this.checkHasAuth();
this.getList();
this.getdataInfo();
this.getDocList();
......
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