费用类别也要按工程类别区分显示：类别覆盖、计算程序重新编译。

web/over_write/js/henan_richang_2022.js

@@ -56,8 +56,9 @@ function overwriteRationCalcBases() {
   };
 }
 
-(function overwriteFeeTypes() {
+function overwriteFeeTypesWhenHasProperty(engineeringName) {
   if (typeof cpFeeTypes == "undefined") return;
+
   cpFeeTypes = [
     { type: "marketLabour", name: "人工费" },
     { type: "marketMaterial", name: "材料费" },
@@ -65,30 +66,37 @@ function overwriteRationCalcBases() {
     { type: "marketMachineLabour", name: "施工机械人工费" },
     { type: "marketEquipment", name: "设备购置费" },
     { type: "marketDirect", name: "直接费" },
+  ];
 
-    { type: "labour", name: "定额人工费" },
-    { type: "material", name: "定额材料费" },
-    { type: "machine", name: "定额施工机械使用费" },
-    { type: "equipment", name: "定额设备费" },
-    { type: "direct", name: "定额直接费" },
-
-    { type: "indexLabour", name: "指标人工费" },
-    { type: "indexMaterial", name: "指标材料费" },
-    { type: "indexMachine", name: "指标施工机械使用费" },
-    { type: "indexEquipment", name: "指标设备购置费" },
-    { type: "indexDirect", name: "指标直接费" },
+  if (engineeringName === "日常养护") {
+    cpFeeTypes.push(
+      { type: "labour", name: "定额人工费" },
+      { type: "material", name: "定额材料费" },
+      { type: "machine", name: "定额施工机械使用费" },
+      { type: "equipment", name: "定额设备费" },
+      { type: "direct", name: "定额直接费" }
+    );
+  } else {
+    cpFeeTypes.push(
+      { type: "indexLabour", name: "指标人工费" },
+      { type: "indexMaterial", name: "指标材料费" },
+      { type: "indexMachine", name: "指标施工机械使用费" },
+      { type: "indexEquipment", name: "指标设备购置费" },
+      { type: "indexDirect", name: "指标直接费" },
+      { type: "indexCommon", name: "指标建安费" }
+    );
+  }
 
+  cpFeeTypes.push(
     { type: "measure", name: "措施费" },
     { type: "manage", name: "企业管理费" },
     { type: "force", name: "规费" },
     { type: "profit", name: "利润" },
     { type: "tax", name: "税金" },
     { type: "common", name: "建安费" },
-    { type: "rationCommon", name: "定额建安费" }, //,
-    { type: "indexCommon", name: "指标建安费" }, //,
-    // {type: 'safeProduce', name: '安全生产费'}
-  ];
-})();
+    { type: "rationCommon", name: "定额建安费" }
+  );
+}
 
 if (typeof feeRateObject !== "undefined") {
   feeRateObject.feeRateSpecialHandle = function (subRate, value) {

web/over_write/js/hunan_2022.js

@@ -70,9 +70,9 @@ if (typeof baseFigureMap !== "undefined") {
       filter: [fixedFlag.MAINTENANCE_EXPENSES],
       pick: true,
     },
-    '工程监理费(未实行社会监理)': {
+    "工程监理费(未实行社会监理)": {
       isProgressive: true,
-      base: 'GCJLFWSXSHJL',
+      base: "GCJLFWSXSHJL",
       fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE,
       filter: [fixedFlag.MAINTENANCE_EXPENSES],
       pick: true,
@@ -91,9 +91,9 @@ if (typeof baseFigureMap !== "undefined") {
       filter: [fixedFlag.MAINTENANCE_EXPENSES],
       pick: true,
     },
-    '工程设计费': {
+    工程设计费: {
       isProgressive: true,
-      base: 'GCSJF',
+      base: "GCSJF",
       fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE,
       filter: [fixedFlag.MAINTENANCE_EXPENSES],
       pick: true,
@@ -116,7 +116,7 @@ if (typeof baseFigureMap !== "undefined") {
       fixedFlag: null,
       filter: [fixedFlag.SPECIAL_COST],
       pick: true,
-    },    
+    },
     // 显示：除清单固定类别是“一二三四部分合计”的以外部分可显示。
     一二三四部分合计: {
       base: "YESSBFHJ",
@@ -131,7 +131,6 @@ if (typeof baseFigureMap !== "undefined") {
       filter: [fixedFlag.SPREAD_BUDGET_FEE],
       pick: true,
     },
-    
   };
   const boqMap = {
     //仅允许用于固定类别是“第100章至700章清单”以外的清单
@@ -247,24 +246,33 @@ if (typeof baseFigureTemplate !== "undefined") {
     // 工程监理费 算法：以{定额建筑安装工程费}为基数，采用累进办法计算
     GCJLF(tender) {
       const baseFee = this["DEJZAZGCF"](tender);
-      if ((baseFee > 0) && (baseFee < 1000000)) return 50000;
+      if (baseFee === 0) return 0;
+      if (baseFee > 0 && baseFee < 1000000) return 50000;
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
       return calculateUtil.getProgressiveFee(baseFee, "工程监理费", projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
     },
     GCJLFWSXSHJL(tender) {
-      const baseFee = this['DEJZAZGCF'](tender);
-      if ((baseFee > 0) && (baseFee < 1000000)) return 50000;
+      const baseFee = this["DEJZAZGCF"](tender);
+      if (baseFee === 0) return 0;
+      if (baseFee > 0 && baseFee < 1000000) return 50000;
       if (!tender) {
-          calcBase.baseProgressiveFee = baseFee;
+        calcBase.baseProgressiveFee = baseFee;
       }
-      return calculateUtil.getProgressiveFee(baseFee, '工程监理费(未实行社会监理)', projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
+      return calculateUtil.getProgressiveFee(
+        baseFee,
+        "工程监理费(未实行社会监理)",
+        projectObj.project.property.progressiveInterval,
+        decimalObj.bills.totalPrice,
+        deficiency
+      );
     },
     // {信息化费} 算法：以{定额建筑安装工程费}为基数，采用累进办法计算。仅清单固定类别是“养护工程其他费”部分可显示。(计算结果去掉不足10000元时按10000元计取)
     YHXMXXHF(tender) {
       const baseFee = this["DEJZAZGCF"](tender);
-      if ((baseFee > 0) && (baseFee < 2000000)) return 100000;
+      if (baseFee === 0) return 0;
+      if (baseFee > 0 && baseFee < 2000000) return 100000;
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
@@ -309,7 +317,8 @@ if (typeof baseFigureTemplate !== "undefined") {
     // 设计文件审查费（一阶段）和 设计文件审查费（二阶段）两个基数计算后金额不满5000元均应按5000元计。
     SJWJSCFYJD(tender) {
       const baseFee = this["DEJZAZGCF"](tender);
-      if ((baseFee > 0) && (baseFee < 500000)) return 5000;
+      if (baseFee === 0) return 0;
+      if (baseFee > 0 && baseFee < 500000) return 5000;
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
@@ -323,7 +332,8 @@ if (typeof baseFigureTemplate !== "undefined") {
     },
     SJWJSCFEJD(tender) {
       const baseFee = this["DEJZAZGCF"](tender);
-      if ((baseFee > 0) && (baseFee < 500000)) return 5000;
+      if (baseFee === 0) return 0;
+      if (baseFee > 0 && baseFee < 500000) return 5000;
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
@@ -337,17 +347,12 @@ if (typeof baseFigureTemplate !== "undefined") {
     },
     GCSJF(tender) {
       const baseFee = this["DEJZAZGCF"](tender);
-      if ((baseFee > 0) && (baseFee < 500000)) return 35000;
+      if (baseFee === 0) return 0;
+      if (baseFee > 0 && baseFee < 500000) return 35000;
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
-      return calculateUtil.getProgressiveFee(
-        baseFee,
-        "工程设计费",
-        projectObj.project.property.progressiveInterval,
-        decimalObj.bills.totalPrice,
-        deficiency
-      );
+      return calculateUtil.getProgressiveFee(baseFee, "工程设计费", projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
     },
   };