|
|
@@ -1400,7 +1400,8 @@ let calcBase = {
|
|
|
node.updateData.calcBase = exp;
|
|
|
node.updateData.calcBaseValue = parseFloat(calcBaseValue).toDecimal(decimalObj.decimal('totalPrice', node));
|
|
|
node.updateData.tenderCalcBaseValue = parseFloat(tenderCalcBaseValue).toDecimal(decimalObj.decimal('totalPrice', node));
|
|
|
- if (calculateUtil.isProgressive(exp, progression)) {
|
|
|
+ // progression来自overwrite里配置的全局变量
|
|
|
+ if (typeof progression !== 'undefined' && calculateUtil.isProgressive(exp, progression)) {
|
|
|
node.updateData.baseProgressiveFee = me.baseProgressiveFee;
|
|
|
}
|
|
|
node.changed = true;
|