{建筑安装工程费(不含设备费)}、{定额建设安装工程费} 计算不正确。

web/over_write/js/henan_2022.js

@@ -193,39 +193,40 @@ if (typeof baseFigureTemplate !== "undefined") {
     },
     // 建筑安装工程费(不含设备费)算法：取清单固定类别是“建筑安装工程费”的金额 - {设备费}。
     JZAZGCFBHSB(tender) {
-      const engName = projectObj.project.property.engineeringName;
-      if (isLittleFix(engName)) {
-        // 小修的没有设备购置固定行
-        const baseFee = cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, "common");
-        const fixedNode = projectObj.project.mainTree.roots.find((node) => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
-        const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "common");
-        return (baseFee - equipmentFee).toDecimal(decimalObj.bills.totalPrice);
-      } else {
-        return cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, [fixedFlag.EQUIPMENT_ACQUISITION_FEE], tender, "common");
-      }
-    },
+      // const engName = projectObj.project.property.engineeringName;
+      // if (isLittleFix(engName)) {
+      // 小修的没有设备购置固定行
+      const baseFee = cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, "common");
+      const fixedNode = projectObj.project.mainTree.roots.find((node) => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "common");
+      return (baseFee - equipmentFee).toDecimal(decimalObj.bills.totalPrice);
+      // } else {
+      //   return cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, [fixedFlag.EQUIPMENT_ACQUISITION_FEE], tender, "common");
+      // }
+    },
+    // 建筑安装工程费(不含安全生产费)
     JZAZGCFBHAQSCF(tender) {
       return cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, [fixedFlag.SAFE_COST], tender, "common");
     },
     // 定额建筑安装工程费 算法：取清单固定类别是“建筑安装工程费”的定额建安费(其中定额设备费按40%计算)。
     DEJZAZGCF(tender) {
-      const engName = projectObj.project.property.engineeringName;
+      // const engName = projectObj.project.property.engineeringName;
       const feeField = "rationCommon";
-      if (isLittleFix(engName)) {
-        // 小修的没有设备购置固定行
-        const baseFee = cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, feeField);
-        const fixedNode = projectObj.project.mainTree.roots.find((node) => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
-        const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "equipment");
-        return (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.bills.totalPrice);
-      } else {
-        const deductFlags = [fixedFlag.EQUIPMENT_ACQUISITION_FEE];
-        //建安费扣除定额设备购置费
-        const afterDeductFee = cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, deductFlags, tender, feeField, false);
-        //定额设备购置费
-        const equipmentAcFee = cbTools.getBaseFee(deductFlags[0], tender, "equipment");
-        const equipmentAcTaxFee = cbTools.getBaseFee(deductFlags[0], tender, "tax");
-        return (afterDeductFee + equipmentAcFee * 0.4 + equipmentAcTaxFee).toDecimal(decimalObj.bills.totalPrice);
-      }
+      // if (isLittleFix(engName)) {
+      // 小修的没有设备购置固定行
+      const baseFee = cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, feeField);
+      const fixedNode = projectObj.project.mainTree.roots.find((node) => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "equipment");
+      return (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.bills.totalPrice);
+      // } else {
+      //   const deductFlags = [fixedFlag.EQUIPMENT_ACQUISITION_FEE];
+      //   //建安费扣除定额设备购置费
+      //   const afterDeductFee = cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, deductFlags, tender, feeField, false);
+      //   //定额设备购置费
+      //   const equipmentAcFee = cbTools.getBaseFee(deductFlags[0], tender, "equipment");
+      //   const equipmentAcTaxFee = cbTools.getBaseFee(deductFlags[0], tender, "tax");
+      //   return (afterDeductFee + equipmentAcFee * 0.4 + equipmentAcTaxFee).toDecimal(decimalObj.bills.totalPrice);
+      // }
     },
     DEJZAZGCFBHZXF(tender) {
       // 定额建筑安装工程费(不含专项费用)
@@ -245,23 +246,23 @@ if (typeof baseFigureTemplate !== "undefined") {
     },
     // 定额养护工程费 算法：取清单固定类别是“养护工程费”的定额建安费(其中定额设备费按40%计算)。
     DEYHGCF(tender) {
-      const engName = projectObj.project.property.engineeringName;
+      // const engName = projectObj.project.property.engineeringName;
       const feeField = "rationCommon";
-      if (isLittleFix(engName)) {
-        // 小修的没有设备购置固定行
-        const baseFee = cbTools.getBaseFee(fixedFlag.MAINTENANCE_FEE, tender, feeField);
-        const fixedNode = projectObj.project.mainTree.items.find((node) => node.getFlag() === fixedFlag.MAINTENANCE_FEE);
-        const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "equipment");
-        return (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.bills.totalPrice);
-      } else {
-        const deductFlags = [fixedFlag.EQUIPMENT_ACQUISITION_FEE];
-        //建安费扣除定额设备购置费
-        const afterDeductFee = cbTools.getFeeWithDeduction(fixedFlag.MAINTENANCE_FEE, deductFlags, tender, feeField, false);
-        //定额设备购置费
-        const equipmentAcFee = cbTools.getBaseFee(deductFlags[0], tender, "equipment");
-        const equipmentAcTaxFee = cbTools.getBaseFee(deductFlags[0], tender, "tax");
-        return (afterDeductFee + equipmentAcFee * 0.4 + equipmentAcTaxFee).toDecimal(decimalObj.bills.totalPrice);
-      }
+      // if (isLittleFix(engName)) {
+      // 小修的没有设备购置固定行
+      const baseFee = cbTools.getBaseFee(fixedFlag.MAINTENANCE_FEE, tender, feeField);
+      const fixedNode = projectObj.project.mainTree.items.find((node) => node.getFlag() === fixedFlag.MAINTENANCE_FEE);
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "equipment");
+      return (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.bills.totalPrice);
+      // } else {
+      //   const deductFlags = [fixedFlag.EQUIPMENT_ACQUISITION_FEE];
+      //   //建安费扣除定额设备购置费
+      //   const afterDeductFee = cbTools.getFeeWithDeduction(fixedFlag.MAINTENANCE_FEE, deductFlags, tender, feeField, false);
+      //   //定额设备购置费
+      //   const equipmentAcFee = cbTools.getBaseFee(deductFlags[0], tender, "equipment");
+      //   const equipmentAcTaxFee = cbTools.getBaseFee(deductFlags[0], tender, "tax");
+      //   return (afterDeductFee + equipmentAcFee * 0.4 + equipmentAcTaxFee).toDecimal(decimalObj.bills.totalPrice);
+      // }
     },
     // 养护管理单位项目管理费 算法：以{定额建筑安装工程费}为基数，采用累进办法计算。。
     YHGLDWXMGLF(tender) {

web/over_write/js/henan_richang_2022.js

@@ -151,39 +151,39 @@ if (typeof baseFigureTemplate !== "undefined") {
     },
     // 建筑安装工程费(不含设备费)算法：取清单固定类别是“建筑安装工程费”的金额 - {设备费}。
     JZAZGCFBHSB(tender) {
-      const engName = projectObj.project.property.engineeringName;
-      if (isLittleFix(engName)) {
-        // 小修的没有设备购置固定行
-        const baseFee = cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, "common");
-        const fixedNode = projectObj.project.mainTree.roots.find((node) => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
-        const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "common");
-        return (baseFee - equipmentFee).toDecimal(decimalObj.bills.totalPrice);
-      } else {
-        return cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, [fixedFlag.EQUIPMENT_ACQUISITION_FEE], tender, "common");
-      }
+      // const engName = projectObj.project.property.engineeringName;
+      // if (isLittleFix(engName)) {
+      // 小修的没有设备购置固定行
+      const baseFee = cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, "common");
+      const fixedNode = projectObj.project.mainTree.roots.find((node) => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "common");
+      return (baseFee - equipmentFee).toDecimal(decimalObj.bills.totalPrice);
+      // } else {
+      //   return cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, [fixedFlag.EQUIPMENT_ACQUISITION_FEE], tender, "common");
+      // }
     },
     JZAZGCFBHAQSCF(tender) {
       return cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, [fixedFlag.SAFE_COST], tender, "common");
     },
     // 定额建筑安装工程费 算法：取清单固定类别是“建筑安装工程费”的定额建安费(其中定额设备费按40%计算)。
     DEJZAZGCF(tender) {
-      const engName = projectObj.project.property.engineeringName;
+      // const engName = projectObj.project.property.engineeringName;
       const feeField = "rationCommon";
-      if (isLittleFix(engName)) {
-        // 小修的没有设备购置固定行
-        const baseFee = cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, feeField);
-        const fixedNode = projectObj.project.mainTree.roots.find((node) => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
-        const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "equipment");
-        return (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.bills.totalPrice);
-      } else {
-        const deductFlags = [fixedFlag.EQUIPMENT_ACQUISITION_FEE];
-        //建安费扣除定额设备购置费
-        const afterDeductFee = cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, deductFlags, tender, feeField, false);
-        //定额设备购置费
-        const equipmentAcFee = cbTools.getBaseFee(deductFlags[0], tender, "equipment");
-        const equipmentAcTaxFee = cbTools.getBaseFee(deductFlags[0], tender, "tax");
-        return (afterDeductFee + equipmentAcFee * 0.4 + equipmentAcTaxFee).toDecimal(decimalObj.bills.totalPrice);
-      }
+      // if (isLittleFix(engName)) {
+      // 小修的没有设备购置固定行
+      const baseFee = cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, feeField);
+      const fixedNode = projectObj.project.mainTree.roots.find((node) => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "equipment");
+      return (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.bills.totalPrice);
+      // } else {
+      //   const deductFlags = [fixedFlag.EQUIPMENT_ACQUISITION_FEE];
+      //   //建安费扣除定额设备购置费
+      //   const afterDeductFee = cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, deductFlags, tender, feeField, false);
+      //   //定额设备购置费
+      //   const equipmentAcFee = cbTools.getBaseFee(deductFlags[0], tender, "equipment");
+      //   const equipmentAcTaxFee = cbTools.getBaseFee(deductFlags[0], tender, "tax");
+      //   return (afterDeductFee + equipmentAcFee * 0.4 + equipmentAcTaxFee).toDecimal(decimalObj.bills.totalPrice);
+      // }
     },
     DEJZAZGCFBHZXF(tender) {
       // 定额建筑安装工程费(不含专项费用)
@@ -203,23 +203,23 @@ if (typeof baseFigureTemplate !== "undefined") {
     },
     // 定额养护工程费 算法：取清单固定类别是“养护工程费”的定额建安费(其中定额设备费按40%计算)。
     DEYHGCF(tender) {
-      const engName = projectObj.project.property.engineeringName;
+      // const engName = projectObj.project.property.engineeringName;
       const feeField = "rationCommon";
-      if (isLittleFix(engName)) {
-        // 小修的没有设备购置固定行
-        const baseFee = cbTools.getBaseFee(fixedFlag.MAINTENANCE_FEE, tender, feeField);
-        const fixedNode = projectObj.project.mainTree.items.find((node) => node.getFlag() === fixedFlag.MAINTENANCE_FEE);
-        const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "equipment");
-        return (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.bills.totalPrice);
-      } else {
-        const deductFlags = [fixedFlag.EQUIPMENT_ACQUISITION_FEE];
-        //建安费扣除定额设备购置费
-        const afterDeductFee = cbTools.getFeeWithDeduction(fixedFlag.MAINTENANCE_FEE, deductFlags, tender, feeField, false);
-        //定额设备购置费
-        const equipmentAcFee = cbTools.getBaseFee(deductFlags[0], tender, "equipment");
-        const equipmentAcTaxFee = cbTools.getBaseFee(deductFlags[0], tender, "tax");
-        return (afterDeductFee + equipmentAcFee * 0.4 + equipmentAcTaxFee).toDecimal(decimalObj.bills.totalPrice);
-      }
+      // if (isLittleFix(engName)) {
+      // 小修的没有设备购置固定行
+      const baseFee = cbTools.getBaseFee(fixedFlag.MAINTENANCE_FEE, tender, feeField);
+      const fixedNode = projectObj.project.mainTree.items.find((node) => node.getFlag() === fixedFlag.MAINTENANCE_FEE);
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "equipment");
+      return (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.bills.totalPrice);
+      // } else {
+      //   const deductFlags = [fixedFlag.EQUIPMENT_ACQUISITION_FEE];
+      //   //建安费扣除定额设备购置费
+      //   const afterDeductFee = cbTools.getFeeWithDeduction(fixedFlag.MAINTENANCE_FEE, deductFlags, tender, feeField, false);
+      //   //定额设备购置费
+      //   const equipmentAcFee = cbTools.getBaseFee(deductFlags[0], tender, "equipment");
+      //   const equipmentAcTaxFee = cbTools.getBaseFee(deductFlags[0], tender, "tax");
+      //   return (afterDeductFee + equipmentAcFee * 0.4 + equipmentAcTaxFee).toDecimal(decimalObj.bills.totalPrice);
+      // }
     },
     // 养护管理单位项目管理费 算法：以{定额建筑安装工程费}为基数，采用累进办法计算。。
     YHGLDWXMGLF(tender) {