Procházet zdrojové kódy

{指标建筑安装工程费(不含专项费用)} 算法的基数调整。

chenshilong před 3 roky
rodič
revize
c53f1994e2
1 změnil soubory, kde provedl 8 přidání a 4 odebrání
  1. 8 4
      web/over_write/js/henan_richang_2022.js

+ 8 - 4
web/over_write/js/henan_richang_2022.js

@@ -333,7 +333,7 @@ if (typeof baseFigureTemplate !== "undefined") {
     JZAZGCFBHAQSCF(tender) {
     JZAZGCFBHAQSCF(tender) {
       return cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, [fixedFlag.SAFE_COST], tender, "common");
       return cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, [fixedFlag.SAFE_COST], tender, "common");
     },
     },
-    // {定额建筑安装工程费} 算法:取清单固定类别是“建筑安装工程费”的定额建安费(其中定额设备费按40%计算)。
+    // {定额建筑安装工程费} 算法:取清单固定类别是“建筑安装工程费”的定额建安费(其中定额设备费按40%计算,税金按全额计算)。
     DEJZAZGCF(tender) {
     DEJZAZGCF(tender) {
       const feeField = "rationCommon";
       const feeField = "rationCommon";
       const baseFee = cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, feeField);
       const baseFee = cbTools.getBaseFee(fixedFlag.CONSTRUCTION_INSTALL_FEE, tender, feeField);
@@ -343,7 +343,9 @@ if (typeof baseFigureTemplate !== "undefined") {
     },
     },
     // {定额建筑安装工程费(不含专项费用)}
     // {定额建筑安装工程费(不含专项费用)}
     DEJZAZGCFBHZXF(tender) {
     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);
     },
     },
     // {施工场地建设费} 算法:以{定额养护工程费}为基数,采用累进办法计算
     // {施工场地建设费} 算法:以{定额养护工程费}为基数,采用累进办法计算
     SGCDJSF(tender) {
     SGCDJSF(tender) {
@@ -427,9 +429,11 @@ if (typeof baseFigureTemplate !== "undefined") {
       const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "indexEquipment");
       const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "indexEquipment");
       return (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.bills.totalPrice);
       return (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.bills.totalPrice);
     },
     },
-    // {指标建筑安装工程费(不含专项费用)}
+    // {指标建筑安装工程费(不含专项费用)} 取清单固定类别是“建筑安装工程费”的指标建安费(其中指标设备费按40%计算+全额设备税金),扣除“专项费用”行的指标建安费。
     ZBJZAZGCFBHZXF(tender) {
     ZBJZAZGCFBHZXF(tender) {
-      return cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, [fixedFlag.SPECIAL_COST], tender, "indexCommon", true);
+      const baseFee = this["ZBJZAZGCF"](tender);
+      const zxf = cbTools.getBaseFee(fixedFlag.SPECIAL_COST, tender, "indexCommon");
+      return (baseFee - zxf).toDecimal(decimalObj.bills.totalPrice);
     },
     },
     // {指标施工场地建设费}
     // {指标施工场地建设费}
     ZBSGCDJSF(tender) {
     ZBSGCDJSF(tender) {