|
@@ -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) {
|