Browse Source

汇总计算小数位数。

chenshilong 4 years atrás
parent
commit
61fae5ba40
1 changed files with 3 additions and 4 deletions
  1. 3 4
      web/building_saas/main/js/models/calc_program.js

+ 3 - 4
web/building_saas/main/js/models/calc_program.js

@@ -2889,9 +2889,8 @@ class CalcProgram {
             if (calcItem.feeRate != undefined)
               feeRate = parseFloat(calcItem.feeRate).toDecimal(decimalObj.feeRate);
 
-            calcItem.unitFee = (eval(calcItem.compiledExpr) * feeRate * 0.01).toDecimal(2);
-            // calcItem.totalFee = (calcItem.unitFee * nQ).toDecimal(2);
-            calcItem.totalFee = (calcItem.unitFee * 1).toDecimal(2);
+            calcItem.unitFee = (eval(calcItem.compiledExpr) * feeRate * 0.01).toDecimal(decimalObj.ration.unitPrice);
+            calcItem.totalFee = (calcItem.unitFee * 1).toDecimal(decimalObj.ration.totalPrice);
 
             if (calcItem.fieldName =='common') {
                 template.totalFee = calcItem.totalFee;
@@ -2920,7 +2919,7 @@ class CalcProgram {
             rst.calcPrograms.push(obj.template);
             temp = temp + obj.value;
         }
-        rst.totalFee = temp.toDecimal(decimalObj.bills.totalPrice);
+        rst.totalFee = temp.toDecimal(decimalObj.ration.totalPrice);
         let oldValue = projectObj.project.mainTree.items[0].data.totalFee;
         if (oldValue != rst.totalFee){
           projectObj.project.mainTree.items[0].data.totalFee = rst.totalFee;