|
|
@@ -652,16 +652,16 @@ materialCalcObj = {
|
|
|
kmDistance = scMathUtil.roundForObj(kmDistance,decimal);
|
|
|
let resultString = baseFreight+"";
|
|
|
//用截取的方式,一段段取值
|
|
|
- let less = kmDistance - 5;//kmDistance <= 5 这段
|
|
|
+ let less = scMathUtil.roundForObj(kmDistance - 5,decimal);//kmDistance <= 5 这段
|
|
|
if(less <= 0) return resultString ; //kmDistance <= 5 的时候直接取baseFreight
|
|
|
|
|
|
//5< kmDistance <= 15 每增运1km 则增加0.6
|
|
|
- less = less - 10;
|
|
|
- if(less <=0) return `(${resultString}+0.6x${less + 10})`;//baseFreight + (less + 10) * 0.6;
|
|
|
+ less = scMathUtil.roundForObj(less - 10,decimal);
|
|
|
+ if(less <=0) return `(${resultString}+0.6x${scMathUtil.roundForObj(less + 10,decimal)})`;//baseFreight + (less + 10) * 0.6;
|
|
|
resultString = `${resultString}+0.6x10`;
|
|
|
//15< kmDistance <= 100 每增运1km 则增加0.45
|
|
|
- less = less - 85;
|
|
|
- if(less <=0) return `(${resultString}+0.45x${less + 85})`; //baseFreight + (less + 85)*0.45;
|
|
|
+ less = scMathUtil.roundForObj(less - 85,decimal);
|
|
|
+ if(less <=0) return `(${resultString}+0.45x${scMathUtil.roundForObj(less + 85,decimal)})`; //baseFreight + (less + 85)*0.45;
|
|
|
resultString = `${resultString}+0.45x85`;
|
|
|
return `(${resultString}+0.35x${less})`;// >100 的所有部分每增运1km 则增加0.35 baseFreight + less * 0.35
|
|
|
},
|