Skip to content

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

no message

parent efe11b9b
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 27 deletions
src/components/temp/components/progressComm.vue
View file @ 12957666
...@@ -141,14 +141,14 @@ ...@@ -141,14 +141,14 @@
}, },
// 设置当前进度条状态，显示不同颜色 // 设置当前进度条状态，显示不同颜色
setItemStatus(data) { setItemStatus(data) {
if(this.AvgLureNum>=data.StartValue&&this.AvfOrderNum>=data.EndValue){ if(this.Profit>=data.StartValue&&this.Profit<=data.EndValue){
return 'exception' return 'exception'
} }
}, },
formatProgress(data){ formatProgress(data){
let obj = JSON.parse(JSON.stringify(data)) let obj = JSON.parse(JSON.stringify(data))
if(obj.StartValue>=10000) { if(obj.StartValue>=10000) {
data.StartValue2 = (obj.StartValue/1000).toFixed(1)>0?(obj.StartValue/10000).toFixed(1):0 //Math.floor(obj.StartValue/10000) data.StartValue2 = (obj.StartValue/1000).toFixed(1)>0?(obj.StartValue/10000).toFixed(1):0
if(data.StartValue2>=10&&data.StartValue2.indexOf('.0')!=-1){ if(data.StartValue2>=10&&data.StartValue2.indexOf('.0')!=-1){
data.StartValue2 = data.StartValue2.slice(0,2) data.StartValue2 = data.StartValue2.slice(0,2)
}else if(data.StartValue2.indexOf('.0')!=-1){ }else if(data.StartValue2.indexOf('.0')!=-1){
......
src/components/temp/operation.vue
View file @ 12957666
...@@ -292,36 +292,57 @@ ...@@ -292,36 +292,57 @@
<!-- <detailsButtom :type="1" :obj="commissionMsg" :Month="Month"/> --> <!-- <detailsButtom :type="1" :obj="commissionMsg" :Month="Month"/> -->
</div> </div>
</div> </div>
<template v-if="data.postName.indexOf('签字')==-1">
<p style="font-size: 16px;font-weight: bold;">小包团、落地团以及单项提成</p> <p style="font-size: 16px;font-weight: bold;">小包团、落地团以及单项提成</p>
<template v-for="(s,indexs) in item.BranchList"> <template v-for="(s,indexs) in item.BranchList">
<div class="CommissionInfor"> <!--
<span> <div class="CommissionInfor">
当月团数：<span>{{s.TravelNum}}</span> <span>
</span> 当月团数：<span>{{s.TravelNum}}</span>
<span> </span>
单项订单数：<span>{{s.SingleOrderNum}}</span> <span>
</span> 单项订单数：<span>{{s.SingleOrderNum}}</span>
<span> </span>
预期利润：<span>{{s.Profit}}</span> <span>
</span> 预期利润：<span>{{s.Profit}}</span>
<span> </span>
预期比例：<span>{{s.Rate}}{{s.Way==1?'元/人':'%'}}</span> <span>
</span> 预期比例：<span>{{s.Rate}}{{s.Way==1?'元/人':'%'}}</span>
<span> </span>
预期提成：<span>{{s.Commission}}</span> <span>
</span> 预期提成：<span>{{s.Commission}}</span>
</div> </span>
<div class="ladder-form"> </div> -->
<div class="ladder-form-box"> <div class="ladder-form">
<div class="ladder-list"> <div class="ladder-form-box">
<div class="ladder-title">{{s.BranchName}}</div> <div class="ladder-list">
<progressComm :type="2" :CommissionRateList="s.GradeRuleList" <div class="CommissionInfor">
:Profit="s.Profit"></progressComm> <span>
当月团数：<span>{{s.TravelNum}}</span>
</span>
<span>
单项订单数：<span>{{s.SingleOrderNum}}</span>
</span>
<span>
预期利润：<span>{{s.Profit}}</span>
</span>
<span>
预期比例：<span>{{s.Rate}}{{s.Way==1?'元/人':'%'}}</span>
</span>
<span>
预期提成：<span>{{s.Commission}}</span>
</span>
</div>
<div class="ladder-title">{{s.BranchName}}</div>
<progressComm :type="2" :CommissionRateList="s.GradeRuleList"
:Profit="s.Profit"></progressComm>
</div>
</div> </div>
</div> </div>
</div> </template>
</template> </template>
<div class="commissionProject" style="display: flex;flex-wrap: wrap;"> <div class="commissionProject" style="display: flex;flex-wrap: wrap;">
<template v-if="data.postName.indexOf('签字')==-1">
<div style="width: 450px;"> <div style="width: 450px;">
<div> <div>
<span class="ProjectTitle">额外奖励 <span class="ProjectTitle">额外奖励
...@@ -339,6 +360,7 @@ ...@@ -339,6 +360,7 @@
:Profit="item.TravelAward.TravelNum"></progressComm> :Profit="item.TravelAward.TravelNum"></progressComm>
</div> </div>
</div> </div>
</template>
<div> <div>
<div> <div>
<span class="ProjectTitle">单项签证</span> <span class="ProjectTitle">单项签证</span>
...@@ -360,6 +382,7 @@ ...@@ -360,6 +382,7 @@
<span>预期提成：<span>{{item.TravelVisa.Commission}}</span></span> <span>预期提成：<span>{{item.TravelVisa.Commission}}</span></span>
</div> </div>
</div> </div>
<template v-if="data.postName.indexOf('签字')==-1">
<div> <div>
<div> <div>
<span class="ProjectTitle">人头奖励 <span class="ProjectTitle">人头奖励
...@@ -398,6 +421,7 @@ ...@@ -398,6 +421,7 @@
</div> </div>
</div> </div>
</div> </div>
</template>
</div> </div>
</div> </div>
...@@ -639,7 +663,7 @@ ...@@ -639,7 +663,7 @@
} }
this.getList() this.getList()
}, },
// 获取规则列表数据 // 获取提成列表数据
getList() { getList() {
this.loading = true this.loading = true
this.apipost("opcommission_GetOPExpectCommission", this.msg, res => { this.apipost("opcommission_GetOPExpectCommission", this.msg, res => {
...@@ -708,6 +732,7 @@ ...@@ -708,6 +732,7 @@
} }
}) })
}, },
// 未结团数据
GetOrderPageList(){ GetOrderPageList(){
this.apipost('opcommission_GetOPNotGroupOutTravelList', {}, this.apipost('opcommission_GetOPNotGroupOutTravelList', {},
res => { res => {
...@@ -729,6 +754,7 @@ ...@@ -729,6 +754,7 @@
) )
}, },
// 近期提成
iWorkbench() { iWorkbench() {
let Info let Info
this.apipost('customerIndex_post_GetMySelfSellInfo', {}, res => { this.apipost('customerIndex_post_GetMySelfSellInfo', {}, res => {
......
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