Skip to content

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

no message

parent b57bdeb6
Show whitespace changes
Inline Side-by-side
Showing with 2129 additions and 1325 deletions
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ e14c9660
......@@ -42,6 +42,7 @@
<li v-for="(item,index) in NewItems">
<template v-if="(item.IsShow === 1 || item.showYes) && item.bigShow">
<div class="_left">
{{item.Id}}
<span class="_Icon">{{item.Name.substring(0,1)}}</span>
<div>
<p class="_t">{{item.Name}}</p>
......@@ -313,6 +314,7 @@
else if (t==4) {
this.GetList = this.ZRList;
}
if(this.GetList.length<1){
this.noData = true;
}else{
......@@ -337,6 +339,7 @@
this.apipost('Financial_post_GetList',{},res=>{
if(res.data.resultCode==1){
let data = res.data.data;
let list = [94,95,96,97,51,52,54,55,49,50,57,58,88,89]
if(data){
data.forEach(x => {
// 5-8 OrderSource 为5 并且当前登录人为吴珊，只显示49和50
......@@ -381,13 +384,21 @@
if(x.Type==1){
this.collectList.push(x);
}else if (x.Type==2){
// noTypeCost 不是leaderReimbursement制单排除流程
if(this.$route.query.noTypeCost){
if(x.Id!=94&&x.Id!=95&&x.Id!=96&&x.Id!=97&&x.Id!=51&&x.Id!=52&&x.Id!=54&&
x.Id!=55&&x.Id!=49&&x.Id!=50&&x.Id!=57&&x.Id!=88&&x.Id!=89){
this.payList.push(x);
}
}
if(!this.$route.query.noTypeCost){
this.payList.push(x);
}
}else if (x.Type==7){
this.GZList.push(x);
}else if (x.Type==8){
this.ZRList.push(x);
}
});
}
this.GetList = this.collectList;
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ e14c9660
......@@ -846,11 +846,12 @@
@click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span>
<span
v-if="(GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64"
@click="Gourl(GetDetail)"
@click="Gourl('OPsalesCommissiondetails',GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span
v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState && GetDetail.OtherType!=63 && GetDetail.OtherType!=64"
@click="GoOPurl(GetDetail)"
v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState
&& GetDetail.OtherType!=63 && GetDetail.OtherType!=64"
@click="GoOPurl('OpComPersonDetails',GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)"
style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
......@@ -1756,9 +1757,9 @@
},
GoOPurl(GetDetail) {
GoOPurl(path,GetDetail) {
this.$router.push({
name: 'OPsalesCommissiondetails',
name: path,
query: {
PeriodId: GetDetail.ReFinanceId,
OutBranchId: String(GetDetail.RB_Branch_Id),
......
src/components/FinancialModule/OpCommission/OPcommissionPeriods.vue
View file @ e14c9660
......@@ -245,14 +245,14 @@
Money=item.SumPrice
}
let obj = {
CostType: 16,
CostType: 16,//112
Money: Money,
CurrencyId: 1,
XSTC: 1,
OtherType:73,
ReFinanceId: item.ID,
isRB_Branch_Id: true,
RB_Branch_Id: this.msg.OutBranchId
RB_Branch_Id: this.msg.OutBranchId,
}
let query = {
blank: "y",
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ e14c9660
......@@ -1425,6 +1425,7 @@
this.msg.ReFinanceId = this.orderObj.ReFinanceId ? this.orderObj.ReFinanceId : 0;
this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2 ? this.orderObj.ReFinanceId2 : 0;
this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : [];
this.msg.EduCommissionEmp = this.orderObj.EduCommissionEmp ? this.orderObj.EduCommissionEmp: null
}
// 台湾提成汇率
if (this.orderObj && this.orderObj.Rate && this.orderObj.Money) {
......@@ -1563,6 +1564,16 @@
}
})
}).catch(() => {
if(this.orderObj&&(this.orderObj.EduCommissionEmp||this.orderObj.queryObj)){
location.reload()
this.$router.push({
name: 'leaderReimbursement',
query: {
...this.orderObj.queryObj,
'blank': 'y',
}
});
}else{
this.$router.push({
name: 'FinancialDocuments',
query: {
......@@ -1570,6 +1581,7 @@
'InPay': this.$route.query.InPay
}
});
}
});
} else {
this.resultCode = res.data.resultCode;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ e14c9660
<template>
<div class="mb30" v-loading='loading'>
<div style="display: flex;justify-content: end;margin-top: 10px;margin-bottom: 10px;">
<p><span class="groupTourOrderByTuan_ico"><i style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</div>
<table class="leaderReimbursementTableNav" border="0" cellspacing="1" cellpadding="0">
<tr>
<th width="8%">出团公司</th>
......@@ -39,9 +44,15 @@
</td>
</tr>
</table>
<p class="teamRevenueExpenditureTitle">
车辆
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(5,2)" />
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="17" class="bgwhite">车辆使用 &nbsp;
<th colspan="19" class="bgwhite">车辆使用 &nbsp;
<el-popover width="800" trigger="click" popper-class="DMC_HotelPop">
<table v-if="list&& list.BusShouPeiModel">
<tr>
......@@ -76,6 +87,7 @@
</tr>
<tr class="title">
<th width="90">使用时间</th>
<th width="55"><el-checkbox :indeterminate="isIndeterminate1" v-model="checkedAll1" @change="getCheckedAll(1)"></el-checkbox></th>
<th width="80">司机姓名</th>
<th width="80">司机电话</th>
<th width="90">车牌号</th>
......@@ -91,9 +103,11 @@
<th width="60">总金额</th>
<th width="100">备注</th>
<th width="75">供应商</th>
<th width="110">成本单据</th>
</tr>
<tr v-for='(item,index) in list.BusList'>
<td>{{item.PlanDateStr}}</td>
<td><el-checkbox v-model="item.checked" @change="getChecked(1)"></el-checkbox></td>
<td>{{item.DriverName}}</td>
<td>{{item.DriverTel}}</td>
<td>{{item.BusNum}}</td>
......@@ -174,27 +188,58 @@
:style="{'color': item.SupplierPayType == 2 ? '#E95252': '#111111'}">{{item.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
</span>
</td>
<td>
<div class="row FrIDBox">
<template v-for="(x, i) in item.FrList">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip>
</template>
</div>
</td>
</tr>
<tr v-if="FrListOthen1.length>0">
<td>成本单据</td>
<td colspan="28">
<template v-for="(x, i) in FrListOthen2">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip>
</template>
</td>
</tr>
<template>
<tr>
<td>总金额</td>
<td colspan="16">
<td colspan="17">
<span v-for="item in TotalNav.busPrice">
<span v-if="item.PayType!=1">{{item.Str + '：' +item.TotalPrice}} &nbsp;&nbsp;&nbsp;&nbsp;</span>
</span>
<p v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==4">
<p v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==4">¥
现付：{{plan.PlanTotalPrice}}
</p>
</td>
</tr>
</template>
</table>
<p class="teamRevenueExpenditureTitle">
酒店
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(1,2)" />
</span>
</p>
<table v-if="[131,14, 90].includes(myLineId)" class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="26" class="bgwhite">酒店使用 </th>
<th colspan="28" class="bgwhite">酒店使用 </th>
</tr>
<tr>
<th colspan="26" class="bgwhite">
<th colspan="28" class="bgwhite">
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.10 - 返佣比例 / 100) <br />
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)<br />
司导间【月结】不计入总金额
......@@ -202,6 +247,7 @@
</tr>
<tr class="title">
<th width="90">使用时间</th>
<th><el-checkbox :indeterminate="isIndeterminate2" v-model="checkedAll2" @change="getCheckedAll(2)"></el-checkbox></th>
<th width="150">酒店名称</th>
<th width="150">手配书</th>
<th width="150">更换酒店</th>
......@@ -227,6 +273,7 @@
<th width="100">供应商</th>
<th width="100">状态</th>
<th width="100">备注</th>
<th width="110">成本单据</th>
</tr>
<template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<template v-for="(subItem,subIndex) in outItem.HotelOrderList">
......@@ -234,12 +281,20 @@
<td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length"
style="white-space:nowrap; ">{{outItem.UseTimeStr}}
</td>
<td>
<el-checkbox :indeterminate="isIndeterminate2" v-model="subItem.checked" @change="getChecked(2)"></el-checkbox>
</td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">
<template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''">
<span style="text-decoration:line-through"> {{subItem.HotelName}}</span>
<el-tooltip class="item" effect="dark" :content="subItem.HotelName" placement="bottom">
<span style="text-decoration:line-through">{{subItem.HotelName.substring(0,10)}}</span>
</el-tooltip>
</template>
<template v-else>
{{subItem.HotelName}}
<el-tooltip class="item" effect="dark" :content="subItem.HotelName" placement="bottom">
<span style="text-decoration:line-through">{{subItem.HotelName.substring(0,10)}}</span>
</el-tooltip>
</template>
</td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">
......@@ -247,7 +302,10 @@
style="text-decoration: underline; cursor: pointer;color:red">查看手配书</a>
</td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left;color:red; ">
{{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
<el-tooltip v-if="subItem.HotelName!=subItem.NewHotelName" class="item" effect="dark" :content="subItem.NewHotelName" placement="bottom">
<span style="text-decoration:line-through">{{""+subItem.NewHotelName.substring(0,10)}}</span>
</el-tooltip>
<!-- {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}} -->
</td>
<td v-if="childIndex==0" :rowspan="6">
{{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
......@@ -419,12 +477,35 @@
<td v-if="childIndex==0" :rowspan="6">
{{subItem.Remarks}}
</td>
<td>
<template v-for="(x, i) in subItem.FrList">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip>
</template>
</td>
</tr>
</template>
</template>
<tr v-if="FrListOthen2.length>0">
<td>成本单据</td>
<td colspan="28">
<template v-for="(x, i) in FrListOthen2">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip>
</template>
</td>
</tr>
<tr v-if="TotalNav.planPriceList">
<td>总金额</td>
<td colspan="25">
<td colspan="28">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
<template v-if="IsShowRMB">
......@@ -440,10 +521,10 @@
</table>
<table v-else class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="26" class="bgwhite">酒店使用 </th>
<th colspan="28" class="bgwhite">酒店使用 </th>
</tr>
<tr>
<th colspan="26" class="bgwhite">
<th colspan="28" class="bgwhite">
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.10 - 返佣比例 / 100) <br />
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)<br />
司导间【月结】不计入总金额
......@@ -451,6 +532,7 @@
</tr>
<tr class="title">
<th width="90">使用时间</th>
<th width="50"><el-checkbox :indeterminate="isIndeterminate2" v-model="checkedAll2" @change="getCheckedAll(2)"></el-checkbox></th>
<th width="150">酒店名称</th>
<th width="150">手配书</th>
<th width="150">更换酒店</th>
......@@ -476,6 +558,7 @@
<th width="100">供应商</th>
<th width="100">状态</th>
<th width="100">备注</th>
<th width="110">成本单据</th>
</tr>
<template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<template v-for="(subItem,subIndex) in outItem.HotelOrderList">
......@@ -483,12 +566,19 @@
<td
style="white-space:nowrap; ">{{outItem.UseTimeStr}}
</td>
<td>
<el-checkbox v-model="subItem.checked" @change="getChecked(2)"></el-checkbox>
</td>
<td style="text-align:left; ">
<template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''">
<span style="text-decoration:line-through"> {{subItem.HotelName}}</span>
<el-tooltip class="item" effect="dark" :content="subItem.HotelName" placement="bottom">
<span style="text-decoration:line-through">{{subItem.HotelName.substring(0,10)}}</span>
</el-tooltip>
</template>
<template v-else>
{{subItem.HotelName}}
<el-tooltip class="item" effect="dark" :content="subItem.HotelName" placement="bottom">
<span style="text-decoration:line-through">{{subItem.HotelName.substring(0,10)}}</span>
</el-tooltip>
</template>
</td>
<td style="text-align:left; ">
......@@ -496,7 +586,10 @@
style="text-decoration: underline; cursor: pointer;color:red">查看手配书</a>
</td>
<td style="text-align:left;color:red; ">
{{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
<el-tooltip v-if="subItem.HotelName!=subItem.NewHotelName" class="item" effect="dark" :content="subItem.NewHotelName" placement="bottom">
<span style="text-decoration:line-through">{{""+subItem.NewHotelName.substring(0,10)}}</span>
</el-tooltip>
<!-- {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}} -->
</td>
<td >
{{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
......@@ -631,7 +724,11 @@
<span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td >
<span>{{subItem.SupplierName}}
<span>
<el-tooltip class="item" effect="dark" :content="subItem.SupplierName" placement="bottom">
<span style="text-decoration:line-through">{{subItem.SupplierName.substring(0,5)}}</span>
</el-tooltip>
<!-- {{subItem.SupplierName}} -->
<br />
<template v-if="subItem.SupplierPayType !== 0">
<span v-if="subItem.SupplierPayType == 1"> 现付 </span>
......@@ -663,12 +760,35 @@
<td >
{{subItem.Remarks}}
</td>
<td>
<template v-for="(x, i) in subItem.FrList">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip>
</template>
</td>
</tr>
</template>
</template>
<tr v-if="FrListOthen2.length>0">
<td>成本单据</td>
<td colspan="28">
<template v-for="(x, i) in FrListOthen2">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip>
</template>
</td>
</tr>
<tr v-if="TotalNav.planPriceList">
<td>总金额</td>
<td colspan="25">
<td colspan="28">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
<template v-if="IsShowRMB">
......@@ -682,12 +802,19 @@
</td>
</tr>
</table>
<p class="teamRevenueExpenditureTitle">
餐食
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(2,2)" />
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="13" class="bgwhite">餐食使用</th>
<th colspan="15" class="bgwhite">餐食使用</th>
</tr>
<tr class="title">
<th width="100">使用时间</th>
<th width="55"><el-checkbox :indeterminate="isIndeterminate3" v-model="checkedAll3" @change="getCheckedAll(3)"></el-checkbox></th>
<th width="180">餐厅名称</th>
<th width="100">类别</th>
<th width="100">总人数</th>
......@@ -700,11 +827,15 @@
<th width="">付款方式</th>
<th width="">币种</th>
<th width="100">备注</th>
<th width="110">成本单据</th>
</tr>
<template v-for='(item,index) in list.DiningList'>
<template v-for="(subItem,subIndex) in item.DiningSummaryList">
<tr v-for="(childItem,childIndex) in subItem.DiningPriceList">
<td v-if="childIndex==0&&subIndex==0" :rowspan="3*item.DiningSummaryList.length">{{item.UseTimeStr}}</td>
<td v-if="childIndex==0" :rowspan="3">
<el-checkbox v-model="subItem.checked" @change="getChecked(3)"></el-checkbox>
</td>
<td v-if="childIndex==0" :rowspan="3">
<template v-if="subItem.DiningName!=subItem.NewDiningName">
{{subItem.NewDiningName}}
......@@ -762,12 +893,35 @@
<td v-if="childIndex==0" :rowspan="3">
{{subItem.Remarks}}
</td>
<td v-if="childIndex==0" :rowspan="3">
<template v-for="(x, i) in subItem.FrList">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip>
</template>
</td>
</tr>
</template>
</template>
<tr v-if="FrListOthen3.length>0">
<td>成本单据</td>
<td colspan="28">
<template v-for="(x, i) in FrListOthen2">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip>
</template>
</td>
</tr>
<tr v-if="TotalNav.planPriceList">
<td>总金额</td>
<td colspan="12">
<td colspan="14">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
<template v-if="IsShowRMB">
......@@ -781,13 +935,21 @@
</td>
</tr>
</table>
<p class="teamRevenueExpenditureTitle">
门票
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(3,2)" />
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="11" class="bgwhite">门票使用</th>
<th colspan="13" class="bgwhite">门票使用</th>
</tr>
<tr>
<th width="100">使用时间</th>
<th width="40">
<el-checkbox :isIndeterminate="isIndeterminate4" v-model="checkedAll4" @change="getCheckedAll(4)"></el-checkbox>
</th>
<th width="180">景点名称</th>
<th width="100">总人数</th>
<th width="">门票类别</th>
......@@ -798,12 +960,16 @@
<th width="">总金额</th>
<th width="">付款方式</th>
<th width="100">备注</th>
<th width="110">成本单据</th>
</tr>
<template v-for='(item,index) in list.ScenicList'>
<template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
<tr v-for="(childItem,childIndex) in subItem.TicketPriceList">
<td v-if="childIndex==0&&subIndex==0" :rowspan="3*item.ScenicStatisticsList.length">{{item.UseTimeStr}}
</td>
<td v-if="childIndex==0" :rowspan="3">
<el-checkbox v-model="subItem.checked" @change="getChecked(4)"></el-checkbox>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.ScenicName}}
</td>
......@@ -846,12 +1012,35 @@
<td v-if="childIndex==0" :rowspan="3">
{{subItem.Remarks}}
</td>
<td v-if="childIndex==0" :rowspan="3">
<template v-for="(x, i) in subItem.FrList">
<el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip>
</template>
</td>
</tr>
</template>
</template>
<tr v-if="FrListOthen1.length>0">
<td>成本单据</td>
<td colspan="28">
<template v-for="(x, i) in FrListOthen2">
<el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip>
</template>
</td>
</tr>
<tr v-if="TotalNav.planPriceList">
<td>总金额</td>
<td colspan="11">
<td colspan="12">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==3">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
<template v-if="IsShowRMB">
......@@ -865,6 +1054,62 @@
</td>
</tr>
</table>
<p class="teamRevenueExpenditureTitle">
其它
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(8,2)" />
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th width="10%">单号</th>
<th width="10%">费用说明</th>
<th width="10%">日期</th>
<th width="20%">备注</th>
<th width="10%">应付/应付金额</th>
<th width="10%">制单人</th>
<th width="10%">状态</th>
</tr>
<tr v-for="(item,index) in otherList">
<td>
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;"
:class="{'bgD9F3FF':item.Status==1,'bgFAEAED':item.Status==2,'bjFFF3E0':item.Status==3,
'c3FC4FF':item.Status==1,'cF1416C':item.Status==2,'cff9800':item.Status==3}"
@click="openDetails(item)">{{ item.FrID }}</span>
</td>
<td>
<span class="padding10" v-for="i in item.DetailList">{{i.CostTypeName}}</span>
</td>
<td>{{item.CreateDate}}</td>
<td>
<div v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率：{{childItem.Rate}}</span>
</div>
</td>
<td>
<span>￥{{moneyFormat(item.Money)}}</br>￥{{moneyFormat(item.WBMoney)}}</span>
</td>
<td>{{item.EmName}}</td>
<td>{{item.StatusStr}}</td>
</tr>
<tr v-if='otherList&&otherList.length!=0'>
<td>总金额</td>
<td colspan="15">
<span>
{{getTotalMoney(otherList)}} <span> (人民币) </span>
</span>
</td>
</tr>
</table>
<p class="teamRevenueExpenditureTitle">
挂账
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" />
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th>单号</th>
......@@ -1081,6 +1326,23 @@
export default {
data() {
return {
FrListOthen1: [],
FrListOthen2: [],
FrListOthen3: [],
FrListOthen4: [],
otherPay: 0,
otherList: [],
checkedType: null,
isIndeterminate5: false,
isIndeterminate4: false,
isIndeterminate3: false,
isIndeterminate2: false,
isIndeterminate1: false,
checkedAll5: false,
checkedAll4: false,
checkedAll3: false,
checkedAll2: false,
checkedAll1: false,
isUpdate: "false",
LineId: 0,
loading: false,
......@@ -1121,13 +1383,159 @@
IsShowRMB: false,
ContractUrlCount: 1,
myLineId: 0, //zk新增
comRate: 1 //公用乘以 zk新增
comRate: 1, //公用乘以 zk新增
msgList: [],
};
},
components: {
commonHotelInfo
},
methods: {
getTips(x){
let title = `付款账号：${x.AccountNumber},原币：${String(x.WBMoney)}`
let text = []
x.TradeWayList.forEach(childItem=>{
let i = `支付方式：${childItem.Alias}币种：${childItem.CurrencyName}
${childItem.OriginalMoney*childItem.Rate}汇率：${childItem.Rate}`
text.push(i)
})
return title+text.join(',')
},
//其他支出跳转制单
AddOutDetail() {
var TCArr = [this.msg.TCIDs];
let orderObj = {
OrderID: 0,
OrderSource: 8,
Obj: {},
TCIDList: TCArr,
queryObj: this.$route.query
}
this.$router.push({
name: "ChoiceAddFinancialDocuments",
query: {
Type: 2,
companyID: this.msgList[0].OutBranchId,
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
});
},
goUrl(_orderSource, _type) {
// console.log(this.list.BusList[0],_type,'=====')
// console.log(this.list.HotelOrderListReport,'OrderID=====')
// console.log(this.list.DiningList,'=====')
// console.log(this.list.ScenicList,'=====')
if(_orderSource==8){
this.AddOutDetail()
return
}
let ids = []
let title
if(_orderSource==5){
title = '车辆'
this.list.BusList.forEach(x=>{
if(x.checked){
ids.push(x.Id)
}
})
}else if(_orderSource==1){
title = '酒店'
this.list.HotelOrderListReport.forEach(x=>{
x.HotelOrderList.forEach(y=>{
if(y.checked){
ids.push(y.OrderID)
}
})
})
}else if(_orderSource==2){
title = '餐食'
this.list.DiningList.forEach(x=>{
x.DiningSummaryList.forEach(y=>{
if(y.checked){
ids.push(y.ID)
}
})
})
}else if(_orderSource==3){
title = '门票'
this.list.ScenicList.forEach(x=>{
x.ScenicStatisticsList.forEach(y=>{
if(y.checked){
ids.push(y.ID)
}
})
})
}else if(_orderSource==4){//其他
this.list.ScenicList.forEach(x=>{
x.ScenicStatisticsList.forEach(y=>{
if(y.checked){
ids.push(y.ID)
}
})
})
}
if(ids.length==0){
this.Info(`请勾选${title}需要付款的数据！`)
return
}
let TCIDARR = []
let id = [];
if( this.msgList[0].LineId==this.myLineId){
if (_orderSource === 1 && _type === 2) {
id = [94]
} else if (_orderSource === 2 && _type === 2) {
id = [95]
} else if (_orderSource === 5 && _type === 2) {
id = [96]
}
// 门票
else if (_orderSource === 3 && _type === 2) {
id = [97]
}
}
else{
// _orderSource 1 酒店 2餐厅 5 车资
if (_orderSource === 1 && _type === 2) {
id = [51, 52]
} else if (_orderSource === 2 && _type === 2) {
id = [54, 55]
} else if (_orderSource === 5 && _type === 2) {
id = [49, 50, 57, 58]
}
// 门票
else if (_orderSource === 3 && _type === 2) {
id = [88, 89]
}
}
TCIDARR.push(this.$route.query.id)
let orderObj = {
OrderID: 0,
OrderSource: _orderSource,
Obj: {},
SourceID: this.$route.query.id,
TCIDList: TCIDARR,
EduCommissionEmp: ids.join(','),
queryObj: this.$route.query
}
id = id.length > 0 ? JSON.stringify(id) : null;
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query: {
'Type': _type,
'path': 'teamRevenueExpenditure',
'companyID': this.msgList[0].OutBranchId,
'templateID': id,
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
'OrderSource': _orderSource,
}
});
},
GoToLeader(obj) {
this.$router.push({
name: 'leaderReimbursement',
......@@ -1648,6 +2056,94 @@
err => {}
);
},
getChecked(type){
let checkeds = []
let checkedsAll = []
if(type==1){
this.isIndeterminate1 = false
this.list.BusList.forEach(x=>{
checkedsAll.push(x.checked)
if(x.checked){
checkeds.push(x.checked)
}
})
}else if(type==2){
this.isIndeterminate2 = false
this.list.HotelOrderListReport.forEach(x=>{
x.HotelOrderList.forEach(y=>{
checkedsAll.push(y.checked)
if(y.checked){
checkeds.push(y.checked)
}
})
})
}else if(type==3){
this.isIndeterminate3 = false
this.list.DiningList.forEach(x=>{
x.DiningSummaryList.forEach(y=>{
checkedsAll.push(y.checked)
if(y.checked){
checkeds.push(y.checked)
}
})
})
}else if(type==4){
this.isIndeterminate4 = false
this.list.ScenicList.forEach(x=>{
x.ScenicStatisticsList.forEach(y=>{
checkedsAll.push(y.checked)
if(y.checked){
checkeds.push(y.checked)
}
})
})
}
this.getNewChecked(checkeds,checkedsAll,type)
this.$forceUpdate()
},
getNewChecked(checkeds,checkedsAll,type){
if(checkeds.length>0&&checkeds.length==checkedsAll.length){
if(type==1){ this.checkedAll1 = true }
else if(type==2){ this.checkedAll2 = true }
else if(type==3){ this.checkedAll3 = true }
else if(type==4){ this.checkedAll4 = true }
}else if(checkeds.length>0&&checkeds.length<checkedsAll.length){
if(type==1){ this.isIndeterminate1 = true }
if(type==2){ this.isIndeterminate2 = true }
else if(type==3){ this.isIndeterminate3 = true }
else if(type==4){ this.isIndeterminate4 = true }
}else if(checkeds.length==0){
if(type==1){ this.checkedAll1 = false }
if(type==2){ this.checkedAll2 = false }
else if(type==3){ this.checkedAll3 = true }
else if(type==4){ this.checkedAll4 = true }
}
},
// 全选
getCheckedAll(type){
this.checkedType = type
if(type==1){
this.isIndeterminate1 = false
this.checkedList(this.list.BusList,type)
}else if(type==2){
this.isIndeterminate2 = false
this.checkedList(this.list.HotelOrderListReport,type)
}else if(type==3){
this.isIndeterminate3 = false
this.checkedList(this.list.DiningList,type)
}else if(type==4){
this.isIndeterminate4 = false
this.checkedList(this.list.ScenicList,type)
}
},
checkedList(arrList,type){
arrList.forEach(x=>{
if(type==1){x.checked = this.checkedAll1}
else if(type==2){x.HotelOrderList.forEach(y=>{y.checked = this.checkedAll2})}
else if(type==3){x.DiningSummaryList.forEach(y=>{y.checked = this.checkedAll3})}
else if(type==4){x.ScenicStatisticsList.forEach(y=>{y.checked = this.checkedAll4})}
})
},
getList() {
this.loading = true;
this.apipost(
......@@ -1656,7 +2152,27 @@
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.list = res.data.data;
let data = res.data.data
let arrList = function(arr){
arr.forEach(x=>{
x.checked = false
x.FrList = []
})
}
arrList(data.BusList)//车
data.HotelOrderListReport.forEach(x=>{
arrList(x.HotelOrderList)//酒店
})
data.DiningList.forEach(x=>{
arrList(x.DiningSummaryList)//餐食
})
data.ScenicList.forEach(x=>{
arrList(x.ScenicStatisticsList)//门票
})
arrList(data.OtherOrderReportList)//其它
this.list = data;
if(![131,14, 90].includes(this.myLineId)) {
this.list.HotelOrderListReport.forEach(item => {
item.HotelOrderList.forEach(item => {
......@@ -1674,13 +2190,155 @@
x.CostProject = x.CostProject.toString();
});
}
this.GetDiJieScheduleFinanceList()
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
GetDiJieScheduleFinanceList() {
this.apipost('Financial_post_GetDiJieScheduleFinanceList', {
TCID: this.$route.query.id
}, res => {
if (res.data.resultCode == 1) {
console.log(res.data.data,'成本财务单据')
res.data.data.forEach(item=>{
if(item.EduCommissionEmp==null||item.EduCommissionEmp==""){
this.getOrderList('',item,2,item.OrderSource)
}
if(item.OrderSource==5){
this.list.BusList.forEach(x=>{
let EduCommissionEmp = item.EduCommissionEmp?item.EduCommissionEmp.split(','):[]
EduCommissionEmp.forEach(id=>{
if(x.Id==id){
this.getOrderList(x,item,1)
}
})
})
}else if(item.OrderSource==1){
this.list.HotelOrderListReport.forEach(x=>{
x.HotelOrderList.forEach(y=>{
let EduCommissionEmp = item.EduCommissionEmp?item.EduCommissionEmp.split(','):[]
EduCommissionEmp.forEach(id=>{
if(y.OrderID==id){
this.getOrderList(y,item,1)
}
})
})
})
}else if(item.OrderSource==2){
this.list.DiningList.forEach(x=>{
x.DiningSummaryList.forEach(y=>{
let state
let EduCommissionEmp = item.EduCommissionEmp?item.EduCommissionEmp.split(','):[]
EduCommissionEmp.forEach(id=>{
state = false
if(y.ID==id){
state = true
this.getOrderList(y,item,1)
}else{
if(!state){
state = true
this.getOrderList(y,item,2,item.OrderSource)
}
}
})
})
})
}else if(item.OrderSource==3){
this.list.ScenicList.forEach(x=>{
x.ScenicStatisticsList.forEach(y=>{
let state
let EduCommissionEmp = item.EduCommissionEmp?item.EduCommissionEmp.split(','):[]
EduCommissionEmp.forEach(id=>{
state = false
if(y.ID==id){
state = true
this.getOrderList(y,item,1)
}else{
if(!state){
state = true
this.getOrderList(y,item,2,item.OrderSource)
}
}
})
})
})
}else{
this.otherList.push(item)
}
})
} else {}
}, err => {})
},
getOrderList(x,item,type,OrderSource){
let obj= {
FrID: item.FrID,
Status: item.Status,
DetailList: item.DetailList,
TradeWayList: item.TradeWayList,
RemitterName: item.RemitterName,
AccountNumber: item.AccountNumber,
WBMoney: item.WBMoney
}
if(type==1){
x.FrList.push(obj)
}else if(type==2){
if(OrderSource==1){
this.FrListOthen2.push(obj)
}else if(OrderSource==2){
this.FrListOthen3.push(obj)
}else if(OrderSource==3){
this.FrListOthen4.push(obj)
}else if(OrderSource==5){
this.FrListOthen1.push(obj)
}
}
},
// 单据详情
openDetails(item) {
let query = {
id: item.FrID,
blank: "y",
};
this.$router.push({
path: "/FinancialDocumentsDetail",
query,
});
},
getTuanMsg() {
this.apipost('dmcstatistics_post_GetTeamMoneyBaseInfo', {
TCID: this.$route.query.id
}, res => {
if (res.data.resultCode == 1) {
this.msgList = res.data.data
} else {}
}, err => {})
},
getTotalMoney(obj) {
let money = 0
obj.forEach(item => {
if (item.Type == 1) {
money += item.Money
} else {
money -= item.Money
}
})
if (obj.length > 0) {
switch (obj[0].OrderSource) {
case 8:
this.otherPay = money
break;
default:
break;
}
}
return this.moneyFormat(money)
},
},
mounted() {
this.isUpdate = this.$route.query.isUpdate;
......@@ -1700,12 +2358,27 @@
this.getHangingAccountByTCIDList();
this.getzhuijiaList();
this.financeinfo_post_GetList();
this.getTuanMsg()
}
};
</script>
<style>
.teamRevenueExpenditureTitle {
border-left: 3px solid #E95252;
text-indent: 10px;
font-size: 14px;
height: 14px;
line-height: 14px;
margin: 30px 0 10px 0;
}
.teamRevenueExpenditureTable {
background: #eee;
width: 100%;
margin-bottom: 30px;
}
.leaderReimbursementTableNav {
background: #d6cece;
width: 100%;
......@@ -1959,3 +2632,100 @@
}
</style>
<style scoped>
.cblack {
color: black;
}
.cf {
color: #ffffff;
}
.c9e {
color: #9e9e9e;
}
.c20C997 {
color: #20c997;
}
.c02C854 {
color: #02c854;
}
.cff9800 {
color: #ff9800;
}
.cF1416C {
color: #f1416c;
}
.cF57A98 {
color: #f57a98;
}
.c04C8C8 {
color: #04c8c8;
}
.c059FF6 {
color: #059ff6;
}
.c3FC4FF {
color: #3fc4ff;
}
.mr {
margin-right: 5px;
}
.mt {
margin-top: 10px;
}
.mb {
margin-bottom: 10px;
}
.px5 {
padding: 0 3px;
}
.bgf {
background: #ffffff;
}
.bgf5 {
background: #f5f5f5;
}
.bgE8F5E9 {
background: #e8f5e9;
}
.bgD9F3FF {
background: #d9f3ff;
}
.bgFAEAED {
background: #faeaed;
}
.bj {
background: #ffffff;
}
.bjFFF3E0 {
background: #FFF3E0;
}
.radius5 {
border-radius: 5px;
}
.cursor-pointer {
cursor: pointer;
}
</style>
src/components/SalesVisa/ModifyVisaProduct.vue
View file @ e14c9660
......@@ -444,6 +444,7 @@
value-format="yyyy-MM-dd"
>
</el-date-picker>
<span style="color: red;font-size: 12px;">*：结束日期请设置为月20日左右， 防止销售月底报名次月无法提成帐未平；</span>
</el-form-item>
<el-form-item label="热门签证" prop="HotVisa">
<el-select v-model="addMsg.HotVisa">
......@@ -993,6 +994,13 @@ getCompanyList() {
this.PriceDates=[]
},
SaveVisaProduct(formName) {
let SendVisaDate = moment(new Date()).format("YYYY-MM")+'-25'
this.addMsg.SendVisaDate = moment(this.PriceDates[1]).format("YYYY-MM-DD")
console.log(this.addMsg.SendVisaDate,this.addMsg.SendVisaDate<SendVisaDate,'---')
if(this.addMsg.SendVisaDate<SendVisaDate){
this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
}
return
this.$refs[formName].validate(valid => {
if (valid) {
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ e14c9660
......@@ -2386,13 +2386,15 @@
OrderID: 0,
OrderSource: 8,
Obj: {},
TCIDList: TCArr
TCIDList: TCArr,
}
this.$router.push({
name: "ChoiceAddFinancialDocuments",
query: {
Type: 2,
companyID: this.OutBranchId,
noTypeCost: true,
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
......
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