소스 검색

节点的计算程序指标建安费应含该节点下设备的指标建安费。现未含导致指标建安费这个清单基数计算不对。河南日常养护的两个专业都应去掉前期工作费这个基数。

chenshilong 3 년 전
부모
커밋
f1563768c3
1개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 5 5
      web/over_write/js/henan_richang_2022.js

+ 5 - 5
web/over_write/js/henan_richang_2022.js

@@ -197,14 +197,14 @@ if (typeof baseFigureMap !== "undefined") {
       pick: true,
       projectKind: ["日常养护"],
     },
-    前期工作费: {
+    /*     前期工作费: {
       isProgressive: true,
       base: "QQGZF",
       fixedFlag: null,
       filter: [fixedFlag.MAINTENANCE_EXPENSES],
       pick: true,
       projectKind: ["日常养护"],
-    },
+    }, */
     一二三四部分合计: {
       base: "YESSBFHJ",
       fixedFlag: fixedFlag.ONE_TO_FOUR_TOTAL,
@@ -251,14 +251,14 @@ if (typeof baseFigureMap !== "undefined") {
       pick: true,
       projectKind: ["日常养护年度预算"],
     },
-    "前期工作费(指标)": {
+    /* "前期工作费(指标)": {
       isProgressive: true,
       base: "ZBQQGZF",
       fixedFlag: null,
       filter: [fixedFlag.MAINTENANCE_EXPENSES],
       pick: true,
       projectKind: ["日常养护年度预算"],
-    },
+    }, */
     指标建筑安装工程费: {
       base: "ZBJZAZGCF",
       fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE,
@@ -424,7 +424,7 @@ if (typeof baseFigureTemplate !== "undefined") {
       const feeField = "indexCommon";
       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");
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "indexEquipment");
       return (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.bills.totalPrice);
     },
     // {指标建筑安装工程费(不含专项费用)}