Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 3f6f0d25 7b56887b
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 10 deletions
src/components/FinancialModule/groupApproval.vue
View file @ 61a958a0
......@@ -41,6 +41,9 @@
<div style="float: right;" v-if="multipleSelection.length>0">
<button class="hollowFixedBtn" @click="setAudit()">批量审核</button>
</div>
<li style="float: right;color: red;font-size: 14px;">
注：落地团，小包团，国内线 均按订单利润的20%计算最大预计销售提成，实际发放提成不会超过最大预期销售提成
</li>
</ul>
<ul style="overflow: initial!important">
......@@ -64,24 +67,34 @@
label="团队编号"
width="170">
<template slot-scope="scope">
<p>{{scope.row.OutBranchName}}</p>
<span style="cursor: pointer;text-decoration: underline;"
@click="goTravel(scope.row.TCID)">{{scope.row.TCNUM}}({{scope.row.TCID}})</span>
</template>
</el-table-column>
<el-table-column
prop="LtName"
label="系列" show-overflow-tooltip></el-table-column>
label="系列" show-overflow-tooltip>
<template slot-scope="scope">
<p>{{scope.row.LineName}}</p>
<p>{{scope.row.LtName}}</p>
</template>
</el-table-column>
<el-table-column
prop="Title"
label="团名"
width="400"
width="200"
show-overflow-tooltip></el-table-column>
<el-table-column
prop="OPName"
label="OP"></el-table-column>
<el-table-column
prop="PriceTeamTypeName"
label="团队类型"></el-table-column>
label="团队类型">
<template slot-scope="scope">
<template v-if="scope.row.TeamTypeName">{{scope.row.TeamTypeName}}/</template>{{scope.row.PriceTeamTypeName}}
</template>
</el-table-column>
<el-table-column
prop="ShouldReceive"
label="应收"></el-table-column>
......@@ -105,7 +118,7 @@
label="团队利润"></el-table-column>
<el-table-column
prop="SaleCommission"
label="预计销售提成">
label="预计销售提成" width="130px">
<template slot-scope="scope">
{{scope.row.SaleCommission}}
</template>
......@@ -319,7 +332,7 @@
msg.TCID = 0
}
this.apipost(
"travel_get_GetOutGroupAuditPageList",
"travel_get_GetOutGroupAuditPageListNew",
msg,
res => {
this.loading = false
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 61a958a0
......@@ -820,7 +820,12 @@
<template v-for="item in DataList.FinicePayList">
<!-- <tr v-if='item.OrderSource===4 || isExists(item.CostTypeList,'国际段机票')'> -->
<tr
v-if="(isExists(item.CostTypeList,'国际段机票') || item.OrderSource===4 || isExists(item.CostTypeList,'机票退税') || isExists(item.CostTypeList,'机票罚金') || isExists(item.CostTypeList,'机票税金')) || isExists(item.CostTypeList,'国内联运段机票')">
v-if="(isExists(item.CostTypeList,'国际段机票')
|| item.OrderSource===4
|| isExists(item.CostTypeList,'机票退税')
|| 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>
......@@ -1190,9 +1195,31 @@
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<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,'导游佣金') &&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,'旅游责任险')&& 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,'领队佣金')
&& 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,'旅游责任险')
&& NotExists(item.CostTypeList,'团队保险')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -2072,12 +2099,54 @@
};
this.apipost("travel_get_GetTeamBalanceSheet", msg, res => {
this.loading = false;
let that = this
if (res.data.resultCode == 1) {
let data = res.data.data;
let objData = function(obj){
obj.newFinicePayList1 = []
obj.newFinicePayList2 = []
obj.newFinicePayList = []
}
objData(data)
data.FiniceReciveList.forEach(x => {
x.checked = false;
})
this.DataList = data;
data.FinicePayList.forEach(item => {
if((that.isExists(item.CostTypeList,'国际段机票')
|| item.OrderSource===4
|| that.isExists(item.CostTypeList,'机票退税')
|| that.isExists(item.CostTypeList,'机票罚金')
|| that.isExists(item.CostTypeList,'机票税金'))
|| that.isExists(item.CostTypeList,'国内联运段机票')){
this.DataList.newFinicePayList1.push(JSON.parse(JSON.stringify(item)))
}else 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,'导游佣金')
&&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,'团队保险')){
this.DataList.newFinicePayList2.push(JSON.parse(JSON.stringify(item)))
}
})
this.GetALLPageList()//查询驳回数据
this.DataList.FiniceReciveList.forEach(item => {
if (that.isExists(item.CostTypeList, '团费') || that.isExists(item.CostTypeList, '团款')) {
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 61a958a0
......@@ -51,7 +51,12 @@
cursor: pointer;
text-align: center;
}
.line1 {
width: 240px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
<template>
<div class="flexOne quoTation">
......@@ -111,9 +116,16 @@
<li v-for="item in dataList" :key="item.subCode" :data-id="item.ID" style="padding:0 10px;">
<div class="_left" style="padding:0;display:flex;">
<div class="QT_CodeNum">
<div v-if="item.TCNUMS">
<el-popover
placement="top-start"
title=""
width="200"
trigger="hover"
:content="item.TCNUMS">
<div slot="reference" v-if="item.TCNUMS" class="line1">
团号：{{item.TCNUMS}}
</div>
</el-popover>
{{$t('hotel.hotel_SerialNumber')}}：{{item.ID}}
<div>
类型：{{item.TeamTypeName}}
......
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