Skip to content

S
SuperMan
Commit 481c2e48 authored by liudong1993's avatar liudong1993
Browse files
Options

1 金蝶导入 + 地接费结算调整

parent a85a2891
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 6 deletions
src/components/FinancialModule/Kingdee/RecPayQuery.vue
View file @ 481c2e48
......@@ -1095,10 +1095,10 @@
}
}
})
let cmsg='是否确认标记此查询条件的下所有财务单据以导入至金蝶？';
if(refinanceIdList){
let cmsg='是否确认标记此查询条件的下所有财务单据已导入至金蝶？';
if(refinanceIdList.length>0){
this.msg.ReFinanceIds = refinanceIdList.join(',');
cmsg ='是否确认标记勾选的'+refinanceIdList.length+'张财务单据以导入至金蝶？';
cmsg ='是否确认标记勾选的'+refinanceIdList.length+'张财务单据已导入至金蝶？';
}
this.$confirm(cmsg, '提示', {
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 481c2e48
......@@ -1667,6 +1667,16 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "TotalDJMoney",
formatter: this.moneyFormat,
title: "地接款汇总(不进利润)",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "ZiFei",
formatter: this.moneyFormat,
......@@ -2447,6 +2457,7 @@ export default {
"其他",
"地接款支出",
"地接款收入",
"地接款汇总(不进利润)",
"自费收入",
"小费收入",
"单据小费",
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 481c2e48
......@@ -1356,7 +1356,60 @@
</tr>
<template v-for="item in DataList.FinicePayList">
<tr
v-if="(isExists(item.CostTypeList,'地接费（领取）') || (isExists(item.CostTypeList,'地接费（结算）'))) && item.Type==2">
v-if="(isExists(item.CostTypeList,'地接费（领取）') || (isExists(item.CostTypeList,'地接费（结算）')) || (isExists(item.CostTypeList,'国内团导游报账')) || (isExists(item.CostTypeList,'国内地接费领取'))) && item.Type==2">
<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" v-if="DataList.DJFinanceList && DataList.DJFinanceList.length>0">
<div class="TB_comtitle TB-Title">地接款原单（不进利润）：
<span v-if="moneyAll.dijieTyf>0 || moneyAll.dijieTsf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.dijieTyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.dijieTsf)}}</span>
</span>
</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-if="DataList.DJFinanceList && DataList.DJFinanceList.length>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.DJFinanceList">
<tr
v-if="item.Type==2">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1574,6 +1627,8 @@
&& NotExists(item.CostTypeList,'签证')
&& NotExists(item.CostTypeList,'地接费（领取）')
&& NotExists(item.CostTypeList,'地接费（结算）')
&& NotExists(item.CostTypeList,'国内团导游报账')
&& NotExists(item.CostTypeList,'国内地接费领取')
&& NotExists(item.CostTypeList,'提成')
&& NotExists(item.CostTypeList,'国内联运')
&& NotExists(item.CostTypeList,'车')
......@@ -2072,6 +2127,11 @@
// 成本 地接
dijieyf: 0,
dijiesf: 0,
// 汇总 地接原单
dijieTyf: 0,
dijieTsf: 0,
// 成本 赔偿
peichangyf: 0,
peichangsf: 0,
......@@ -2511,6 +2571,8 @@
this.moneyAll.tichengsf = 0;
this.moneyAll.dijieyf = 0;
this.moneyAll.dijiesf = 0;
this.moneyAll.dijieTyf = 0;
this.moneyAll.dijieTsf = 0;
this.moneyAll.peichangyf = 0;
this.moneyAll.peichangsf = 0;
this.moneyAll.baoxianyf = 0;
......@@ -2565,6 +2627,8 @@
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, '车') &&
......@@ -2684,8 +2748,8 @@
this.moneyAll.tichengsf += item.PayMoney;
}
// 地接
if ((that.isExists(item.CostTypeList, '地接费（领取）') || (that.isExists(item.CostTypeList,
'地接费（结算）'))) && item.Type == 2) {
if ((that.isExists(item.CostTypeList, '地接费（领取）') || (that.isExists(item.CostTypeList,'地接费（结算）'))
|| (that.isExists(item.CostTypeList,'国内团导游报账'))|| (that.isExists(item.CostTypeList,'国内地接费领取'))) && item.Type == 2) {
this.moneyAll.dijieyf += item.Money;
this.moneyAll.dijiesf += item.PayMoney;
......@@ -2709,6 +2773,7 @@
// 其他
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, '订餐')
......@@ -2739,6 +2804,10 @@
this.moneyAll.RefundAll += item.Money;
this.moneyAll.PayRefundAll += item.PayMoney;
})
this.DataList.DJFinanceList.forEach(item =>{
this.moneyAll.dijieTyf += item.Money;
this.moneyAll.dijieTsf += item.PayMoney;
})
}
});
......
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