Bladeren bron

停工费

chenshilong 1 jaar geleden
bovenliggende
commit
467382729c

+ 6 - 0
web/building_saas/main/js/models/calc_base.js

@@ -688,6 +688,12 @@ let baseFigureTemplate = {
     let excludeNodes = [];
     return projectObj.project.calcProgram.getSumTotalFee(baseNodes, excludeNodes, "night", tender);
   },
+  TGF: function (tender) {
+    // 停工费
+    let baseNodes = [calcTools.getNodeByFlag(fixedFlag.SUB_ENGINERRING), calcTools.getNodeByFlag(fixedFlag.MEASURE)];
+    let excludeNodes = [];
+    return projectObj.project.calcProgram.getSumTotalFee(baseNodes, excludeNodes, "stop", tender);
+  },
   // 市政道路工程安全文明施工费: 按“税前工程造价”为基数,以累进办法计算。
   SZDLGCAQWMSGF(tender) {
     const baseFee = this["SQGCZJ"](tender);

+ 0 - 24
web/building_saas/main/js/models/calc_program.js

@@ -2278,30 +2278,6 @@ class CalcProgram {
     return rst;
   }
 
-  // 轨道夜间施工费
-  getNightFee(baseNodes, excludeNodes, tender) {
-    let rst = 0;
-    const totalFeeType = tender ? "night.tenderTotalFee" : "night.totalFee";
-    function calcNodes(nodes) {
-      for (let node of nodes) {
-        if (!node) {
-          continue;
-        }
-        if (!excludeNodes.includes(node)) {
-          if (node.source && node.source.children && node.source.children.length > 0) {
-            calcNodes(node.children);
-          } else {
-            if (node.sourceType == ModuleNames.bills) {
-              rst = (rst + calcTools.getFee(node, totalFeeType)).toDecimal(decimalObj.decimal("totalPrice", node));
-            }
-          }
-        }
-      }
-    }
-    calcNodes(baseNodes);
-    return rst;
-  }
-
   // 清理调价缓存数据
   clearTenderCache(treeNode) {
     // 这些属性值为什么不定义在一个对象里?因为每次要判断对象是否存在,十分麻烦。不如直接写简单。分散书写,统一处理也很好用。

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

@@ -239,6 +239,7 @@ function overwriteRationCalcBases(taxType) {
     { type: "environmentTax", name: "环境保护税", code: "1800" },
     { type: "common", name: "工程造价", code: "1" },
     { type: "night", name: "轨道夜间施工费", code: "0" },
+    { type: "stop", name: "停工费", code: "0" },
   ];
 })();
 
@@ -333,6 +334,7 @@ if (typeof baseFigureMap !== "undefined") {
       multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE],
     }, //相关固定行
     轨道夜间施工费: { base: "GDYJSGF", class: "ALL" },
+    停工费: { base: "TGF", class: "ALL" },
   };
 }