bug

web/building_saas/main/js/models/calc_program.js

@@ -1019,29 +1019,24 @@ class CalcProgram {
 
                     if (me.project.property.billsCalcMode == leafBillGetFeeType.rationPriceConverse ||
                         me.project.property.billsCalcMode == leafBillGetFeeType.rationPrice) {
-                        buf = (sum_rtf / bq).toDecimal(decimalObj.bills.unitPrice);
-                        btuf = (sum_rttf / bq).toDecimal(decimalObj.bills.unitPrice);
-                    }
-                    else{
-                        buf = buf.toDecimal(decimalObj.bills.unitPrice);
-                        btuf = btuf.toDecimal(decimalObj.bills.unitPrice);
+                        buf = (sum_rtf / bq).toDecimal(decimalObj.process);
+                        btuf = (sum_rttf / bq).toDecimal(decimalObj.process);
                     };
-
                     if (isBaseFeeType(ft.type) ||
                         (me.project.property.billsCalcMode === leafBillGetFeeType.rationPrice && ft.type == "common")){
-                        btf = sum_rtf.toDecimal(decimalObj.bills.totalPrice);
-                        bttf = sum_rttf.toDecimal(decimalObj.bills.totalPrice);
+                        btf = sum_rtf;
+                        bttf = sum_rttf;
                     }
                     else{
-                        btf = (buf * bq).toDecimal(decimalObj.bills.totalPrice);
-                        bttf = (btuf * bq).toDecimal(decimalObj.bills.totalPrice);
+                        btf = (buf.toDecimal(decimalObj.bills.unitPrice) * bq).toDecimal(decimalObj.process);
+                        bttf = (btuf.toDecimal(decimalObj.bills.unitPrice) * bq).toDecimal(decimalObj.process);
                     };
                 };
 
-                ftObj.unitFee = buf;
-                ftObj.tenderUnitFee = btuf;
-                ftObj.totalFee = btf;
-                ftObj.tenderTotalFee = bttf;
+                ftObj.unitFee = buf.toDecimal(decimalObj.bills.unitPrice);
+                ftObj.totalFee = btf.toDecimal(decimalObj.bills.totalPrice);
+                ftObj.tenderUnitFee = btuf.toDecimal(decimalObj.bills.unitPrice);
+                ftObj.tenderTotalFee = bttf.toDecimal(decimalObj.bills.totalPrice);
                 calcTools.checkFeeField(treeNode, ftObj);
 
                 rst.push(ftObj);