Skip to content

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

no message

parent 80c698dc
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 37 deletions
src/components/FinancialModule/TradeCommission/TicketCommission.vue
View file @ 617e6e5d
......@@ -260,17 +260,23 @@
// 点击制单
YijianZD(item) {
let Money
if(this.msg.OutBranchId>-1){
if(item.BranchCommission>0){
Money=item.BranchCommission
}else{
this.Error("公司提成为0,不能制单!")
return;
}
// if(this.msg.OutBranchId>-1){
// if(item.BranchCommission>0){
// Money=item.BranchCommission
// }else{
// this.Error("公司提成为0,不能制单!")
// return;
// }
}else{
Money=item.SumPrice
}
// }else{
// Money=item.SumPrice
// }
if(item.BranchCommission>0){
Money=item.BranchCommission
}else{
this.Error("公司提成为0,不能制单!")
return;
}
let obj = {
CostType: 16,
Money: Money,
......@@ -278,7 +284,8 @@
XSTC: 1,
OtherType:72,
ReFinanceId:item.Id,
isRB_Branch_Id: true
isRB_Branch_Id: true,
RB_Branch_Id: this.msg.OutBranchId
}
let query = {
blank: "y",
......
src/components/FinancialModule/TradeCommission/TicketUserDetails.vue
View file @ 617e6e5d
......@@ -164,6 +164,7 @@
<li>
<em>部门</em>
<el-select filterable size="mini" v-model='msg.RB_Department_Id'
:disabled="disabled"
@change='getEmployee();handleCurrentChange(1)'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for='item in departmentList'
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 617e6e5d
......@@ -2326,6 +2326,9 @@
} else {
this.orderObj = this.$route.query.orderObj ? JSON.parse(this.$route.query.orderObj) : null;
}
if(this.orderObj.RB_Branch_Id){
this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
}
this.isFrompassenger = this.orderObj ? this.orderObj.isFromPassenger : undefined;
let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length > 0) ? this.orderObj
.TCIDList[0] : 0
......
src/components/sale/ExpectedCommission.vue
View file @ 617e6e5d
......@@ -92,14 +92,32 @@
color: red;
margin-right: 20px;
}
/deep/.ExpectedCommission-table .cell{
padding: 0 !important;
text-indent: 10px;
}
/deep/.ExpectedCommission-table .el-table .el-table__cell{
padding: 0 !important;
}
/deep/.ExpectedCommission-table .has-gutter .el-table__cell{
padding: 7px 0 !important;
}
.tableTd{
line-height: 30px;
border-bottom: 1px solid #DEE1E6;
}
.tableTd+ div{
line-height: 30px;
}
</style>
<template>
<div style="height: 92vh;overflow-y: scroll;">
<div style="display: flex;align-items: center; justify-content: space-between;background: #fff;
height: 40px;padding: 0 20px;">
<div class="headerTitle">
<template v-if="CommissionInfor">
<p>总提成：<span>{{CommissionInfor.TotalCMoney}}</span></p>
<template v-if="CommissionInfor.TotalCMoney">
<!-- <p>总提成：<span>{{CommissionInfor.TotalCMoney}}</span></p> -->
<p>总订单数：<span>{{CommissionInfor.SalesOrderNum+CommissionInfor.JapanOrderNum+CommissionInfor.EuropeOrderNum+GNOrderNum}}</span></p>
<p>总人头数：<span>{{CommissionInfor.PeopleNum+CommissionInfor.EuropePNum+CommissionInfor.SalesPeopleNum+CommissionInfor.JapanPeopleNum+CommissionInfor.EuropePeopleNum+GNEopleNum}}</span></p>
<p>总预期奖金：<span>{{CommissionInfor.PeopleMoney+CommissionInfor.EuropeMoney}}</span></p>
......@@ -240,7 +258,7 @@
</div>
<p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:年终奖励从每年3月起始</span></p>
<div class="CommissionInfor">
<span>连续达标 <span style="margin-left: 10px;">{{CommissionInfor.BonusNum}}</span>月</span>
<span>达标 <span style="margin-left: 10px;">{{CommissionInfor.BonusNum}}</span>月</span>
<span><span>每月人数35人以上</span></span>
</span>
</div>
......@@ -257,8 +275,8 @@
<detailsButtom :type="5" :obj="detailsInfor"/>
</div>
</div>
<p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:国内提成需结团后方可发放提成，以实际结团为准，此外只提供参考</span></p>
<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>
......@@ -268,15 +286,27 @@
</el-table-column>
<el-table-column width="70" prop="OrderNum"
label="订单数">
<template slot-scope="scope">{{scope.row.OrderNum?scope.row.OrderNum:'-'}}</template>
<template slot-scope="scope">
<div class="tableTd">{{scope.row.OrderNum?scope.row.OrderNum:'-'}}</div>
<div>
{{scope.row.WaitOrderNum?scope.row.WaitOrderNum:'-'}}
</div>
</template>
</el-table-column>
<el-table-column width="70" prop="PeopleNum"
label="报名数">
<template slot-scope="scope">{{scope.row.PeopleNum?scope.row.PeopleNum:'-'}}</template>
<template slot-scope="scope">
<div class="tableTd">{{scope.row.PeopleNum?scope.row.PeopleNum:'-'}}</div>
<div>
{{scope.row.WaitPeopleNum?scope.row.WaitPeopleNum:'-'}}
</div>
</template>
</el-table-column>
<el-table-column prop="Way"
label="提成方式">
<template slot-scope="scope">{{scope.row.Way==2?'利润提成':'人头奖励'}}</template>
<template slot-scope="scope">
{{scope.row.Way==2?'利润提成':'人头奖励'}}
</template>
</el-table-column>
<el-table-column prop="ProfitRate"
label="提成" width="150">
......@@ -295,11 +325,21 @@
<el-table-column prop="Profit"
label="预期利润" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.Way==2&&scope.row.Profit?scope.row.Profit:'-'}}
<div class="tableTd">{{scope.row.Way==2&&scope.row.Profit?scope.row.Profit:'-'}}</div>
<div>
{{scope.row.WaitProfit?scope.row.WaitProfit:'-'}}
</div>
</template>
</el-table-column>
<el-table-column prop="Commission"
label="预期提成" show-overflow-tooltip><template slot-scope="scope">{{scope.row.Commission}}</template></el-table-column>
label="预期提成" show-overflow-tooltip>
<template slot-scope="scope">
<div class="tableTd">{{scope.row.Commission}}</div>
<div>
{{scope.row.WaitCommission?scope.row.WaitCommission:'-'}}
</div>
</template>
</el-table-column>
</el-table>
</div>
</div>
......@@ -543,7 +583,7 @@
// 年终奖
this.AnnualBonus.AvfOrderNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0
this.AnnualBonus.Commission = this.CommissionInfor.BonusPeriods?this.CommissionInfor.BonusPeriods:0
// console.log(this.CommissionInfor,'----')
console.log(this.CommissionInfor,'----')
}else {
this.Error(res.data.message);
}
......
src/components/sale/components/progressComm.vue
View file @ 617e6e5d
......@@ -75,13 +75,17 @@
:percentage="setItemProgress(item)"
:status="setItemStatus(item)"
:format="setItemText(item)"
:color="commissionratioList.AvgLureNum>item.StartValue?customColor[0]:customColor[1]">
:color="commissionratioList.CommissionRate>=item.Rate||
commissionratioList.AvgLureNum>item.StartValue?customColor[0]:customColor[1]">
</el-progress>
<div class="rate-box">
<div class="sanjiao"
:style="{'border-bottom-color':commissionratioList.AvgLureNum>item.StartValue?'#33B3FF':'#CACACA'}"></div>
:style="{'border-bottom-color':commissionratioList.CommissionRate>=item.Rate||
commissionratioList.AvgLureNum>item.StartValue
?'#33B3FF':'#CACACA'}"></div>
<div class="rate full-width"
:class="{'active-rate':commissionratioList.AvgLureNum>item.StartValue}">
:class="{'active-rate':commissionratioList.CommissionRate>=item.Rate||
commissionratioList.AvgLureNum>item.StartValue}">
<i class="el-icon-check" style="font-size:8px"></i>
{{item.Rate}}{{commissionratioList.type==2?'%':''}}
</div>
......@@ -155,18 +159,18 @@
methods: {
// 设置进度
setItemProgress(data) {
if(this.commissionratioList.AvgLureNum>=data.StartValue&&this.commissionratioList.AvfOrderNum>=data.EndValue){
return 100
}else{
return 100
}
if(this.commissionratioList.AvgLureNum>=data.StartValue&&this.commissionratioList.AvfOrderNum>=data.EndValue){
return 100
}else{
return 100
}
},
// 自定义进度条文字
setItemText(row) {
if(this.commissionratioList.type==2){
this.formatProgress(row)
return () => {
return row.StartValue2 + ' - ' + `${row.EndValue2>9999?'9999':row.EndValue2}`+`${row.StartValue>=10000||row.EndValue>=10000?'w':''}`
return `${row.EndValue2>9999?'>'+row.StartValue2:row.StartValue2+' - '+row.EndValue2}w`
}
}else if(this.commissionratioList.type==1){
return () => {
......@@ -188,14 +192,17 @@
formatProgress(data){
let obj = JSON.parse(JSON.stringify(data))
if(obj.StartValue>=10000) {
data.StartValue2 = Math.floor(obj.StartValue/10000)
data.StartValue2 = (obj.StartValue/1000).toFixed(1)>0?(obj.StartValue/10000).toFixed(1):0 //Math.floor(obj.StartValue/10000)
if(data.StartValue2.indexOf('.0')!=-1){
data.StartValue2 = data.StartValue2.slice(0,1)
}
}else{
data.StartValue2 = obj.StartValue
data.StartValue2 = (obj.StartValue/10000).toFixed(1)>0?(obj.StartValue/10000).toFixed(1):0
}
if(obj.EndValue>=10000) {
data.EndValue2 = obj.EndValue/10000
}else{
data.EndValue2 = obj.EndValue
data.EndValue2 = (obj.EndValue/1000).toFixed(1)>0?(obj.EndValue/10000).toFixed(1):0
}
},
}
......
src/components/sale/sale.vue
View file @ 617e6e5d
......@@ -69,8 +69,11 @@
<span>￥</span>
<span>{{data.totalCommission}}</span>
</p>
<p v-if="data.peopelBonus">人头奖励：{{data.peopelBonus}}</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.periodsName}}期</p>
<p >
<span v-if="data.peopelBonus" style="margin-right: 10px;">人头奖励：+{{data.peopelBonus}}</span>
<span style="color: #BDBDBD;font-size: 13px;
padding: 0 0 5px 0;">{{data.periodsName}}期</span>
</p>
</div>
<!-- <span>￥<p class="tc">{{data.totalCommission}}</p></span>-->
<div stye="font-size: 16px;color: #666666;display: block;display: inline-block;">
......@@ -664,7 +667,6 @@
this.apipost('customerIndex_post_GetMySelfSellInfo', {}, res => {
if (res.data.resultCode == 1) {
this.data = res.data.data;
console.log(this.data,'========')
this.myScore = res.data.data.taskCapacityList;
this.myScore.forEach(item => {
if (item.score < 60) {
......
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