|
|
@@ -1006,14 +1006,14 @@ class CalcProgram {
|
|
|
let rq = calcTools.uiNodeQty(node) ? calcTools.uiNodeQty(node) : 0;
|
|
|
let ruf = 0, rtuf = 0, rtf = 0, rttf = 0;
|
|
|
if (node.data.feesIndex && node.data.feesIndex[ft.type]) {
|
|
|
- ruf = parseFloat(node.data.feesIndex[ft.type].unitFee);
|
|
|
- rtuf = parseFloat(node.data.feesIndex[ft.type].tenderUnitFee);
|
|
|
- rtf = parseFloat(node.data.feesIndex[ft.type].totalFee);
|
|
|
- rttf = parseFloat(node.data.feesIndex[ft.type].tenderTotalFee);
|
|
|
+ ruf = parseFloatPlus(node.data.feesIndex[ft.type].unitFee).toDecimal(decimalObj.bills.unitPrice);
|
|
|
+ rtuf = parseFloatPlus(node.data.feesIndex[ft.type].tenderUnitFee).toDecimal(decimalObj.bills.unitPrice);
|
|
|
+ rtf = parseFloatPlus(node.data.feesIndex[ft.type].totalFee).toDecimal(decimalObj.bills.totalPrice);
|
|
|
+ rttf = parseFloatPlus(node.data.feesIndex[ft.type].tenderTotalFee).toDecimal(decimalObj.bills.totalPrice);
|
|
|
};
|
|
|
if (me.project.property.billsCalcMode === leafBillGetFeeType.rationContent) {
|
|
|
- buf = (buf + (ruf * rq / bq).toDecimal(decimalObj.bills.unitFee)).toDecimal(decimalObj.bills.unitFee);
|
|
|
- btuf = (btuf + (rtuf * rq / bq).toDecimal(decimalObj.bills.unitFee)).toDecimal(decimalObj.bills.unitFee);
|
|
|
+ buf = (buf + (ruf * rq / bq).toDecimal(decimalObj.bills.unitPrice)).toDecimal(decimalObj.bills.unitPrice);
|
|
|
+ btuf = (btuf + (rtuf * rq / bq).toDecimal(decimalObj.bills.unitPrice)).toDecimal(decimalObj.bills.unitPrice);
|
|
|
};
|
|
|
sum_rtf = (sum_rtf + rtf).toDecimal(decimalObj.process);
|
|
|
sum_rttf = (sum_rttf + rttf).toDecimal(decimalObj.process);
|
