chenshilong 3 anni fa
parent
commit
bd63fc82f5
1 ha cambiato i file con 3 aggiunte e 13 eliminazioni
  1. 3 13
      web/over_write/js/henan_2022.js

+ 3 - 13
web/over_write/js/henan_2022.js

@@ -217,27 +217,17 @@ if (typeof baseFigureTemplate !== "undefined") {
     },
     // 定额建筑安装工程费 算法:取清单固定类别是“建筑安装工程费”的定额建安费(其中定额设备费按40%计算)。
     DEJZAZGCF(tender) {
-      // 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);
-      // }
     },
     DEJZAZGCFBHZXF(tender) {
       // 定额建筑安装工程费(不含专项费用)
-      return cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, [fixedFlag.SPECIAL_COST], tender, "rationCommon", true);
+      const baseFee = this["DEJZAZGCF"](tender);
+      const zxf = cbTools.getBaseFee(fixedFlag.SPECIAL_COST, tender, "rationCommon");
+      return (baseFee - zxf).toDecimal(decimalObj.bills.totalPrice);
     },
     // 设备费 算法:取清单固定类别是“设备购置”的建安费
     SBF(tender) {