|
@@ -1192,8 +1192,8 @@ let analyzer = {
|
|
|
for (let base of arrBase){
|
|
for (let base of arrBase){
|
|
|
let baseName = base.slice(1, -1);
|
|
let baseName = base.slice(1, -1);
|
|
|
if (!rationCalcBases[baseName]){
|
|
if (!rationCalcBases[baseName]){
|
|
|
- analyzer.error = `定额基数${hintBox.font('[' +baseName + ']')}末定义!`;
|
|
|
|
|
- // hintBox.infoBox('错误提示', `定额基数${hintBox.font('[' +baseName + ']')}末定义!`, 1);
|
|
|
|
|
|
|
+ analyzer.error = `定额基数${hintBox.font('[' +baseName + ']')}未定义!`;
|
|
|
|
|
+ // hintBox.infoBox('错误提示', `定额基数${hintBox.font('[' +baseName + ']')}未定义!`, 1);
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
@@ -1407,7 +1407,7 @@ let executeObj = {
|
|
|
return calcTools.marketPriceToBase(me.treeNode, baseName, isTender)
|
|
return calcTools.marketPriceToBase(me.treeNode, baseName, isTender)
|
|
|
else{
|
|
else{
|
|
|
if (!rationCalcBases[baseName]){
|
|
if (!rationCalcBases[baseName]){
|
|
|
- hintBox.infoBox('系统提示', '定额基数“' + baseName + '”末定义,计算错误。 (模板 ' + me.template.ID + ',规则 ' + me.tempCalcItem.ID +')', 1);
|
|
|
|
|
|
|
+ hintBox.infoBox('系统提示', '定额基数“' + baseName + '”未定义,计算错误。 (模板 ' + me.template.ID + ',规则 ' + me.tempCalcItem.ID +')', 1);
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|