|
|
@@ -1990,9 +1990,9 @@ class CalcProgram {
|
|
|
buf = (btf / bq).toDecimal(decimalObj.bills.unitPrice);
|
|
|
buf = me.billFloatUnitPrice(buf, treeNode);
|
|
|
btuf = (bttf / btq).toDecimal(decimalObj.bills.unitPrice);
|
|
|
+ btuf = me.billFloatUnitPrice(btuf, treeNode);
|
|
|
}
|
|
|
|
|
|
- // debugger;
|
|
|
if (me.project.property.billsCalcMode == leafBillGetFeeType.rationPriceConverse && ["common", "rationCommon", "indexCommon"].includes(ft.type)) {
|
|
|
// 招投标项目, 还要反算
|
|
|
// 9-24 新需求 开放正算反算选项,按选项判断
|
|
|
@@ -2021,6 +2021,7 @@ class CalcProgram {
|
|
|
billFloatUnitPrice(orgUnitPrice, treeNode) {
|
|
|
if (compilationName === "四川养护(2013)" || compilationName === "部颁2018计价标准") {
|
|
|
let coe = treeNode.data.unitPriceCoe || 1; // 单价浮动系数。只有叶子清单层的浮动系数生效
|
|
|
+ if (coe === "0") coe = 1;
|
|
|
return (orgUnitPrice * coe).toDecimal(decimalObj.bills.unitPrice);
|
|
|
} else return orgUnitPrice;
|
|
|
}
|
|
|
@@ -2040,6 +2041,7 @@ class CalcProgram {
|
|
|
let uf = (tf / q).toDecimal(decimalObj.bills.unitPrice);
|
|
|
uf = me.billFloatUnitPrice(uf, treeNode);
|
|
|
let tuf = (ttf / tq).toDecimal(decimalObj.bills.unitPrice);
|
|
|
+ tuf = me.billFloatUnitPrice(tuf, treeNode);
|
|
|
if (calcTools.isBillProject()) {
|
|
|
tf = (uf * q).toDecimal(decimalObj.bills.totalPrice);
|
|
|
ttf = (tuf * q).toDecimal(decimalObj.bills.totalPrice);
|
|
|
@@ -2660,8 +2662,8 @@ class CalcProgram {
|
|
|
|
|
|
if (calcTools.hasTargetTotalFee(child)) {
|
|
|
child.data.tender_activeTarget = child.data.targetTotalFee;
|
|
|
- console.log(treeNode.data.tender_activeTotal);
|
|
|
- console.log(child.data.tender_activeTotal);
|
|
|
+ // console.log(treeNode.data.tender_activeTotal);
|
|
|
+ // console.log(child.data.tender_activeTotal);
|
|
|
treeNode.data.tender_activeTotal = treeNode.data.tender_activeTotal - child.data.tender_activeTotal;
|
|
|
treeNode.data.tender_activeTarget = treeNode.data.tender_activeTarget - child.data.tender_activeTarget;
|
|
|
}
|