Prechádzať zdrojové kódy

重庆养护:顶层第一根结点,固定ID是19,导致计算逻辑异常。

chenshilong 3 rokov pred
rodič
commit
e2c48e886b

+ 1 - 2
web/building_saas/main/js/models/calc_program.js

@@ -2089,7 +2089,7 @@ class CalcProgram {
       calcTools.checkFeeField(treeNode, ftObj);
 
       // 数量、金额时,同步定额建安费
-      if (calcTools.isInheritFrom(treeNode, 1)) {
+      if (calcTools.isInheritFrom(treeNode, fixedFlag.CONSTRUCTION_INSTALL_FEE) || calcTools.isInheritFrom(treeNode, fixedFlag.ONE_SEVEN_BILLS)) {
         let ftObj2 = {
           fieldName: "rationCommon",
           unitFee: ftObj.unitFee,
@@ -2136,7 +2136,6 @@ class CalcProgram {
       $CE.template = template;
 
       calcTools.initFees(treeNode);
-
       for (let idx of template.compiledSeq) {
         let calcItem = template.calcItems[idx];
         $CE.tempCalcItem = calcItem;