Skip to content

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

no message

parent 8b0fa03d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 365 additions and 214 deletions
src/components/FinancialModule/TradeCommission/TicketUserDetails.vue
View file @ f98404f7
...@@ -197,10 +197,12 @@ ...@@ -197,10 +197,12 @@
<th>公司</th> <th>公司</th>
<th>部门</th> <th>部门</th>
<th>员工姓名</th> <th>员工姓名</th>
<th>日本线及其他人数</th> <th>日本线人数</th>
<th>日本线及其他奖励</th> <th>日本线奖励</th>
<th>欧洲线及其他人数</th> <th>欧洲线人数</th>
<th>欧洲线及其他奖励</th> <th>欧洲线奖励</th>
<th>其他线人数</th>
<th>其他线奖励</th>
<th>总提成</th> <th>总提成</th>
<th>出团公司提成</th> <th>出团公司提成</th>
<th>期数</th> <th>期数</th>
...@@ -214,6 +216,8 @@ ...@@ -214,6 +216,8 @@
<td>{{item.PeopleMoney?item.PeopleMoney:'-'}}</td> <td>{{item.PeopleMoney?item.PeopleMoney:'-'}}</td>
<td>{{item.EuropePNum?item.EuropePNum:'-'}}</td> <td>{{item.EuropePNum?item.EuropePNum:'-'}}</td>
<td>{{item.EuropeMoney?item.EuropeMoney:'-'}}</td> <td>{{item.EuropeMoney?item.EuropeMoney:'-'}}</td>
<td>{{item.OtherPNum?item.OtherPNum:'-'}}</td>
<td>{{item.OtherMoney?item.OtherMoney:'-'}}</td>
<td>{{item.TotalCMoney?item.TotalCMoney:'-'}}</td> <td>{{item.TotalCMoney?item.TotalCMoney:'-'}}</td>
<td>{{item.BranchCommission?item.BranchCommission:'-'}}</td> <td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
<td>{{item.Periods}}</td> <td>{{item.Periods}}</td>
......
src/components/sale/ExpectedCommission.vue
View file @ f98404f7
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<div style="display: flex;"> <div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0 0 0 0;"> <div class="CommissionLadder Line" style="margin: 0 0 0 0;">
<div class="title"> <div class="title">
<span>日本及其他线小包团、落地团以及单项提成</span> <span>日本线小包团、落地团以及单项提成</span>
</div> </div>
<p>当月个人毛利润</p> <p>当月个人毛利润</p>
<div class="CommissionInfor"> <div class="CommissionInfor">
...@@ -190,9 +190,9 @@ ...@@ -190,9 +190,9 @@
<progressComm :commissionratioList="JapaneseProfit"></progressComm> <progressComm :commissionratioList="JapaneseProfit"></progressComm>
</div> </div>
</div> </div>
<div class="CommissionLadder Line" style="margin: 0 0 0 10px;"> <div class="CommissionLadder Line" style="margin: 0 10px 0 10px;">
<div class="title"> <div class="title">
<span>欧洲小包团、落地团以及单项提成</span> <span>欧洲线小包团、落地团以及单项提成</span>
</div> </div>
<p>当月个人毛利润</p> <p>当月个人毛利润</p>
<div class="CommissionInfor"> <div class="CommissionInfor">
...@@ -216,6 +216,32 @@ ...@@ -216,6 +216,32 @@
<progressComm :commissionratioList="EuropeProfit"></progressComm> <progressComm :commissionratioList="EuropeProfit"></progressComm>
</div> </div>
</div> </div>
<div class="CommissionLadder Line" style="margin: 0 0 0 0;">
<div class="title">
<span>其他线小包团、落地团以及单项提成</span>
</div>
<p>当月个人毛利润</p>
<div class="CommissionInfor">
<span>
订单数量：<span>{{CommissionInfor.OtherOrderNum}}</span>
</span>
<span>
人头数量：<span>{{CommissionInfor.OtherPeopleNum}}</span>
</span>
<span>
预期利润：<span>{{CommissionInfor.OtherProfit}}</span>
</span>
<span>
预期比例：<span>{{CommissionInfor.OtherRate}}%</span>
</span>
<span>
预期提成：<span>{{CommissionInfor.OtherCommission}}</span>
</span>
</div>
<div>
<progressComm :commissionratioList="OtherProfit"></progressComm>
</div>
</div>
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0 0 10px 0;"> <div class="CommissionLadder Line" style="margin: 0 0 10px 0;">
...@@ -246,9 +272,23 @@ ...@@ -246,9 +272,23 @@
<progressComm :commissionratioList="EuropeLine"></progressComm> <progressComm :commissionratioList="EuropeLine"></progressComm>
</div> </div>
</div> </div>
<div class="CommissionLadder Line" style="margin: 0 0 10px 10px;">
<p><span>当月人头奖励/不含门票、包车、国内游以及单团(独立成团)</span><span></span></p>
<div class="CommissionInfor">
<span>
人头数量：<span>{{CommissionInfor.OtherPNum}}</span>
</span>
<span>
奖励：<span>{{CommissionInfor.OtherMoney}}</span>
</span>
</div>
<div>
<progressComm :commissionratioList="OtherLine"></progressComm>
</div>
</div> </div>
<div style="display: flex;" v-if="isAnnualBonus"> </div>
<div class="CommissionLadder Line" style="margin: 0;"> <div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0;" v-if="isAnnualBonus">
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<span>年终奖(不含门票、包车、国内游)</span> <span>年终奖(不含门票、包车、国内游)</span>
<div> <div>
...@@ -265,18 +305,21 @@ ...@@ -265,18 +305,21 @@
<progressComm :commissionratioList="AnnualBonus"></progressComm> <progressComm :commissionratioList="AnnualBonus"></progressComm>
</div> </div>
</div> </div>
</div> <div class="CommissionLadder Line" style="margin: 0 0 0 10px;padding: 16px 20px 0 20px;">
</div>
<div class="CommissionLadder Line" style="margin: 20px 0 0 10px;">
<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> <span style="font-weight: bold;font-size: 16px;">国内提成
<span style="font-size: 13px;color: red;margin-left: 20px;">
注:国内提成需结团后方可发放提成，以实际结团为准，此处只提供参考</span>
</span>
<div> <div>
<detailsButtom :type="2" :obj="commissionMsg" :Month="Month"/> <detailsButtom :type="2" :obj="commissionMsg" :Month="Month"/>
</div> </div>
</div> </div>
<p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:国内提成需结团后方可发放提成，以实际结团为准，此处只提供参考</span></p> <p style="padding: 0 0 10px 0;text-align: left;">
</p>
<div class="ExpectedCommission-table"> <div class="ExpectedCommission-table">
<el-table border ref="multipleTable" :data="DomesticLine.Rlist"> <el-table border ref="multipleTable" :data="isExpansion?newRlistAll:newRlist">
<el-table-column width="80" prop="RuleName" <el-table-column width="80" prop="RuleName"
label="团队类型" show-overflow-tooltip> label="团队类型" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -349,10 +392,19 @@ ...@@ -349,10 +392,19 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="color: red;font-size: 12px;text-align: right;padding: 0;">
<span style="cursor: pointer;display: inline-block;padding: 10px 5px;" @click="isExpansion=!isExpansion">
{{isExpansion?'收起':'展开'}}
<i :class="[isExpansion?'el-icon-arrow-up':'el-icon-arrow-down']"></i>
</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div>
<div class="ExpectedCommission-form"> <div class="ExpectedCommission-form">
<!-- 未平账单 --> <!-- 未平账单 -->
<div class="OpenOrder"> <div class="OpenOrder">
...@@ -409,6 +461,7 @@ ...@@ -409,6 +461,7 @@
}, },
data() { data() {
return { return {
isExpansion: false,
detailsInfor:{ detailsInfor:{
}, },
...@@ -417,6 +470,8 @@ ...@@ -417,6 +470,8 @@
GNOrderNum:0, GNOrderNum:0,
GNEopleNum:0, GNEopleNum:0,
GNCommission:0, GNCommission:0,
newRlist:[],
newRlistAll:[],
DomesticLine:{}, DomesticLine:{},
AnnualBonus:{ AnnualBonus:{
type:3, type:3,
...@@ -427,6 +482,24 @@ ...@@ -427,6 +482,24 @@
CommissionProfit: 0, CommissionProfit: 0,
CommissionRateList:[] CommissionRateList:[]
}, },
OtherProfit:{
type:2,
AvgLureNum:0,
AvfOrderNum:0,
CommissionRate:0,
Commission: 0,
CommissionProfit: 0,
CommissionRateList:[]
},
OtherLine:{
type:1,
AvgLureNum:0,
AvfOrderNum:0,
CommissionRate:0,
Commission: 0,
CommissionProfit: 0,
CommissionRateList:[]
},
EuropeProfit:{ EuropeProfit:{
type:2, type:2,
AvgLureNum:0, AvgLureNum:0,
...@@ -564,6 +637,8 @@ ...@@ -564,6 +637,8 @@
this.JapaneseProfit.CommissionRateList = this.dataRuleList.ProfitRuleList this.JapaneseProfit.CommissionRateList = this.dataRuleList.ProfitRuleList
this.EuropeLine.CommissionRateList = this.dataRuleList.EuropeAwardRuleList this.EuropeLine.CommissionRateList = this.dataRuleList.EuropeAwardRuleList
this.EuropeProfit.CommissionRateList = this.dataRuleList.EuropeProfitRuleList this.EuropeProfit.CommissionRateList = this.dataRuleList.EuropeProfitRuleList
this.OtherLine.CommissionRateList = this.dataRuleList.OtherAwardRuleList
this.OtherProfit.CommissionRateList = this.dataRuleList.OtherProfitRuleList
this.AnnualBonus.CommissionRateList = this.dataRuleList.BonusRuleList this.AnnualBonus.CommissionRateList = this.dataRuleList.BonusRuleList
this.getData() this.getData()
}else{ }else{
...@@ -598,6 +673,15 @@ ...@@ -598,6 +673,15 @@
this.EuropeProfit.CommissionRate = this.CommissionInfor.EuropeRate?this.CommissionInfor.EuropeRate:0 this.EuropeProfit.CommissionRate = this.CommissionInfor.EuropeRate?this.CommissionInfor.EuropeRate:0
this.EuropeProfit.Commission = this.CommissionInfor.EuropeCommission?this.CommissionInfor.EuropeCommission:0 this.EuropeProfit.Commission = this.CommissionInfor.EuropeCommission?this.CommissionInfor.EuropeCommission:0
this.EuropeProfit.CommissionProfit = this.CommissionInfor.EuropeProfit?this.CommissionInfor.EuropeProfit:0 this.EuropeProfit.CommissionProfit = this.CommissionInfor.EuropeProfit?this.CommissionInfor.EuropeProfit:0
// 其他人头奖励
this.OtherLine.AvgLureNum = this.CommissionInfor.OtherPNum?this.CommissionInfor.OtherPNum:0
this.OtherLine.Commission = this.CommissionInfor.OtherMoney?this.CommissionInfor.OtherMoney:0
// 其他提成比例
this.OtherProfit.AvgLureNum = this.CommissionInfor.OtherCommission?this.CommissionInfor.OtherCommission:0
this.OtherProfit.AvfOrderNum = this.CommissionInfor.OtherOrderNum?this.CommissionInfor.OtherOrderNum:0
this.OtherProfit.CommissionRate = this.CommissionInfor.OtherRate?this.CommissionInfor.OtherRate:0
this.OtherProfit.Commission = this.CommissionInfor.OtherCommission?this.CommissionInfor.OtherCommission:0
this.OtherProfit.CommissionProfit = this.CommissionInfor.OtherProfit?this.CommissionInfor.OtherProfit:0
// 年终奖 // 年终奖
this.AnnualBonus.AvfOrderNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0 this.AnnualBonus.AvfOrderNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0
this.AnnualBonus.Commission = this.CommissionInfor.BonusPeriods?this.CommissionInfor.BonusPeriods:0 this.AnnualBonus.Commission = this.CommissionInfor.BonusPeriods?this.CommissionInfor.BonusPeriods:0
...@@ -625,6 +709,14 @@ ...@@ -625,6 +709,14 @@
this.GNEopleNum+=Number(item.PeopleNum) this.GNEopleNum+=Number(item.PeopleNum)
this.GNCommission+=Number(item.Commission) this.GNCommission+=Number(item.Commission)
}) })
this.newRlistAll = [
this.DomesticLine.Rlist[2],
this.DomesticLine.Rlist[3],
this.DomesticLine.Rlist[4],
this.DomesticLine.Rlist[0],
this.DomesticLine.Rlist[1]]
this.newRlist = [this.DomesticLine.Rlist[2]]
let arr1 =[this.CommissionInfor.PeopleMoney,this.CommissionInfor.EuropeMoney] let arr1 =[this.CommissionInfor.PeopleMoney,this.CommissionInfor.EuropeMoney]
let arr2 =[this.CommissionInfor.SalesCommission,this.CommissionInfor.JapanCommission,this.CommissionInfor.EuropeCommission,this.GNCommission] let arr2 =[this.CommissionInfor.SalesCommission,this.CommissionInfor.JapanCommission,this.CommissionInfor.EuropeCommission,this.GNCommission]
this.CommissionJJ = this.CalculatePrice(arr1,0) this.CommissionJJ = this.CalculatePrice(arr1,0)
...@@ -660,7 +752,7 @@ ...@@ -660,7 +752,7 @@
arr1, arr1,
num num
); );
return CoastPrice return CoastPrice>0?CoastPrice:0
}, },
} }
......
src/components/sale/components/progressComm.vue
View file @ f98404f7
...@@ -76,21 +76,21 @@ ...@@ -76,21 +76,21 @@
:percentage="setItemProgress(item)" :percentage="setItemProgress(item)"
:status="setItemStatus(item)" :status="setItemStatus(item)"
:format="setItemText(item)" :format="setItemText(item)"
:text-color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)|| :text-color="(commissionratioList.type==2&&commissionratioList.CommissionProfit>=item.StartValue)||
(commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?'#666666':'#666666'" (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?'#666666':'#666666'"
:color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)|| :color="(commissionratioList.type==2&&commissionratioList.CommissionProfit>=item.StartValue)||
(commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?customColor[0]:customColor[1]"> (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?customColor[0]:customColor[1]">
</el-progress> </el-progress>
<div class="rate-box"> <div class="rate-box">
<div class="sanjiao" <div class="sanjiao"
:style="{'border-bottom-color':(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)|| :style="{'border-bottom-color':(commissionratioList.type==2&&commissionratioList.CommissionProfit>0&&commissionratioList.CommissionProfit>=item.StartValue)||
(commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue) (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)
?'#33B3FF':'#CACACA'}"></div> ?'#33B3FF':'#CACACA'}"></div>
<div class="rate full-width" <div class="rate full-width"
:class="{'active-rate':(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)|| :class="{'active-rate':(commissionratioList.type==2&&commissionratioList.CommissionProfit>0&&commissionratioList.CommissionProfit>=item.StartValue)||
(commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)}"> (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)}">
<i v-if="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)|| <i v-if="(commissionratioList.type==2&&commissionratioList.CommissionProfit>0&&commissionratioList.CommissionProfit>=item.StartValue)||
(commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)" class="el-icon-check" style="font-size:8px"></i> (commissionratioList.type!=2&&commissionratioList.CommissionProfit>0&&commissionratioList.AvgLureNum>=item.StartValue)" class="el-icon-check" style="font-size:8px"></i>
{{item.Rate}}{{commissionratioList.type==2?'%':''}} {{item.Rate}}{{commissionratioList.type==2?'%':''}}
</div> </div>
</div> </div>
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
&&this.commissionratioList.CommissionProfit>=data.StartValue&&this.commissionratioList.CommissionProfit<=data.EndValue){ &&this.commissionratioList.CommissionProfit>=data.StartValue&&this.commissionratioList.CommissionProfit<=data.EndValue){
return this.commissionratioList.CommissionProfit>25000?(this.commissionratioList.CommissionProfit/data.StartValue)*100:(this.commissionratioList.CommissionProfit/data.EndValue)*100 return this.commissionratioList.CommissionProfit>25000?(this.commissionratioList.CommissionProfit/data.StartValue)*100:(this.commissionratioList.CommissionProfit/data.EndValue)*100
}else{ }else{
return 100 return 0
} }
}else{ }else{
if(this.commissionratioList.type==1 if(this.commissionratioList.type==1
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
}else if(this.commissionratioList.type==3&&this.commissionratioList.AvgLureNum){ }else if(this.commissionratioList.type==3&&this.commissionratioList.AvgLureNum){
return (this.commissionratioList.AvgLureNum/data.StartValue)*100 return (this.commissionratioList.AvgLureNum/data.StartValue)*100
}else{ }else{
return 100 return 0
} }
} }
// return 100 // return 100
......
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