Commit 6e1e0c93 authored by youjie's avatar youjie

no message

parent bda9c83a
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
// 设置进度 // 设置进度
setItemProgress(data,index) { setItemProgress(data,index) {
let oEndValue let oEndValue
let length = this.commissionratioList.CommissionRateList.length-1
if(index>0) oEndValue = this.commissionratioList.CommissionRateList[index-1].EndValue if(index>0) oEndValue = this.commissionratioList.CommissionRateList[index-1].EndValue
//let length = this.commissionratioList.CommissionRateList.length //let length = this.commissionratioList.CommissionRateList.length
//let EndValue = this.commissionratioList.CommissionRateList[length-2].EndValue //let EndValue = this.commissionratioList.CommissionRateList[length-2].EndValue
...@@ -171,7 +172,7 @@ ...@@ -171,7 +172,7 @@
if(this.commissionratioList.type==2){ if(this.commissionratioList.type==2){
if(this.commissionratioList.CommissionProfit if(this.commissionratioList.CommissionProfit
&&this.commissionratioList.CommissionProfit>=data.StartValue&&this.commissionratioList.CommissionProfit<=data.EndValue){ &&this.commissionratioList.CommissionProfit>=data.StartValue&&this.commissionratioList.CommissionProfit<=data.EndValue){
if(this.commissionratioList.CommissionProfit>oEndValue) return 100 if(this.commissionratioList.CommissionProfit>oEndValue&&index==length) return 100
else return this.commissionratioList.CommissionProfit>oEndValue?(this.commissionratioList.CommissionProfit/data.StartValue)*100:(this.commissionratioList.CommissionProfit/data.EndValue)*100 else return this.commissionratioList.CommissionProfit>oEndValue?(this.commissionratioList.CommissionProfit/data.StartValue)*100:(this.commissionratioList.CommissionProfit/data.EndValue)*100
}else{ }else{
if(this.commissionratioList.CommissionProfit!=0){ if(this.commissionratioList.CommissionProfit!=0){
...@@ -182,7 +183,7 @@ ...@@ -182,7 +183,7 @@
if(this.commissionratioList.type==1 if(this.commissionratioList.type==1
&&this.commissionratioList.AvgLureNum>=data.StartValue &&this.commissionratioList.AvgLureNum>=data.StartValue
&&this.commissionratioList.AvgLureNum<=data.EndValue){ &&this.commissionratioList.AvgLureNum<=data.EndValue){
if(this.commissionratioList.AvgLureNum>oEndValue) return 100 if(this.commissionratioList.AvgLureNum>oEndValue&&index==length) return 100
else return (this.commissionratioList.AvgLureNum/data.EndValue)*100 else return (this.commissionratioList.AvgLureNum/data.EndValue)*100
}else if(this.commissionratioList.type==3&&this.commissionratioList.AvfOrderNum){ }else if(this.commissionratioList.type==3&&this.commissionratioList.AvfOrderNum){
return (this.commissionratioList.AvfOrderNum/data.StartValue)*100 return (this.commissionratioList.AvfOrderNum/data.StartValue)*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