|
@@ -1881,8 +1881,10 @@
|
|
|
|
|
|
|
|
ftObj.totalFee = btf.toDecimal(decimalObj.bills.totalPrice);
|
|
ftObj.totalFee = btf.toDecimal(decimalObj.bills.totalPrice);
|
|
|
ftObj.tenderTotalFee = bttf.toDecimal(decimalObj.bills.totalPrice);
|
|
ftObj.tenderTotalFee = bttf.toDecimal(decimalObj.bills.totalPrice);
|
|
|
- ftObj.unitFee = buf.toDecimal(decimalObj.bills.unitPrice);
|
|
|
|
|
- ftObj.tenderUnitFee = btuf.toDecimal(decimalObj.bills.unitPrice);
|
|
|
|
|
|
|
+ if (treeNode.parent) { // 非大项费用才需要计算、显示单价
|
|
|
|
|
+ ftObj.unitFee = buf.toDecimal(decimalObj.bills.unitPrice);
|
|
|
|
|
+ ftObj.tenderUnitFee = btuf.toDecimal(decimalObj.bills.unitPrice);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
calcTools.checkFeeField(treeNode, ftObj);
|
|
calcTools.checkFeeField(treeNode, ftObj);
|
|
|
|
|
|
|
@@ -1911,13 +1913,16 @@
|
|
|
tf = (uf * q).toDecimal(decimalObj.bills.totalPrice);
|
|
tf = (uf * q).toDecimal(decimalObj.bills.totalPrice);
|
|
|
ttf = (tuf * q).toDecimal(decimalObj.bills.totalPrice);
|
|
ttf = (tuf * q).toDecimal(decimalObj.bills.totalPrice);
|
|
|
};
|
|
};
|
|
|
- calcTools.checkFeeField(treeNode, {
|
|
|
|
|
- 'fieldName': 'common',
|
|
|
|
|
- 'unitFee': uf,
|
|
|
|
|
- 'totalFee': tf,
|
|
|
|
|
- 'tenderUnitFee': tuf,
|
|
|
|
|
- 'tenderTotalFee': ttf
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ let feeItem = {
|
|
|
|
|
+ 'fieldName': 'common',
|
|
|
|
|
+ 'totalFee': tf,
|
|
|
|
|
+ 'tenderTotalFee': ttf
|
|
|
|
|
+ };
|
|
|
|
|
+ if (treeNode.parent) { // 非大项费用才需要计算、显示单价
|
|
|
|
|
+ feeItem.unitFee = uf;
|
|
|
|
|
+ feeItem.tenderUnitFee = tuf;
|
|
|
|
|
+ }
|
|
|
|
|
+ calcTools.checkFeeField(treeNode, feeItem);
|
|
|
//第一部分建安费下,使用基数计算的清单,定额建安费应=金额
|
|
//第一部分建安费下,使用基数计算的清单,定额建安费应=金额
|
|
|
if (cbTools.getBelongFlagList(treeNode).includes(fixedFlag.CONSTRUCTION_INSTALL_FEE))
|
|
if (cbTools.getBelongFlagList(treeNode).includes(fixedFlag.CONSTRUCTION_INSTALL_FEE))
|
|
|
calcTools.checkFeeField(treeNode, {
|
|
calcTools.checkFeeField(treeNode, {
|