Quellcode durchsuchen

固定类别的清单及其子项暂估价计算。

chenshilong vor 6 Jahren
Ursprung
Commit
acb4b28dcb
1 geänderte Dateien mit 13 neuen und 7 gelöschten Zeilen
  1. 13 7
      web/building_saas/main/js/models/calc_program.js

+ 13 - 7
web/building_saas/main/js/models/calc_program.js

@@ -468,15 +468,21 @@ let calcTools = {
             sumU = undefined;
         }
         else if (me.isLeafBill(treeNode)){
-            if (isGather){
-                me.getGLJList(treeNode, false);
-                sumT = eTFee();
+            if (projectObj.project.Bills.isEngineerEst(treeNode)){
+                sumT = treeNode.data.feesIndex['common'].totalFee;
+                sumU = treeNode.data.feesIndex['common'].unitFee;
             }
-            else
-                sumT = eTFeeByChildren();
+            else{
+                if (isGather){
+                    me.getGLJList(treeNode, false);
+                    sumT = eTFee();
+                }
+                else
+                    sumT = eTFeeByChildren();
 
-            let q = nodeQ ? nodeQ : 1;
-            sumU = (sumT / q).toDecimal(decimalObj.bills.totalPrice);
+                let q = nodeQ ? nodeQ : 1;
+                sumU = (sumT / q).toDecimal(decimalObj.bills.totalPrice);
+            }
         }
         else if (me.isRationCategory(treeNode)){
             me.getGLJList(treeNode, false);