税前工程造价bug

web/building_saas/main/js/models/calc_base.js

@@ -1238,7 +1238,9 @@ let baseFigureMap = {
     '安全文明施工专项费': {base: 'AQWMSGZXF', fixedFlag: fixedFlag.SAFETY_CONSTRUCTION, class: 'CSXM'},
     //不于清单直接关联==========
     '建筑面积': {base: 'JZMJ', class: 'FBFX'},
-    '税前工程造价': {base: 'SQGCZJ', class: 'SQGCZJ', multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE]},//安全文明施工专项费用使用
+    '税前工程造价': {base: 'SQGCZJ', class: 'SQGCZJ',//安全文明施工专项费用使用
+        cycleCalcRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE], //循环计算相关固定行，由于计算排除了本身，不用判断措施项目
+        multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE]}, //相关固定行，需要关联措施项目，因为需要提取出多处引用的进行排序
     '人材机价差': {base: 'RCJJC', class: 'RCJ'},
     '人工价差': {base: 'RGJC', class: 'RCJ'},
     '材料价差': {base: 'CLJC', class: 'RCJ'},
@@ -1359,7 +1361,11 @@ let cbAnalyzer = {
                 //重构后：
                 //多重引用基数
                 let figureMultiRef = baseFigures[figure.value]['multiRef'];
+                let cycleCalcRef = baseFigures[figure.value]['cycleCalcRef'];
                 if(cbTools.isDef(figureMultiRef)){
+                    if(cbTools.isDef(cycleCalcRef)){
+                        figureMultiRef = cycleCalcRef;
+                    }
                     for(let flag of figureMultiRef){
                         let bills = cbTools.findBill(flag);
                         if(bills){

web/over_write/js/chongqing_2018.js

@@ -263,7 +263,9 @@ if(typeof baseFigureMap !== 'undefined'){
         '甲定施工机具使用费': {base: 'JDJXF', class: 'RCJ'},
         '甲定主材费': {base: 'JDZCF', class: 'RCJ'},
         '暂估材料费(从子目汇总)': {base: 'ZGCLFFZM', class: 'RCJ'},
-        '税前工程造价': {base: 'SQGCZJ', class: 'SQGCZJ', multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]},//安全文明施工专项费用使用
+        '税前工程造价': {base: 'SQGCZJ', class: 'SQGCZJ',
+            cycleCalcRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE],   //循环计算相关固定行，由于计算排除了本身，不用判断措施项目
+            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]},//相关固定行
     };
 }
 if(typeof baseFigureTemplate !== 'undefined'){