Skip to content

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

no message

parent 049549ce
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 35 deletions
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 42ddb1bf
...@@ -1753,7 +1753,6 @@ ...@@ -1753,7 +1753,6 @@
} }
this.CurrentUserInfo = userInfo this.CurrentUserInfo = userInfo
this.$route.query.tcmun = this.$route.query.tcmun
if (this.$route.query.tcmun) { if (this.$route.query.tcmun) {
this.queryMsg.TCNUM = this.$route.query.tcmun this.queryMsg.TCNUM = this.$route.query.tcmun
} }
......
src/components/sale/ExpectedCommission.vue
View file @ 42ddb1bf
...@@ -35,6 +35,10 @@ ...@@ -35,6 +35,10 @@
} }
.CommissionLadder.Line{ .CommissionLadder.Line{
margin: 0 0 10px 0; margin: 0 0 10px 0;
}
.border-bottom{
border-bottom: 1px dashed #BDBDBD;
} }
.CommissionLadder .title{ .CommissionLadder .title{
font-size: 16px; font-size: 16px;
...@@ -164,7 +168,7 @@ ...@@ -164,7 +168,7 @@
</div> </div>
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0 0 0 0;"> <div class="CommissionLadder Line border-bottom" style="margin: 0 0 0 0;">
<div class="title"> <div class="title">
<span>日本线小包团、落地团以及单项提成</span> <span>日本线小包团、落地团以及单项提成</span>
</div> </div>
...@@ -190,7 +194,7 @@ ...@@ -190,7 +194,7 @@
<progressComm :commissionratioList="JapaneseProfit"></progressComm> <progressComm :commissionratioList="JapaneseProfit"></progressComm>
</div> </div>
</div> </div>
<div class="CommissionLadder Line" style="margin: 0 10px 0 10px;"> <div class="CommissionLadder Line border-bottom" style="margin: 0 10px 0 10px;">
<div class="title"> <div class="title">
<span>欧洲线小包团、落地团以及单项提成</span> <span>欧洲线小包团、落地团以及单项提成</span>
</div> </div>
...@@ -216,7 +220,7 @@ ...@@ -216,7 +220,7 @@
<progressComm :commissionratioList="EuropeProfit"></progressComm> <progressComm :commissionratioList="EuropeProfit"></progressComm>
</div> </div>
</div> </div>
<div class="CommissionLadder Line" style="margin: 0 0 0 0;"> <div class="CommissionLadder Line border-bottom" style="margin: 0 0 0 0;">
<div class="title"> <div class="title">
<span>其他线小包团、落地团以及单项提成</span> <span>其他线小包团、落地团以及单项提成</span>
</div> </div>
......
src/components/sale/components/OrderList.vue
View file @ 42ddb1bf
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-table-column width="200" prop="CreateTimeStr" label="订单Id" show-overflow-tooltip> <el-table-column width="200" prop="CreateTimeStr" label="订单Id" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<p class="cursor-pointer c059FF6 fz18 row-c" @click="goDetails(scope.row)"> <p class="cursor-pointer c059FF6 fz18 row-c" @click="goDetails(scope.row,1)">
<el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag> <el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag>
<span>{{scope.row.OrderId}}</span> <span>{{scope.row.OrderId}}</span>
</p> </p>
...@@ -17,8 +17,9 @@ ...@@ -17,8 +17,9 @@
<el-table-column width="200" prop="CreateTimeStr" label="团号" show-overflow-tooltip> <el-table-column width="200" prop="CreateTimeStr" label="团号" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<p class=" fz14" :class="{'cursor-pointer c059FF6':scope.row.OrderType==2}" <p class=" fz14" :style="{'color': scope.row.OrderType==2?'#059FF6':'',
@click="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}</p> 'cursor': scope.row.OrderType==2?'pointer':''}"
@click="scope.row.OrderType==2?goDetails(scope.row,2):''">{{scope.row.TCNUM}}</p>
<p>出发日期：{{scope.row.StartDate}}</p> <p>出发日期：{{scope.row.StartDate}}</p>
</div> </div>
</template> </template>
...@@ -106,7 +107,47 @@ ...@@ -106,7 +107,47 @@
}, },
methods: { methods: {
goDetails(row,type){
let name
name = 'erpCustomerOrderDay'
this.$router.push({
path: name,
query: {
OrderId: row.OrderId,
blank: 'y',
tab: ''
}
});
return
if(type==1) {
name = 'erpCustomerOrderDay'
this.$router.push({
path: name,
query: {
OrderId: row.OrderId,
blank: 'y',
tab: ''
}
});
}else if(type==2){
if(row.TeamType==0){
name = 'TravelControlList'
}else if(row.TeamType==1){
name = 'TravelControlListSale'
}else if(row.TeamType==2){
name = 'oneDayTrip'
}
this.$router.push({
path: name,
query: {
tcmun: row.TCNUM,
blank: 'y',
tab: ''
}
});
}
}
} }
}; };
......
src/components/temp/components/OrderList.vue
View file @ 42ddb1bf
...@@ -3,29 +3,37 @@ ...@@ -3,29 +3,37 @@
<el-table border ref="multipleTable" :data="OrderList" <el-table border ref="multipleTable" :data="OrderList"
:default-sort="{prop: 'null', order: 'null'}" :default-sort="{prop: 'null', order: 'null'}"
:sort-by="['Money','Income','PreferTipAmount','PlatformTax','Refund','CostMoney','OrderProfit','DueInMoney']"> :sort-by="['Money','Income','PreferTipAmount','PlatformTax','Refund','CostMoney','OrderProfit','DueInMoney']">
<el-table-column prop="Title" label="团名"> <el-table-column width="200" prop="CreateTimeStr" label="团号" show-overflow-tooltip>
</el-table-column> <template slot-scope="scope">
<el-table-column width="200" prop="CreateTimeStr" label="团号" show-overflow-tooltip> <div>
<template slot-scope="scope"> <p class="cursor-pointer fz14" style="color: #059FF6;cursor: pointer;"
<div> @click="goDetails(scope.row)">{{scope.row.TCNUM}}({{scope.row.TCID}})</p>
<p class=" fz14" :class="{'cursor-pointer c059FF6':scope.row.OrderType==2}" <p>日期：{{scope.row.StartDate}}</p>
@click="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}({{scope.row.TCID}})</p> </div>
<p>出团日期：{{scope.row.StartDate}}</p> </template>
</div> </el-table-column>
</template> <el-table-column label="类型">
</el-table-column> <template slot-scope="scope">
{{scope.row.TeamTypeName}}/{{scope.row.PriceTeamTypeName}}
</template>
</el-table-column>
<el-table-column label="线路" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.LineName}}
</template>
</el-table-column>
<el-table-column label="系列" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.LtName}}
</template>
</el-table-column>
<el-table-column prop="Title" label="团名">
</el-table-column>
<el-table-column prop="GuestNum" label="收客人数"> <el-table-column prop="GuestNum" label="收客人数">
</el-table-column> </el-table-column>
<el-table-column label="类型">
<template slot-scope="scope">
{{scope.row.TeamTypeName}}/{{scope.row.PriceTeamTypeName}}
</template>
</el-table-column>
<el-table-column label="线路/系列" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.LineName}}/{{scope.row.LtName}}
</template>
</el-table-column>
<el-table-column prop="StateName" label="状态" show-overflow-tooltip> <el-table-column prop="StateName" label="状态" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.Status}}</span> <span>{{scope.row.Status}}</span>
...@@ -63,7 +71,26 @@ ...@@ -63,7 +71,26 @@
}, },
methods: { methods: {
goDetails(row){
let name
if(row.TeamType==0){
name = 'TravelControlList'
}else if(row.TeamType==1){
name = 'TravelControlListSale'
}else if(row.TeamType==2){
name = 'oneDayTrip'
}
this.$router.push({
path: name,
query: {
TCID: row.TCID,
id: row.TCID,
tcmun: row.TCNUM,
blank: 'y',
tab: ''
}
});
}
} }
}; };
......
src/components/temp/operation.vue
View file @ 42ddb1bf
...@@ -340,10 +340,10 @@ ...@@ -340,10 +340,10 @@
<div class="ladder-title">{{s.BranchName}}</div> <div class="ladder-title">{{s.BranchName}}</div>
<div class="CommissionInfor"> <div class="CommissionInfor">
<span> <span>
当月团数：<span>{{s.TravelNum}}</span> 团数：<span>{{s.TravelNum}}</span>
</span> </span>
<span> <span>
单项订单数：<span>{{s.SingleOrderNum}}</span> 单项单数：<span>{{s.SingleOrderNum}}</span>
</span> </span>
<span> <span>
预期利润：<span>{{s.Profit}}</span> 预期利润：<span>{{s.Profit}}</span>
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
<div class="ladder-title">额外奖励 {{isBranchCompany?'(不含落地团、独立成团)':''}}</div> <div class="ladder-title">额外奖励 {{isBranchCompany?'(不含落地团、独立成团)':''}}</div>
<div class="CommissionInfor"> <div class="CommissionInfor">
<span> <span>
当月团数：<span>{{item.TravelAward.TravelNum}}</span> 团数：<span>{{item.TravelAward.TravelNum}}</span>
</span> </span>
<span> <span>
奖励：<span>{{item.TravelAward.AwardMoney}}</span> 奖励：<span>{{item.TravelAward.AwardMoney}}</span>
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
<span class="ProjectTitle">助理奖励 <span class="ProjectTitle">助理奖励
</span> </span>
</div> </div>
<p>系列团助理op人头提成</p> <p>系列团、小包团助理op人头奖励</p>
<div class="groupTourOrder"> <div class="groupTourOrder">
<span>报名人数：<span>{{ZLOPAward.TravelPeopleNum}}</span></span> <span>报名人数：<span>{{ZLOPAward.TravelPeopleNum}}</span></span>
<span>单价：<span>{{ZLOPAward.TravelUnitPrice}}元/人</span></span> <span>单价：<span>{{ZLOPAward.TravelUnitPrice}}元/人</span></span>
...@@ -439,7 +439,7 @@ ...@@ -439,7 +439,7 @@
</div> </div>
</div> </div>
</template> </template>
<div style="display: flex;margin: 10px 0 10px 0;"> <div style="display: flex;margin: 10px 0 10px 0;" v-if="isVisa">
<div class="CommissionLadder Line" style="width: 100%;margin: 0 0 0 0;padding: 16px 20px 0 20px;flex-shrink: 0;"> <div class="CommissionLadder Line" style="width: 100%;margin: 0 0 0 0;padding: 16px 20px 0 20px;flex-shrink: 0;">
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<span style="font-weight: bold;font-size: 16px;">国内提成 <span style="font-weight: bold;font-size: 16px;">国内提成
...@@ -745,7 +745,7 @@ ...@@ -745,7 +745,7 @@
this.apipost('opcommission_GetOPNotGroupOutTravelList', {}, this.apipost('opcommission_GetOPNotGroupOutTravelList', {},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data.pageData?res.data.data.pageData:[] let data = res.data.data?res.data.data:[]
if(data&&data.length>5){ if(data&&data.length>5){
for(let i=0;i<5;i++){ for(let i=0;i<5;i++){
this.OrderList.push(data[i]) this.OrderList.push(data[i])
......
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