fix: 算法调整

web/over_write/js/neimeng_2022.js

@@ -98,7 +98,7 @@ const deficiency = {
 if (typeof baseFigureMap !== "undefined") {
   const { fixedFlag } = commonConstants;
   const budgetMap = {
-    // 清单固定类别是“建筑安装工程费”的以外部分可显示
+    // 清单固定类别是“建筑安装工程费”的以外部分可显示：取清单固定类别是“建筑安装工程”的金额
     建筑安装工程费: {
       base: "JZAZGCF",
       fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE,
@@ -293,7 +293,15 @@ if (typeof baseFigureMap !== "undefined") {
 if (typeof baseFigureTemplate !== "undefined") {
   const { fixedFlag } = commonConstants;
   baseFigureTemplate.budget = {
-    // 定额建筑安装工程费(定额设备购置费按40%计)：取清单固定类别是“建筑安装工程”的定额建安费，其中定额设备购置费按40%计算
+    // 建筑安装工程费
+    JZAZGCF(tender) {
+      return cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, "common");
+    },
+    // 定额建筑安装工程费
+    DEJZAZGCF(tender) {
+      return cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, "rationCommon");
+    },
+    // 定额建筑安装工程费(定额设备购置费按40%计)
     DEJZAZGCFSBSS(tender) {
       const feeField = "rationCommon";
       const deductFlags = [fixedFlag.EQUIPMENT_ACQUISITION_FEE];
@@ -313,14 +321,6 @@ if (typeof baseFigureTemplate !== "undefined") {
       //建安费扣除设备费
       return cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, [fixedFlag.EQUIPMENT_ACQUISITION_FEE], tender, "rationCommon");
     },
-    // 建筑安装工程费：取清单固定类别是“建筑安装工程”的金额
-    JZAZGCF(tender) {
-      return cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, "common");
-    },
-    // 定额建筑安装工程费
-    DEJZAZGCF(tender) {
-      return cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, "rationCommon");
-    },
     // 土地使用及拆迁补偿费：取清单固定类别是“土地使用及拆迁补偿费”的金额
     TDSYJCQBCF(tender) {
       return cbTools.getBaseFee(fixedFlag.LAND_USED_DEMOLITION, tender, "common");
@@ -333,9 +333,9 @@ if (typeof baseFigureTemplate !== "undefined") {
     YBF(tender) {
       return cbTools.getBaseFee(fixedFlag.BUDGET_FEE, tender, "common");
     },
-    // 养护单位项目管理费：以累进办法计算，计算基数为“定额建筑安装工程费(定额设备购置费按40%计)
+    // 养护单位项目管理费
     YHDWXMGLF(tender) {
-      const baseFee = this["DEJZAZGCFSBSS"](tender);
+      const baseFee = this.DEJZAZGCF(tender);
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
@@ -347,30 +347,22 @@ if (typeof baseFigureTemplate !== "undefined") {
         deficiency
       );
     },
-    // 信息化费：以累进办法计算，计算基数为“定额建筑安装工程费(定额设备购置费按40%计)”
+    // 信息化费
     XXHF(tender) {
-      const baseFee = this["DEJZAZGCFSBSS"](tender);
+      const baseFee = this.DEJZAZGCF(tender);
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
       return calculateUtil.getProgressiveFee(baseFee, "信息化费", projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
     },
-    // 工程监理费：以累进办法计算，计算基数为“定额建筑安装工程费(定额设备购置费按40%计)
+    // 工程监理费
     GCJLF(tender) {
-      const baseFee = this["DEJZAZGCFSBSS"](tender);
+      const baseFee = this.DEJZAZGCF(tender);
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
       return calculateUtil.getProgressiveFee(baseFee, "工程监理费", projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
     },
-    // 前期工作费：以累进办法计算，计算基数为“定额建筑安装工程费(定额设备购置费按40%计)
-    QQGZF(tender) {
-      const baseFee = this["DEJZAZGCFSBSS"](tender);
-      if (!tender) {
-        calcBase.baseProgressiveFee = baseFee;
-      }
-      return calculateUtil.getProgressiveFee(baseFee, "前期工作费", projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
-    },
     // 价差预备费
     JCYBF(tender) {
       //建筑安装工程费作为基数
@@ -382,8 +374,8 @@ if (typeof baseFigureTemplate !== "undefined") {
       //= P * [(1+i)^(n-1) -1]
       return (installFee * (Math.pow(1 + costGrowthRate, growthPeriod - 1) - 1)).toDecimal(decimalObj.bills.totalPrice);
     },
+    // 定额建筑安装工程费(不含专项费用)
     DEJZAZGCFBHZXF(tender) {
-      // 定额建筑安装工程费(不含专项费用)
       const baseFee = this["DEJZAZGCF"](tender);
       const zxf = cbTools.getBaseFee(fixedFlag.SPECIAL_COST, tender, "rationCommon");
       return (baseFee - zxf).toDecimal(decimalObj.bills.totalPrice);
@@ -472,7 +464,7 @@ if (typeof baseFigureTemplate !== "undefined") {
       return calculateUtil.getProgressiveFee(baseFee, "招标费", projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
     },
     SGTSJQQGZF(tender) {
-      const baseFee = this["DEJZAZGCFBHZXGLF"](tender);
+      const baseFee = this["DEJZAZGCF"](tender);
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
@@ -485,7 +477,7 @@ if (typeof baseFigureTemplate !== "undefined") {
       );
     },
     JSFASJQQGZF(tender) {
-      const baseFee = this["DEJZAZGCFBHZXGLF"](tender);
+      const baseFee = this["DEJZAZGCF"](tender);
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
@@ -498,7 +490,7 @@ if (typeof baseFigureTemplate !== "undefined") {
       );
     },
     GCBXF(tender) {
-      return (DEJZAZGCFBHSB(tender) * 0.4).toDecimal(decimalObj.bills.totalPrice);
+      return (this.DEJZAZGCFBHSB(tender) * 0.4).toDecimal(decimalObj.bills.totalPrice);
     },
   };