Skip to content

S
SuperMan
Commit 6835fcb9 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

团队收支

parent 1a715cca
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 5 deletions
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 6835fcb9
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
<li :class="active==3?'_active':''" @click="active=3,tabData(3)">挂账单</li> <li :class="active==3?'_active':''" @click="active=3,tabData(3)">挂账单</li>
<li :class="active==4?'_active':''" @click="active=4,tabData(4)">责让单</li> <li :class="active==4?'_active':''" @click="active=4,tabData(4)">责让单</li>
</ul> </ul>
<ul class="_nav clearfix" v-else> <ul class="_nav ceshi clearfix" v-else>
<li :class="active==1?'_active':''" v-if="showTab==1">{{$t('fnc.shoukuandan')}}</li> <li :class="active==1?'_active':''" v-if="showTab==1">{{$t('fnc.shoukuandan')}}</li>
<li :class="active==2?'_active':''" v-if="showTab==2">{{$t('fnc.fukuandan')}}</li> <li :class="active==2?'_active':''" v-if="showTab==2">{{$t('fnc.fukuandan')}}</li>
<li :class="active==3?'_active':''" v-if="showTab==3">挂账单</li> <li :class="active==3?'_active':''" v-if="showTab==3">挂账单</li>
<li :class="active==4?'_active':''" v-else>责让单</li> <li :class="active==4?'_active':''" v-if="showTab==4">责让单</li>
</ul> </ul>
<!-- 搜索框匹配 --> <!-- 搜索框匹配 -->
<div style="margin:10px 0;"> <div style="margin:10px 0;">
...@@ -118,6 +118,8 @@ ...@@ -118,6 +118,8 @@
this.$router.push({ name: "addReceivablesDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}}) this.$router.push({ name: "addReceivablesDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
}else if(this.active==2){ }else if(this.active==2){
this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}}) this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
}else if(this.active==4){
this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":2,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
}else { }else {
this.$router.push({ name: "addFinancialGZDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增挂账单'}}) this.$router.push({ name: "addFinancialGZDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增挂账单'}})
} }
...@@ -244,9 +246,12 @@ ...@@ -244,9 +246,12 @@
this.GetList = this.collectList; this.GetList = this.collectList;
} else if(this.showTab==3){ } else if(this.showTab==3){
this.GetList = this.GZList; this.GetList = this.GZList;
}else{ }else if(this.showTab==2){
this.GetList = this.payList; this.GetList = this.payList;
} }
else if(this.showTab==4){
this.GetList = this.ZRList;
}
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1; this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
this.orderObj = this.$route.query.orderObj; this.orderObj = this.$route.query.orderObj;
this.Financial_post_GetList(); this.Financial_post_GetList();
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 6835fcb9
...@@ -1163,8 +1163,11 @@ export default { ...@@ -1163,8 +1163,11 @@ export default {
}, },
Financial_post_GetCostTypeList(id,type){ //获取支出费用类型 Financial_post_GetCostTypeList(id,type){ //获取支出费用类型
this.apipost('Financial_post_GetCostTypeList',{ID:id}, res => { this.apipost('Financial_post_GetCostTypeList',{ID:id}, res => {
console.log("this.res",res.data)
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.GetCostTypeList = res.data.data; this.GetCostTypeList = res.data.data;
console.log("this.GetCostTypeList",this.GetCostTypeList)
if(type){ if(type){
this.msg.detailList.forEach(x=>{ this.msg.detailList.forEach(x=>{
this.GetCostTypeList.forEach(y=>{ this.GetCostTypeList.forEach(y=>{
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 6835fcb9
...@@ -612,6 +612,7 @@ ...@@ -612,6 +612,7 @@
<div class="TB_comtitle TB-Title">成本</div> <div class="TB_comtitle TB-Title">成本</div>
<template v-if="IsHaveAuth"> <template v-if="IsHaveAuth">
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" /> <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
<input type="button" value="团队责让" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" />
</template> </template>
</div> </div>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
...@@ -1036,6 +1037,59 @@ ...@@ -1036,6 +1037,59 @@
</tr> </tr>
</template> </template>
</table> </table>
<!-- 团队责让 -->
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">内部结算：
<span v-if="moneyAll.tdzryf>0 || moneyAll.tdzrsf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.tdzryf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.tdzrsf)}}</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="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">其他： <div class="TB_comtitle TB-Title">其他：
...@@ -1058,7 +1112,7 @@ ...@@ -1058,7 +1112,7 @@
</tr> </tr>
<template v-for="item in DataList.FinicePayList"> <template v-for="item in DataList.FinicePayList">
<tr <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,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')"> 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,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')">
<td> <td>
<el-checkbox v-model="item.checked"></el-checkbox> <el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span> <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
...@@ -1457,6 +1511,10 @@ ...@@ -1457,6 +1511,10 @@
// 保险费 // 保险费
baoxianyf: 0, baoxianyf: 0,
baoxiansf: 0, baoxiansf: 0,
// 保险费
tdzryf: 0,
tdzrsf: 0,
// 其他收入 // 其他收入
otheryf: 0, otheryf: 0,
othersf: 0, othersf: 0,
...@@ -1680,6 +1738,9 @@ ...@@ -1680,6 +1738,9 @@
this.moneyAll.peichangsf = 0; this.moneyAll.peichangsf = 0;
this.moneyAll.baoxianyf = 0; this.moneyAll.baoxianyf = 0;
this.moneyAll.baoxiansf = 0; this.moneyAll.baoxiansf = 0;
this.moneyAll.tdzryf = 0;
this.moneyAll.tdzrsf = 0;
this.moneyAll.otheryf = 0; this.moneyAll.otheryf = 0;
this.moneyAll.othersf = 0; this.moneyAll.othersf = 0;
this.moneyAll.leaderyf = 0; this.moneyAll.leaderyf = 0;
...@@ -1797,6 +1858,12 @@ this.moneyAll.otheryTotalsf+=item.PayMoney; ...@@ -1797,6 +1858,12 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
this.moneyAll.baoxianyf += item.Money; this.moneyAll.baoxianyf += item.Money;
this.moneyAll.baoxiansf += item.PayMoney; this.moneyAll.baoxiansf += item.PayMoney;
} }
// 保险费
if (that.isExists(item.CostTypeList, '机票责让费')) {
this.moneyAll.tdzryf += item.Money;
this.moneyAll.tdzrsf += item.PayMoney;
}
// 其他 // 其他
if (that.NotExists(item.CostTypeList, '签证费') && that.NotExists(item.CostTypeList, '签证佣金') && that 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
...@@ -1807,7 +1874,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney; ...@@ -1807,7 +1874,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
.CostTypeList, '国际段机票') && that.NotExists(item.CostTypeList, '机票退税') && that.NotExists(item .CostTypeList, '国际段机票') && that.NotExists(item.CostTypeList, '机票退税') && that.NotExists(item
.CostTypeList, '机票罚金') && that.NotExists(item.CostTypeList, '机票税金') && item.OrderSource !== .CostTypeList, '机票罚金') && that.NotExists(item.CostTypeList, '机票税金') && item.OrderSource !==
11 && that.NotExists(item.CostTypeList, '赔偿') && that.NotExists(item.CostTypeList, '保险费') && 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.otheryf += item.Money;
this.moneyAll.othersf += item.PayMoney; this.moneyAll.othersf += item.PayMoney;
} }
...@@ -1859,6 +1926,25 @@ this.moneyAll.otheryTotalsf+=item.PayMoney; ...@@ -1859,6 +1926,25 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
} }
}); });
}, },
//团队责让
TDZR() {
var TCArr = [this.TCID];
let orderObj = {
OrderID: 0,
OrderSource: 8,
Obj: {},
TCIDList: TCArr
}
this.$router.push({
name: "ChoiceAddFinancialDocuments",
query: {
Type: 4,
companyID: this.OutBranchId,
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
});
},
//支出跳转 //支出跳转
AddOutDetail() { AddOutDetail() {
var TCArr = [this.TCID]; var TCArr = [this.TCID];
......
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