Commit 548fec67 authored by youjie's avatar youjie

no message

parent e4f77681
......@@ -1961,6 +1961,8 @@
}
if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
} else if(this.orderObj && this.orderObj.RB_Branch_Id){
this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
} else if (this.$route.query.companyID) {
this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
}
......@@ -2186,10 +2188,18 @@
if (x.Id == y) {
x.disabled = false;
if (num < 1 && !this.$route.query.edit) {
this.msg.RB_Branch_Id = x.Id
if(this.orderObj.RB_Branch_Id){
this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
}else{
this.msg.RB_Branch_Id = x.Id
}
}
if (thisId === x.Id && !this.$route.query.edit) {
this.msg.RB_Branch_Id = x.Id
if(this.orderObj.RB_Branch_Id){
this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
}else{
this.msg.RB_Branch_Id = x.Id
}
}
num = num + 1
}
......@@ -2326,9 +2336,6 @@
} 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
......@@ -2381,8 +2388,11 @@
this.emplyeeName = userInfo.emName;
this.DepartIDs = this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
if(this.orderObj&&this.orderObj.RB_Branch_Id){
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id;
}else{
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
}
this.companyMsg.RB_Group_Id = this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id;
this.IsUploadPic = this.$route.query.IsUploadPic;
this.msg.Cmd = this.$route.query.Cmd ? this.$route.query.Cmd : '';
......
......@@ -141,7 +141,7 @@
<div style="display: flex;justify-content: space-between; width: 100%;">
<div style="display: flex;flex-direction: column;flex-grow: 2;">
<div class="CommissionLadder-form" style="margin: 20px 0 10px 0;">
<div class="CommissionLadder Line" style="padding: 15px 20px 20px 0;">
<div class="CommissionLadder" style="padding: 15px 20px 20px 0;">
<div style="display: flex;align-items: center;justify-content: space-between; padding: 0 0 10px 20px;
">
<span style="font-size: 16px;font-weight: bold;">公司所有国内出发线路(单团.散拚)</span>
......@@ -258,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: 5px;margin-right: 5px;">{{CommissionInfor.BonusNum}}</span></span>
<span><span>每月人数35人以上</span></span>
</span>
</div>
......
......@@ -3,8 +3,9 @@
</style>
<template>
<el-tooltip class="item" effect="dark" content="预期提成详情" placement="top">
<img src="../../../assets/img/xiaosouYQ.png" @click="goDetails"
style="width: 12px;height: auto; cursor: pointer;color: #33B3FF;"></img>
<!-- <img src="../../../assets/img/xiaosouYQ.png" @click="goDetails"
style="width: 12px;height: auto; cursor: pointer;color: #33B3FF;"></img> -->
<i class="el-icon-document" style="font-size: 18px;color: red;cursor: pointer;" @click="goDetails"></i>
</el-tooltip>
</template>
......@@ -33,14 +34,13 @@
},
methods: {
goDetails(){
let userInfo = this.getLocalStorage();
console.log(this.type,'======')
return
let name
// let userInfo = this.getLocalStorage();
// console.log(this.type,'======')
let name = 'erpMyCustomerOrder'
this.$router.push({
name: name,
query: {
UserId: Number(userInfo.EmployeeId),
// UserId: Number(userInfo.EmployeeId),
isSale: 1,
blank: 'y'
}
......
......@@ -75,6 +75,8 @@
:percentage="setItemProgress(item)"
:status="setItemStatus(item)"
:format="setItemText(item)"
:text-color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
(commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?'#fff':'#666666'"
:color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
(commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?customColor[0]:customColor[1]">
</el-progress>
......@@ -86,7 +88,8 @@
<div class="rate full-width"
:class="{'active-rate':(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
(commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)}">
<i class="el-icon-check" style="font-size:8px"></i>
<i v-if="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
(commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)" class="el-icon-check" style="font-size:8px"></i>
{{item.Rate}}{{commissionratioList.type==2?'%':''}}
</div>
</div>
......@@ -159,22 +162,34 @@
methods: {
// 设置进度
setItemProgress(data) {
if(this.commissionratioList.AvgLureNum>=data.StartValue&&this.commissionratioList.AvfOrderNum>=data.EndValue){
return 100
let length = this.commissionratioList.CommissionRateList.length
let EndValue = this.commissionratioList.CommissionRateList[length-2].EndValue
let Rate = this.commissionratioList.CommissionRateList[length-1].Rate
if(this.commissionratioList.type==1
&&this.commissionratioList.AvgLureNum>=data.StartValue
&&this.commissionratioList.AvgLureNum<=data.EndValue){
return (this.commissionratioList.AvgLureNum/data.EndValue)*100
}else if(this.commissionratioList.type==3&&this.commissionratioList.AvgLureNum){
return (this.commissionratioList.AvgLureNum/data.StartValue)*100
}else{
return 100
return 100
}
if(this.commissionratioList.type==2){
return 100
}
// return 100
},
// 自定义进度条文字
setItemText(row) {
if(this.commissionratioList.type==2){
this.formatProgress(row)
return () => {
return `${row.EndValue2>9999?'>'+row.StartValue2:row.StartValue2+' - '+row.EndValue2}w`
return `${row.EndValue2>999?'>'+row.StartValue2:row.StartValue2+' - '+row.EndValue2}w`
}
}else if(this.commissionratioList.type==1){
return () => {
return `${row.StartValue+' - '+ row.EndValue}人`
return `${row.EndValue>999?'>'+row.StartValue:row.StartValue+' - '+row.EndValue}人`
// return `${row.StartValue+' - '+ row.EndValue}人`
}
}else{
return () => {
......
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