Browse Source

夜间出轨费。

chenshilong 2 years ago
parent
commit
8fbf37b616

+ 28 - 1
web/building_saas/main/js/models/calc_base.js

@@ -649,6 +649,14 @@ let baseFigureTemplate = {
     if (cbTools.isUnDef(calcBase.fixedBills[calcBase.fixedFlag.SAFETY_CONSTRUCTION])) {
       return 0;
     }
+
+    let baseNodes = [
+      calcTools.getNodeByFlag(fixedFlag.SUB_ENGINERRING),
+      calcTools.getNodeByFlag(fixedFlag.MEASURE),
+      calcTools.getNodeByFlag(fixedFlag.OTHER),
+      calcTools.getNodeByFlag(fixedFlag.CHARGE),
+    ];
+
     let bill = calcBase.fixedBills[calcBase.fixedFlag.SAFETY_CONSTRUCTION]["bill"];
     if (cbTools.isUnDef(bill) || cbTools.isUnDef(bill.ID)) return 0;
     let node = cbTools.getNodeByID(bill.ID);
@@ -659,7 +667,26 @@ let baseFigureTemplate = {
     if (materialProvisional) {
       excludeNodes.push(materialProvisional);
     }
-    return projectObj.project.calcProgram.getBeforeTaxTotalFee(excludeNodes, tender);
+    return projectObj.project.calcProgram.getSumTotalFee(baseNodes, excludeNodes, "common", tender);
+  },
+  GDYJSGF: function (tender) {
+    // 轨道夜间施工费
+    let baseNodes = [
+      calcTools.getNodeByFlag(fixedFlag.SUB_ENGINERRING),
+      calcTools.getNodeByFlag(fixedFlag.MEASURE),
+      // calcTools.getNodeByFlag(fixedFlag.OTHER),
+      // calcTools.getNodeByFlag(fixedFlag.CHARGE),
+    ];
+
+    // 排除的节点
+    // if (cbTools.isUnDef(calcBase.fixedBills[calcBase.fixedFlag.SAFETY_CONSTRUCTION])) return 0;
+    // let bill = calcBase.fixedBills[calcBase.fixedFlag.SAFETY_CONSTRUCTION]["bill"];
+    // if (cbTools.isUnDef(bill) || cbTools.isUnDef(bill.ID)) return 0;
+    // let node = cbTools.getNodeByID(bill.ID);
+    // if (cbTools.isUnDef(node)) return 0;
+    // let excludeNodes = [node];
+
+    return projectObj.project.calcProgram.getSumTotalFee(baseNodes, excludeNodes, "night", tender);
   },
   // 市政道路工程安全文明施工费: 按“税前工程造价”为基数,以累进办法计算。
   SZDLGCAQWMSGF(tender) {

File diff suppressed because it is too large
+ 296 - 814
web/building_saas/main/js/models/calc_program.js


+ 2 - 0
web/over_write/js/chongqing_2018.js

@@ -238,6 +238,7 @@ function overwriteRationCalcBases(taxType) {
     { type: "surtax", name: "附加税", code: "1800" },
     { type: "environmentTax", name: "环境保护税", code: "1800" },
     { type: "common", name: "工程造价", code: "1" },
+    { type: "night", name: "轨道夜间施工费", code: "0" },
   ];
 })();
 
@@ -331,6 +332,7 @@ if (typeof baseFigureMap !== "undefined") {
       cycleCalcRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE], //循环计算相关固定行,由于计算排除了本身,不用判断措施项目
       multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE],
     }, //相关固定行
+    轨道夜间施工费: { base: "GDYJSGF", class: "NONE" },
   };
 }