Skip to content

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

no message

parent 8b0fa03d
Hide whitespace changes
Inline Side-by-side
Showing with 365 additions and 214 deletions
src/components/FinancialModule/TradeCommission/CommissionRule.vue
View file @ f98404f7
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
cellpadding="0" cellpadding="0"
> >
<tr> <tr>
<td rowspan="2" width="150" style="min-width: 150px;">日本及其他提成比例<p>当月个人毛利润业绩金额</p> </td> <td rowspan="2" width="150" style="min-width: 150px;">日本线提成比例<p>当月个人毛利润业绩金额</p> </td>
<th style="min-width: 220px;" <th style="min-width: 220px;"
v-for="( son , sIndex ) in item.ProfitRuleList" v-for="( son , sIndex ) in item.ProfitRuleList"
:key="sIndex" :key="sIndex"
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
cellpadding="0" cellpadding="0"
> >
<tr> <tr>
<td rowspan="2" width="150" style="min-width: 150px;">欧洲及其他提成比例<p>当月个人毛利润业绩金额</p></td> <td rowspan="2" width="150" style="min-width: 150px;">欧洲线提成比例<p>当月个人毛利润业绩金额</p></td>
<th style="min-width: 220px;" <th style="min-width: 220px;"
v-for="( son , sIndex ) in item.EuropeProfitRuleList" v-for="( son , sIndex ) in item.EuropeProfitRuleList"
:key="sIndex" :key="sIndex"
...@@ -87,6 +87,27 @@ ...@@ -87,6 +87,27 @@
</tr> </tr>
</table> </table>
</div> </div>
<div style="width:100%;overflow-x: auto;">
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
>
<tr>
<td rowspan="2" width="150" style="min-width: 150px;">其他线提成比例<p>当月个人毛利润业绩金额</p> </td>
<th style="min-width: 220px;"
v-for="( son , sIndex ) in item.OtherProfitRuleList"
:key="sIndex"
>{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<=当月毛利润<':'<=当月毛利润'}}</span>
<span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span>
</th>
</tr>
<tr>
<td style="min-width: 220px;" v-for="( son , sIndex ) in item.OtherProfitRuleList" :key="sIndex"> {{ son.Rate }}%</td>
</tr>
</table>
</div>
<div style="width:100%;overflow-x: auto;"> <div style="width:100%;overflow-x: auto;">
<table <table
class="po_content singeRowTable" class="po_content singeRowTable"
...@@ -96,7 +117,7 @@ ...@@ -96,7 +117,7 @@
> >
<tr> <tr>
<td rowspan="2" width="150" style="min-width: 150px;">日本及其他人头奖励<p>成交人数</p></td> <td rowspan="2" width="150" style="min-width: 150px;">日本线人头奖励<p>成交人数</p></td>
<th style="min-width: 220px;" <th style="min-width: 220px;"
v-for="( son , sIndex ) in item.AwardRuleList" v-for="( son , sIndex ) in item.AwardRuleList"
...@@ -118,7 +139,7 @@ ...@@ -118,7 +139,7 @@
cellpadding="0" cellpadding="0"
> >
<tr> <tr>
<td rowspan="2" width="150" style="min-width: 150px;">欧洲及其他人头奖励<p>成交人数</p></td> <td rowspan="2" width="150" style="min-width: 150px;">欧洲线人头奖励<p>成交人数</p></td>
<th style="min-width: 220px;" <th style="min-width: 220px;"
v-for="( son , sIndex ) in item.EuropeAwardRuleList" v-for="( son , sIndex ) in item.EuropeAwardRuleList"
:key="sIndex" :key="sIndex"
...@@ -130,7 +151,29 @@ ...@@ -130,7 +151,29 @@
</tr> </tr>
</table> </table>
</div> </div>
<div style="width:100%;overflow-x: auto;">
<table
class="po_content singeRowTable"
style="border:1px solid #E6E6E6;"
cellspacing="0"
cellpadding="0"
>
<tr>
<td rowspan="2" width="150" style="min-width: 150px;">其他线人头奖励<p>成交人数</p></td>
<th style="min-width: 220px;"
v-for="( son , sIndex ) in item.OtherAwardRuleList"
:key="sIndex"
>
{{ son.StartValue }}{{son.EndValue&&son.EndValue!=-1?' ~ '+son.EndValue+' 人 ':' 人以上'}}
</th>
</tr>
<tr>
<td style="min-width: 220px;" v-for="( son , sIndex ) in item.OtherAwardRuleList" :key="sIndex">{{ son.Rate }} 元</td>
</tr>
</table>
</div>
<div style="width:100%;overflow-x: auto;"> <div style="width:100%;overflow-x: auto;">
<table <table
class="po_content singeRowTable" class="po_content singeRowTable"
...@@ -172,7 +215,7 @@ ...@@ -172,7 +215,7 @@
</el-form-item> </el-form-item>
</div> </div>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px"> <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">日本及其他人头奖励</p> <p class="ImpressionTicketing-title">日本线人头奖励</p>
<div class="ImpressionTicketing-msgbox" <div class="ImpressionTicketing-msgbox"
v-for="(item,index) in form.AwardRuleList" :key="index"> v-for="(item,index) in form.AwardRuleList" :key="index">
<div> <div>
...@@ -215,7 +258,7 @@ ...@@ -215,7 +258,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px"> <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">日本及其他提成比例</p> <p class="ImpressionTicketing-title">日本线提成比例</p>
<div class="ImpressionTicketing-msgbox" v-for="(item,index) in form.ProfitRuleList" :key="index"> <div class="ImpressionTicketing-msgbox" v-for="(item,index) in form.ProfitRuleList" :key="index">
<div> <div>
<el-form-item <el-form-item
...@@ -260,7 +303,7 @@ ...@@ -260,7 +303,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px"> <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">欧洲及其他人头奖励</p> <p class="ImpressionTicketing-title">欧洲线人头奖励</p>
<div class="ImpressionTicketing-msgbox" <div class="ImpressionTicketing-msgbox"
v-for="(item,index) in form.EuropeAwardRuleList" :key="index"> v-for="(item,index) in form.EuropeAwardRuleList" :key="index">
<div> <div>
...@@ -303,7 +346,7 @@ ...@@ -303,7 +346,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px"> <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">欧洲及其他提成比例</p> <p class="ImpressionTicketing-title">欧洲线提成比例</p>
<div class="ImpressionTicketing-msgbox" <div class="ImpressionTicketing-msgbox"
v-for="(item,index) in form.EuropeProfitRuleList" :key="index"> v-for="(item,index) in form.EuropeProfitRuleList" :key="index">
<div> <div>
...@@ -349,6 +392,94 @@ ...@@ -349,6 +392,94 @@
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">其他线人头奖励</p>
<div class="ImpressionTicketing-msgbox"
v-for="(item,index) in form.OtherAwardRuleList" :key="index">
<div>
<el-form-item
:label="form.OtherAwardRuleList.length>0?`开始值 ${index+1} `:` ` "
:prop="`OtherAwardRuleList.${index}.StartValue`"
:rules="rules.StartValue"
label-width="100px"
label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.StartValue" clearable></el-input>
</el-form-item>
</div>
<div>
<el-form-item
:label="form.OtherAwardRuleList.length>0?`结束值 ${index+1} `:` ` "
:prop="`OtherAwardRuleList.${index}.EndValue`"
:rules="rules.EndValue"
label-width="100px"
label-position="left">
<el-input-number type="number" :min="-1" :max="99999999"
v-model="item.EndValue" clearable :controls="false"></el-input-number>
</el-form-item>
</div>
<div>
<el-form-item
:label="form.OtherAwardRuleList.length>0?`奖励 ${index+1} `:` ` "
:prop="`OtherAwardRuleList.${index}.Rate`"
:rules="rules.Rate"
label-width="100px"
label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.Rate"></el-input>
</el-form-item>
</div>
<div class="ImpressionTicketing-msg-but">
<span @click="addRule(item,index,7)" v-if="index==0" class="el-icon-circle-plus-outline itc-outline"></span>
<span @click="deleteRule(item,index,7)" v-else class="el-icon-delete itc-delete"></span>
</div>
</div>
</el-form-item>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">其他线提成比例</p>
<div class="ImpressionTicketing-msgbox" v-for="(item,index) in form.OtherProfitRuleList" :key="index">
<div>
<el-form-item
:label="form.OtherProfitRuleList.length>0?`开始值 ${index+1} `:` ` "
:prop="`OtherProfitRuleList.${index}.StartValue`"
:rules="rules.StartValue"
label-width="100px"
label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.StartValue" clearable></el-input>
</el-form-item>
</div>
<div>
<el-form-item
:label="form.OtherProfitRuleList.length>0?`结束值 ${index+1} `:` ` "
:prop="`OtherProfitRuleList.${index}.EndValue`"
:rules="rules.EndValue"
label-width="100px"
label-position="left">
<el-input-number type="number" :min="-1" :max="99999999"
v-model="item.EndValue" clearable :controls="false"></el-input-number>
</el-form-item>
</div>
<div>
<el-form-item
:label="form.OtherProfitRuleList.length>0?`比例 ${index+1} `:` ` "
:prop="`OtherProfitRuleList.${index}.Rate`"
:rules="rules.Rate2"
label-width="100px"
label-position="left">
<div class="Impression-ratio-box">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.Rate"></el-input>
<span class="Impression-ratio-right">%</span>
</div>
</el-form-item>
</div>
<div class="ImpressionTicketing-msg-but">
<span @click="addRule(item,index,6)" v-if="index==0" class="el-icon-circle-plus-outline itc-outline"></span>
<span @click="deleteRule(item,index,6)" v-else class="el-icon-delete itc-delete"></span>
</div>
</div>
</el-form-item>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px"> <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">年终奖励</p> <p class="ImpressionTicketing-title">年终奖励</p>
<div class="ImpressionTicketing-msgbox" v-for="(item,index) in form.BonusRuleList" :key="index"> <div class="ImpressionTicketing-msgbox" v-for="(item,index) in form.BonusRuleList" :key="index">
...@@ -398,121 +529,35 @@ ...@@ -398,121 +529,35 @@
return { return {
value:"", value:"",
rules: { rules: {
Name: [{ Name: [{ required: true, message: '请输入规则名称', trigger: "blur"}],
required: true, BonusMinPNum: [{ required: true, message: '请输入达标人数', trigger: "blur"}],
message: '请输入规则名称', SalesRate: [{ required: true, message: '请输入提成比例', trigger: "blur"}],
trigger: "blur" EmployeeId: [{ required: true, message: '请选择参与人员', trigger: 'change'}],
}], StartValue: [{ required: true, message: "请输入开始值", trigger: "blur"}],
BonusMinPNum: [{ EndValue: [{ required: true, message: "请输入结束值", trigger: "blur"}],
required: true, Rate: [{ required: true, message: "请输入金额", trigger: "blur"}],
message: '请输入达标人数', Rate2: [{ required: true, message: "请输入比例", trigger: "blur"}],
trigger: "blur" Content: [{ required: true, message: "请输入限制", trigger: "blur"}],
}],
SalesRate: [{
required: true,
message: '请输入提成比例',
trigger: "blur"
}],
EmployeeId: [{
required: true,
message: '请选择参与人员',
trigger: 'change'
}],
StartValue: [{
required: true,
message: "请输入开始值",
trigger: "blur"
}],
EndValue: [{
required: true,
message: "请输入结束值",
trigger: "blur"
}],
Rate: [{
required: true,
message: "请输入金额",
trigger: "blur"
}],
Rate2: [{
required: true,
message: "请输入比例",
trigger: "blur"
}],
Content: [{
required: true,
message: "请输入限制",
trigger: "blur"
}],
}, },
AwardRuleList: AwardRuleList:{ StartValue:0, EndValue:null, Rate:null},
{ ProfitRuleList:{ StartValue:0, EndValue:null, Rate:null},
StartValue:0, EuropeAwardRuleList:{ StartValue:0, EndValue:null, Rate:null},
EndValue:null, EuropeProfitRuleList:{ StartValue:0, EndValue:null, Rate:null},
Rate:null OtherAwardRuleList:{ StartValue:0, EndValue:null, Rate:null},
}, OtherProfitRuleList:{ StartValue:0, EndValue:null, Rate:null},
ProfitRuleList: BonusRuleList:{ StartValue:0, Rate:null},
{
StartValue:0,
EndValue:null,
Rate:null
},
EuropeAwardRuleList:
{
StartValue:0,
EndValue:null,
Rate:null
},
EuropeProfitRuleList:
{
StartValue:0,
EndValue:null,
Rate:null
},
BonusRuleList:
{
StartValue:0,
Rate:null
}
,
form:{ form:{
Id:0, Id:0,
Name:'', Name:'',
SalesRate: 0, SalesRate: 0,
BonusMinPNum: 0, BonusMinPNum: 0,
AwardRuleList:[ AwardRuleList:[ { StartValue:0, EndValue:null, Rate:null }],
{ ProfitRuleList:[ { StartValue:0, EndValue:null, Rate:null }],
StartValue:0, EuropeAwardRuleList:[ { StartValue:0, EndValue:null, Rate:null }],
EndValue:null, EuropeProfitRuleList:[ { StartValue:0, EndValue:null, Rate:null }],
Rate:null OtherAwardRuleList:[{ StartValue:0, EndValue:null, Rate:null}],
} OtherProfitRuleList:[{ StartValue:0, EndValue:null, Rate:null}],
], BonusRuleList:[ { StartValue:0, Rate:null }],
ProfitRuleList:[
{
StartValue:0,
EndValue:null,
Rate:null
}
],
EuropeAwardRuleList:[
{
StartValue:0,
EndValue:null,
Rate:null
}
],
EuropeProfitRuleList:[
{
StartValue:0,
EndValue:null,
Rate:null
}
],
BonusRuleList:[
{
StartValue:0,
Rate:null
}
],
}, },
ruleLoading: false, ruleLoading: false,
ruleVisible:false, ruleVisible:false,
...@@ -540,6 +585,10 @@ ...@@ -540,6 +585,10 @@
this.form.EuropeAwardRuleList.push(JSON.parse(JSON.stringify(this.EuropeAwardRuleList))) this.form.EuropeAwardRuleList.push(JSON.parse(JSON.stringify(this.EuropeAwardRuleList)))
}else if(type==4){ }else if(type==4){
this.form.EuropeProfitRuleList.push(JSON.parse(JSON.stringify(this.EuropeProfitRuleList))) this.form.EuropeProfitRuleList.push(JSON.parse(JSON.stringify(this.EuropeProfitRuleList)))
}else if(type==6){
this.form.OtherAwardRuleList.push(JSON.parse(JSON.stringify(this.OtherAwardRuleList)))
}else if(type==7){
this.form.OtherProfitRuleList.push(JSON.parse(JSON.stringify(this.OtherProfitRuleList)))
}else{ }else{
this.form.BonusRuleList.push(JSON.parse(JSON.stringify(this.BonusRuleList))) this.form.BonusRuleList.push(JSON.parse(JSON.stringify(this.BonusRuleList)))
} }
...@@ -554,6 +603,10 @@ ...@@ -554,6 +603,10 @@
this.form.EuropeAwardRuleList.splice(index,1) this.form.EuropeAwardRuleList.splice(index,1)
}else if(type==4){ }else if(type==4){
this.form.EuropeProfitRuleList.splice(index,1) this.form.EuropeProfitRuleList.splice(index,1)
}else if(type==6){
this.form.OtherAwardRuleList.splice(index,1)
}else if(type==7){
this.form.OtherProfitRuleList.splice(index,1)
}else{ }else{
this.form.BonusRuleList.splice(index,1) this.form.BonusRuleList.splice(index,1)
} }
...@@ -574,6 +627,8 @@ ...@@ -574,6 +627,8 @@
ProfitRuleList:item.ProfitRuleList, ProfitRuleList:item.ProfitRuleList,
EuropeAwardRuleList:item.EuropeAwardRuleList, EuropeAwardRuleList:item.EuropeAwardRuleList,
EuropeProfitRuleList:item.EuropeProfitRuleList, EuropeProfitRuleList:item.EuropeProfitRuleList,
OtherAwardRuleList:item.OtherAwardRuleList,
OtherProfitRuleList:item.OtherProfitRuleList,
BonusRuleList:item.BonusRuleList, BonusRuleList:item.BonusRuleList,
} }
}, },
......
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>
<div style="display: flex;" v-if="isAnnualBonus"> <div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0;"> <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,92 +305,104 @@ ...@@ -265,92 +305,104 @@
<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 style="display: flex;justify-content: space-between;">
<div class="CommissionLadder Line" style="margin: 20px 0 0 10px;"> <span style="font-weight: bold;font-size: 16px;">国内提成
<div style="display: flex;justify-content: space-between;"> <span style="font-size: 13px;color: red;margin-left: 20px;">
<span style="font-weight: bold;font-size: 16px;">国内提成</span> 注:国内提成需结团后方可发放提成，以实际结团为准，此处只提供参考</span>
<div> </span>
<detailsButtom :type="2" :obj="commissionMsg" :Month="Month"/>
</div>
</div>
<p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:国内提成需结团后方可发放提成，以实际结团为准，此处只提供参考</span></p>
<div class="ExpectedCommission-table">
<el-table border ref="multipleTable" :data="DomesticLine.Rlist">
<el-table-column width="80" prop="RuleName"
label="团队类型" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.RuleName}}
</template>
</el-table-column>
<el-table-column width="70" prop="OrderNum"
label="团队状态">
<template slot-scope="scope">
<div class="tableTd">已结团</div>
<div>
未结团
</div>
</template>
</el-table-column>
<el-table-column width="70" prop="OrderNum"
label="订单数">
<template slot-scope="scope">
<div class="tableTd">{{scope.row.OrderNum?scope.row.OrderNum:scope.row.OrderNum}}</div>
<div>
{{scope.row.WaitOrderNum?scope.row.WaitOrderNum:scope.row.WaitOrderNum}}
</div>
</template>
</el-table-column>
<el-table-column width="70" prop="PeopleNum"
label="报名数">
<template slot-scope="scope">
<div class="tableTd">{{scope.row.PeopleNum?scope.row.PeopleNum:scope.row.PeopleNum}}</div>
<div> <div>
{{scope.row.WaitPeopleNum?scope.row.WaitPeopleNum:scope.row.WaitPeopleNum}} <detailsButtom :type="2" :obj="commissionMsg" :Month="Month"/>
</div> </div>
</template> </div>
</el-table-column> <p style="padding: 0 0 10px 0;text-align: left;">
<el-table-column prop="Way"
label="提成方式"> </p>
<template slot-scope="scope"> <div class="ExpectedCommission-table">
{{scope.row.Way==2?'利润提成':'人头奖励'}} <el-table border ref="multipleTable" :data="isExpansion?newRlistAll:newRlist">
</template> <el-table-column width="80" prop="RuleName"
</el-table-column> label="团队类型" show-overflow-tooltip>
<el-table-column prop="ProfitRate" <template slot-scope="scope">
label="提成" width="60"> {{scope.row.RuleName}}
<template slot-scope="scope"> </template>
<template v-if="scope.row.Way==1"> </el-table-column>
{{scope.row.Money+'/人'}} <el-table-column width="70" prop="OrderNum"
label="团队状态">
<template slot-scope="scope">
<div class="tableTd">已结团</div>
<div>
未结团
</div>
</template> </template>
<template v-if="scope.row.Way==2"> </el-table-column>
{{scope.row.ProfitRate+'%'}} <el-table-column width="70" prop="OrderNum"
label="订单数">
<template slot-scope="scope">
<div class="tableTd">{{scope.row.OrderNum?scope.row.OrderNum:scope.row.OrderNum}}</div>
<div>
{{scope.row.WaitOrderNum?scope.row.WaitOrderNum:scope.row.WaitOrderNum}}
</div>
</template> </template>
<!-- <p v-if="scope.row.Way == 2" style="font-size: 12px;color: #999999;white-space: wrap;"> </el-table-column>
利润比{{scope.row.ProfitRate}}% <el-table-column width="70" prop="PeopleNum"
利润<=0时 {{scope.row.Money}}元/人</p> --> label="报名数">
</template> <template slot-scope="scope">
</el-table-column> <div class="tableTd">{{scope.row.PeopleNum?scope.row.PeopleNum:scope.row.PeopleNum}}</div>
<el-table-column prop="Profit" <div>
label="预期利润" show-overflow-tooltip> {{scope.row.WaitPeopleNum?scope.row.WaitPeopleNum:scope.row.WaitPeopleNum}}
<template slot-scope="scope"> </div>
<div class="tableTd">{{scope.row.Way==2&&scope.row.Profit?scope.row.Profit:'-'}}</div> </template>
<div> </el-table-column>
{{scope.row.Way==2&&scope.row.WaitProfit?scope.row.WaitProfit:'-'}} <el-table-column prop="Way"
</div> label="提成方式">
</template> <template slot-scope="scope">
</el-table-column> {{scope.row.Way==2?'利润提成':'人头奖励'}}
<el-table-column prop="Commission" </template>
label="预期提成" show-overflow-tooltip> </el-table-column>
<template slot-scope="scope"> <el-table-column prop="ProfitRate"
<div class="tableTd">{{scope.row.Commission}}</div> label="提成" width="60">
<div> <template slot-scope="scope">
{{scope.row.WaitCommission}} <template v-if="scope.row.Way==1">
{{scope.row.Money+'/人'}}
</template>
<template v-if="scope.row.Way==2">
{{scope.row.ProfitRate+'%'}}
</template>
<!-- <p v-if="scope.row.Way == 2" style="font-size: 12px;color: #999999;white-space: wrap;">
利润比{{scope.row.ProfitRate}}%
利润<=0时 {{scope.row.Money}}元/人</p> -->
</template>
</el-table-column>
<el-table-column prop="Profit"
label="预期利润" show-overflow-tooltip>
<template slot-scope="scope">
<div class="tableTd">{{scope.row.Way==2&&scope.row.Profit?scope.row.Profit:'-'}}</div>
<div>
{{scope.row.Way==2&&scope.row.WaitProfit?scope.row.WaitProfit:'-'}}
</div>
</template>
</el-table-column>
<el-table-column prop="Commission"
label="预期提成" show-overflow-tooltip>
<template slot-scope="scope">
<div class="tableTd">{{scope.row.Commission}}</div>
<div>
{{scope.row.WaitCommission}}
</div>
</template>
</el-table-column>
</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>
</template> </div>
</el-table-column> </div>
</el-table>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="ExpectedCommission-form"> <div class="ExpectedCommission-form">
...@@ -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