|
|
@@ -834,8 +834,9 @@ let baseFigureTemplate = {
|
|
|
let fullFeeField = tender ? "common.tenderTotalFee" : "common.totalFee";
|
|
|
return projectObj.project.calcProgram.getTotalFee([oneToSeven], deductNodes, fullFeeField).toDecimal(decimalObj.bills.totalPrice);
|
|
|
},
|
|
|
- // {定额建安费(不含定额设备购置费)} 汇总非设备类型的定额的定额建安费
|
|
|
+ // {定额建安费(不含定额设备购置费)}
|
|
|
DEJAFBHDESBGZF: function (tender) {
|
|
|
+ // 旧:汇总定额的定额建安费(不含设备类型的定额、不含工料机定额、不含量x价清单)。因缺少量x价清单的定额建安费,新版本不再使用。
|
|
|
if (isLowVer(historyVer1)) {
|
|
|
const feeField = "rationCommon";
|
|
|
const subFeeField = tender ? "tenderTotalFee" : "totalFee";
|
|
|
@@ -846,10 +847,11 @@ let baseFigureTemplate = {
|
|
|
}, 0);
|
|
|
return summaryFee.toDecimal(decimalObj.bills.totalPrice);
|
|
|
} else {
|
|
|
+ // 新:根结点的定额建安费(含 量x价清单的定额建安费),扣除定额设备费+税金。其中,设备费:传入rationCommon时,表示定额设备费+税金。传入equipment表示定额设备费
|
|
|
const baseFee = cbTools.getBaseFee(fixedFlag.ONE_SEVEN_BILLS, tender, "rationCommon");
|
|
|
const fixedNode = projectObj.project.mainTree.roots.find((node) => node.getFlag() === fixedFlag.ONE_SEVEN_BILLS);
|
|
|
- const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, "rationCommon");
|
|
|
- return (baseFee - equipmentFee).toDecimal(decimalObj.bills.totalPrice);
|
|
|
+ const equipmentTaxFee = cbTools.getEquipmentFee(fixedNode, tender, "rationCommon");
|
|
|
+ return (baseFee - equipmentTaxFee).toDecimal(decimalObj.bills.totalPrice);
|
|
|
}
|
|
|
},
|
|
|
},
|