Bladeren bron

feat: 内蒙古养护,小数位数

zhangweicheng 4 jaren geleden
bovenliggende
commit
bae625faba
1 gewijzigde bestanden met toevoegingen van 9 en 5 verwijderingen
  1. 9 5
      web/building_saas/main/js/views/material_calc_view.js

+ 9 - 5
web/building_saas/main/js/views/material_calc_view.js

@@ -630,16 +630,20 @@ materialCalcObj = {
         kmDistance =  scMathUtil.roundForObj(kmDistance,decimal);
         //用截取的方式,一段段取值
         let less = kmDistance - 5;//kmDistance <= 5 这段
+        let backLess = less;
         if(less <= 0) return baseFreight ;  //kmDistance <= 5 的时候直接取baseFreight
 
         //5< kmDistance <= 15  每增运1km 则增加0.6
-        less = less - 10;
-        if(less <=0)  return scMathUtil.roundForObj(baseFreight + scMathUtil.roundForObj((less + 10) * 0.6,6),decimal);//baseFreight + (less + 10) * 0.6;
-        baseFreight = baseFreight + 10 * 0.6; //累加5到15这一段的运费;
+        less = scMathUtil.roundForObj(less - 10,decimal);
+        backLess = scMathUtil.roundForObj(less + 10,decimal);
+
+        if(less <=0)  return scMathUtil.roundForObj(baseFreight + scMathUtil.roundForObj(backLess * 0.6,6),decimal);//baseFreight + (less + 10) * 0.6;
+        baseFreight = scMathUtil.roundForObj(baseFreight + 10 * 0.6,6); //累加5到15这一段的运费;
 
         //15< kmDistance <= 100  每增运1km 则增加0.45
-        less = less - 85;
-        if(less <=0) return scMathUtil.roundForObj(baseFreight + scMathUtil.roundForObj((less + 85)*0.45,6),decimal);//baseFreight + (less + 85)*0.45;
+        less = scMathUtil.roundForObj(less - 85,decimal);
+        backLess = scMathUtil.roundForObj(less + 85,decimal);
+        if(less <=0) return scMathUtil.roundForObj(baseFreight + scMathUtil.roundForObj(backLess*0.45,6),decimal);//baseFreight + (less + 85)*0.45;
         baseFreight = scMathUtil.roundForObj(baseFreight + scMathUtil.roundForObj(85*0.45,6),6) ;  //累加15到100这一段的运费;
         return scMathUtil.roundForObj(baseFreight + scMathUtil.roundForObj(less * 0.35,6),decimal); // >100 的所有部分每增运1km 则增加0.35  baseFreight + less * 0.35
     },