|
@@ -420,15 +420,22 @@ function getReportData(nameList, items, prjTypeNames, compilationScopes, decimal
|
|
|
tem.billsAmounts.push(0);
|
|
tem.billsAmounts.push(0);
|
|
|
tem['技术经济指标'].push(scMathUtil.roundForObj(p, 2));
|
|
tem['技术经济指标'].push(scMathUtil.roundForObj(p, 2));
|
|
|
}
|
|
}
|
|
|
- if (rootFlag == fixedFlag.MAINTENANCE_EXPENSES) { //如果是第三部分下的子清单,才要计算累计的相关信息
|
|
|
|
|
|
|
+ //如果是第三部分下的子清单,才要计算累计的相关信息
|
|
|
|
|
+ // 10-26 需求变更,所有清单都算累计
|
|
|
|
|
+ /* if (rootFlag == fixedFlag.MAINTENANCE_EXPENSES) {
|
|
|
if (bills.baseProgressiveFees[n]) {
|
|
if (bills.baseProgressiveFees[n]) {
|
|
|
bt = scMathUtil.roundForObj(bills.baseProgressiveFees[n], decimal.bills.totalPrice);
|
|
bt = scMathUtil.roundForObj(bills.baseProgressiveFees[n], decimal.bills.totalPrice);
|
|
|
baseTotal = scMathUtil.roundForObj(bt + baseTotal, decimal.process);
|
|
baseTotal = scMathUtil.roundForObj(bt + baseTotal, decimal.process);
|
|
|
}
|
|
}
|
|
|
|
|
+ } */
|
|
|
|
|
+ if (bills.baseProgressiveFees[n]) {
|
|
|
|
|
+ bt = scMathUtil.roundForObj(bills.baseProgressiveFees[n], decimal.bills.totalPrice);
|
|
|
|
|
+ baseTotal = scMathUtil.roundForObj(bt + baseTotal, decimal.process);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
tem.billsTtlPrice = scMathUtil.roundForObj(total, decimal.bills.totalPrice);
|
|
tem.billsTtlPrice = scMathUtil.roundForObj(total, decimal.bills.totalPrice);
|
|
|
- if (progressiveInterval && isProgressiveType && rootFlag == fixedFlag.MAINTENANCE_EXPENSES) {
|
|
|
|
|
|
|
+ // 10-26 需求变更,所有清单都算累计 && rootFlag == fixedFlag.MAINTENANCE_EXPENSES
|
|
|
|
|
+ if (progressiveInterval && isProgressiveType) {
|
|
|
let baseArr = calcUtil.getProgressive(bills.calcBase, overWrite ? overWrite.progression : undefined);
|
|
let baseArr = calcUtil.getProgressive(bills.calcBase, overWrite ? overWrite.progression : undefined);
|
|
|
if (baseArr.length > 0) {
|
|
if (baseArr.length > 0) {
|
|
|
let deficiency = overWrite && overWrite.deficiency || null;
|
|
let deficiency = overWrite && overWrite.deficiency || null;
|