|
@@ -420,7 +420,9 @@ function getReportData(nameList, items, prjTypeNames, compilationScopes, decimal
|
|
|
if (progressiveInterval && isProgressiveType && rootFlag == fixedFlag.MAINTENANCE_EXPENSES) {
|
|
if (progressiveInterval && isProgressiveType && rootFlag == fixedFlag.MAINTENANCE_EXPENSES) {
|
|
|
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 calcTotal = calcUtil.getProgressiveFee(baseTotal, baseArr[0], progressiveInterval, decimal.bills.totalPrice, overWrite ? overWrite.deficiency : undefined);
|
|
|
|
|
|
|
+ let deficiency = overWrite && overWrite.deficiency || null;
|
|
|
|
|
+ let beyond = overWrite && overWrite.beyond || null;
|
|
|
|
|
+ let calcTotal = calcUtil.getProgressiveFee(baseTotal, baseArr[0], progressiveInterval, decimal.bills.totalPrice, deficiency, beyond );
|
|
|
tem.billsTtlPrice = calcTotal;
|
|
tem.billsTtlPrice = calcTotal;
|
|
|
let rate = scMathUtil.roundForObj(calcTotal * 100 / baseTotal, decimal.feeRate);
|
|
let rate = scMathUtil.roundForObj(calcTotal * 100 / baseTotal, decimal.feeRate);
|
|
|
tem.billsMemos = "费率:" + rate + "%";
|
|
tem.billsMemos = "费率:" + rate + "%";
|