|
@@ -1540,9 +1540,17 @@ let cbCalctor = {
|
|
|
}
|
|
|
return 0;
|
|
|
},
|
|
|
- //计算
|
|
|
- exec: function () {
|
|
|
-
|
|
|
+ tenderRef: function (fExp) {
|
|
|
+ let ID = cbParser.getUID([fExp]);
|
|
|
+ if(ID.length === 1){
|
|
|
+ let node = cbTools.getNodeByID(ID[0]);
|
|
|
+ return cbTools.isDef(node) &&
|
|
|
+ cbTools.isDef(node.data.feesIndex) &&
|
|
|
+ cbTools.isDef(node.data.feesIndex.common) &&
|
|
|
+ cbTools.isDef(node.data.feesIndex.common.tenderTotalFee) ?
|
|
|
+ node.data.feesIndex.common.tenderTotalFee : 0;
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
}
|
|
|
};
|
|
|
|
|
@@ -1602,7 +1610,9 @@ let calcBase = {
|
|
|
throw '基数计算结果不为数值';
|
|
|
}
|
|
|
//调价
|
|
|
- let tenderCalcExp = calcExp.replace(new RegExp('base', 'g'), 'tenderBase');
|
|
|
+ let tenderCalcExp = calcExp
|
|
|
+ .replace(new RegExp('base', 'g'), 'tenderBase')
|
|
|
+ .replace(new RegExp('ref', 'g'), 'tenderRef');
|
|
|
let tenderCalcBaseValue = eval(tenderCalcExp);
|
|
|
if(!cbTools.isNum(tenderCalcBaseValue)){
|
|
|
throw '调价基数计算结果不为数值';
|