|
@@ -149,8 +149,10 @@ let quantityEditObj = {
|
|
|
return true;
|
|
|
}*/
|
|
|
quantityEXP = quantityEXP?quantityEXP.toUpperCase():'';//非空判断
|
|
|
- quantityEXP =replaceAll('(','(',quantityEXP);//转换中文左右符号
|
|
|
+ quantityEXP =replaceAll('(','(',quantityEXP);//转换中文左右符号与。、
|
|
|
quantityEXP =replaceAll(')',')',quantityEXP);
|
|
|
+ quantityEXP =replaceAll('。','.',quantityEXP);
|
|
|
+ quantityEXP =replaceAll('、','/',quantityEXP);
|
|
|
quantityEXP = quantityEXP.replace(/[\s\r\n]/g, "")//去掉空格回车换行等字符
|
|
|
let value = me.evalQuantityExp(quantityEXP,node);
|
|
|
if(value!=='evalError'){
|
|
@@ -180,6 +182,8 @@ let quantityEditObj = {
|
|
|
},
|
|
|
evalQuantityExp(quantityEXP,node){
|
|
|
let evalString = quantityEXP;
|
|
|
+ //求余% 换成 * 0.01 再计算
|
|
|
+ evalString =handlePercent(evalString);
|
|
|
if( node.sourceType == ModuleNames.ration && quantityEXP.indexOf('QDL')!=-1){
|
|
|
let billNode = node.parent;
|
|
|
let bQuantity = billNode.data.quantity?scMathUtil.roundForObj(billNode.data.quantity,getDecimal("quantity",billNode)):0;
|