新版本暂估价累计没有排除“材料(工程设备)暂估价”。

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

@@ -198,7 +198,7 @@ let calcTools = {
         if (!feeObj) return;
         if (feeObj.fieldName == '') return;
 
-        // 初始化前，先拦截属性末定义、又要给该属性赋0的情况
+        // 初始化前，先拦截属性未定义、又要给该属性赋0的情况
         if (!treeNode.data.feesIndex || !treeNode.data.feesIndex[feeObj.fieldName]){
             if (feeObj.unitFee == 0 && feeObj.totalFee == 0 && feeObj.tenderUnitFee == 0 && feeObj.tenderTotalFee == 0) return;
         }
@@ -1779,8 +1779,10 @@ class CalcProgram {
             calcTools.getGLJList(treeNode, true);
             nodes = me.project.Ration.getRationNodes(treeNode);
         }
-        else if (commonCalcType == 2)
-            nodes = treeNode.children
+        else if (commonCalcType == 2){  // 固定清单 "材料(工程设备)暂估价" 比较特殊，不进行父项汇总（需求是这么要求的）
+            // nodes = treeNode.children
+            nodes = me.project.Bills.getGatherNodes(treeNode);
+        }
         else if (commonCalcType == 3)
             nodes = treeNode.children;
 
@@ -1788,6 +1790,11 @@ class CalcProgram {
             return ['labour', 'material', 'machine', 'mainMaterial', 'equipment'].indexOf(type) > -1;
         };
 
+        let nQ = calcTools.uiNodeQty(treeNode);
+        let nTQ = calcTools.uiNodeTenderQty(treeNode);
+        let bq = nQ ? nQ : 1;
+        let btq = nTQ ? nTQ : 1;
+
         let rst = [];
         for (let ft of cpFeeTypes) {
             let ftObj = {};
@@ -1795,11 +1802,6 @@ class CalcProgram {
             ftObj.name = ft.name;
             let buf = 0, btf = 0, btuf = 0, bttf = 0;
 
-            let nQ = calcTools.uiNodeQty(treeNode);
-            let nTQ = calcTools.uiNodeTenderQty(treeNode);
-            let bq = nQ ? nQ : 1;
-            let btq = nTQ ? nTQ : 1;
-
             if (commonCalcType == 2){
                 for (let node of nodes) {
                     if (node.data.feesIndex && node.data.feesIndex[ft.type]) {