feat: 轨道工程增加基数“管线迁改费” “车辆购置费”

public/common_constants.js

@@ -109,7 +109,14 @@
         LOAN_INTEREST: 1010,
         // 建设项目总概算
         CONSTRUCTION_BUDGET: 1011,
-
+        // 项目建设管理费
+        CONSTRUCTION_MANAGE_FEE: 1012,
+        // 管线迁改费
+        PIPELINE_CHANGE_FEE: 1013,
+        // 车辆购置费vehicle
+        VEHICLE_PURCHASE_FEE: 1014,
+        // 综合联调费
+        JOINT_DEBUGGING_FEE: 1015,
     };
     // 清单类型
     const billType = {

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

@@ -1194,6 +1194,14 @@ let baseFigureTemplate = {
     JCYBF: function () {
         return 0;
     },
+    // 管线迁改费
+    GXQGF: function () {
+        return cbTools.getBillsFee(fixedFlag.PIPELINE_CHANGE_FEE, 'common', 'totalFee');
+    },
+    // 车辆购置费
+    CLGZF: function () {
+        return cbTools.getBillsFee(fixedFlag.VEHICLE_PURCHASE_FEE, 'common', 'totalFee');
+    }
 };
 const progreesiveBases = ['SZDLGCAQWMSGF', 'SZQLGCAQWMSGF', 'SZSDGCAQWMSGF', 'CGDGGCAQWMSGF', 'CGGJQGCAQWMSGF', 'CGDXGCAQWMSGF', 'CGGDGCAQWMSGF'];
 let figureClassTemplate = {
@@ -1311,7 +1319,7 @@ const budgetFigureMap = {
     },
     '设计费': {
         base: 'SJF',
-        fixedFlag: fixedFlag.DESIGN_COUNSEL_FEE,
+        fixedFlag: fixedFlag.DESIGN_FEE,
         filter: [fixedFlag.DESIGN_COUNSEL_FEE],
         pick: true,
     },
@@ -1333,6 +1341,18 @@ const budgetFigureMap = {
         filter: [fixedFlag.CONSTRUCTION_FEE, fixedFlag.CONSTRUCTION_OTHER_FEE, fixedFlag.BUDGET_RESERVE, fixedFlag.CONSTRUCTION_SPECIAL_FEE],
         pick: false,
     },
+    '管线迁改费': {
+        base: 'GXQGF',
+        fixedFlag: fixedFlag.PIPELINE_CHANGE_FEE,
+        filter: [fixedFlag.CONSTRUCTION_MANAGE_FEE],
+        pick: true,
+    },
+    '车辆购置费': {
+        base: 'CLGZF',
+        fixedFlag: fixedFlag.VEHICLE_PURCHASE_FEE,
+        filter: [fixedFlag.JOINT_DEBUGGING_FEE],
+        pick: true,
+    },
     /* '价差预备费': {
         base: 'JCYBF',
         fixedFlag: fixedFlag.DIFF_BUDGET_RESERVE,

web/building_saas/main/js/views/calc_base_view.js

@@ -337,7 +337,7 @@ let calcBaseView = {
                 const changedCells = [{ row, col }];
                 budgetSheet.setValue(row, col, me.getInputExpr());
                 budgetSummaryObj.edit(budgetSheet, changedCells);
-                if (projectObj.project.calcBase.success || selected.data.calcBase === me.getInputExpr()) {
+                if (projectObj.project.calcBase.success || budgetTree.selected.data.calcBase === me.getInputExpr()) {
                     $('#calcBaseFeeRate').modal('hide');
                 }
             }