Selaa lähdekoodia

fix: 概算汇总,基数引用循环计算判定失败问题

vian 4 vuotta sitten
vanhempi
commit
18ce3d0c13
1 muutettua tiedostoa jossa 21 lisäystä ja 0 poistoa
  1. 21 0
      web/building_saas/main/js/models/calc_base.js

+ 21 - 0
web/building_saas/main/js/models/calc_base.js

@@ -1178,6 +1178,14 @@ let baseFigureTemplate = {
     SJF: function () {
         return cbTools.getBillsFee(fixedFlag.DESIGN_FEE, 'common', 'totalFee');
     },
+    // 预备费: 取预备费行的金额
+    YBF: function () {
+        return cbTools.getBillsFee(fixedFlag.BUDGET_RESERVE, 'common', 'totalFee');
+    },
+    // 专项费用: 取专项费用行的金额
+    ZXFY: function () {
+        return cbTools.getBillsFee(fixedFlag.CONSTRUCTION_SPECIAL_FEE, 'common', 'totalFee');
+    },
     // 工程建设其他费用: 取工程建设其他费用的金额
     GCJSQTFY: function () {
         return cbTools.getBillsFee(fixedFlag.CONSTRUCTION_OTHER_FEE, 'common', 'totalFee');
@@ -1307,6 +1315,18 @@ const budgetFigureMap = {
         filter: [fixedFlag.DESIGN_COUNSEL_FEE],
         pick: true,
     },
+    '预备费': {
+        base: 'YBF',
+        fixedFlag: fixedFlag.BUDGET_RESERVE,
+        filter: [fixedFlag.BUDGET_RESERVE],
+        pick: false,
+    },
+    '专项费用': {
+        base: 'ZXFY',
+        fixedFlag: fixedFlag.CONSTRUCTION_SPECIAL_FEE,
+        filter: [fixedFlag.CONSTRUCTION_SPECIAL_FEE],
+        pick: false,
+    },
     '工程建设其他费用': {
         base: 'GCJSQTFY',
         fixedFlag: fixedFlag.CONSTRUCTION_OTHER_FEE,
@@ -1822,6 +1842,7 @@ let calcBase = {
         cbTools.setFixedBills(budgetSummaryObj.getTree().items, this.fixedBills, this.fixedFlag);
         this.budgetFigures = budgetFigureMap;
         this.baseFigures = { ...this.baseFigures, ...budgetFigureMap };
+        cbTools.setBaseBills(this.budgetFigures, this.fixedBills);
         cbTools.setValidBaseMapping(this.budgetFigures, this.flagValidBase);
     },
     getBase: function (figure) {