|
@@ -2889,9 +2889,8 @@ class CalcProgram {
|
|
|
if (calcItem.feeRate != undefined)
|
|
|
feeRate = parseFloat(calcItem.feeRate).toDecimal(decimalObj.feeRate);
|
|
|
|
|
|
- calcItem.unitFee = (eval(calcItem.compiledExpr) * feeRate * 0.01).toDecimal(2);
|
|
|
- // calcItem.totalFee = (calcItem.unitFee * nQ).toDecimal(2);
|
|
|
- calcItem.totalFee = (calcItem.unitFee * 1).toDecimal(2);
|
|
|
+ calcItem.unitFee = (eval(calcItem.compiledExpr) * feeRate * 0.01).toDecimal(decimalObj.ration.unitPrice);
|
|
|
+ calcItem.totalFee = (calcItem.unitFee * 1).toDecimal(decimalObj.ration.totalPrice);
|
|
|
|
|
|
if (calcItem.fieldName =='common') {
|
|
|
template.totalFee = calcItem.totalFee;
|
|
@@ -2920,7 +2919,7 @@ class CalcProgram {
|
|
|
rst.calcPrograms.push(obj.template);
|
|
|
temp = temp + obj.value;
|
|
|
}
|
|
|
- rst.totalFee = temp.toDecimal(decimalObj.bills.totalPrice);
|
|
|
+ rst.totalFee = temp.toDecimal(decimalObj.ration.totalPrice);
|
|
|
let oldValue = projectObj.project.mainTree.items[0].data.totalFee;
|
|
|
if (oldValue != rst.totalFee){
|
|
|
projectObj.project.mainTree.items[0].data.totalFee = rst.totalFee;
|