diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index b894869c..03cfa21a 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -636,6 +636,11 @@ export default { if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ let str = item.rule_expression.replace(/`/g, ''); str = str.replace(/\${(.*?)}/g, 'row.\$1') + if(str.indexOf('row.剪切值18mm')>-1){ + if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){ + str = str.split('||')[0]; + } + } let judge = eval(str); row[item.defect_name] = judge; } @@ -745,7 +750,13 @@ export default { that.qct_defects.forEach(item => { if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ let str = item.rule_expression.replace(/`/g, ''); - str = str.replace(/\${(.*?)}/g, 'row.\$1') + str = str.replace(/\${(.*?)}/g, 'row.\$1'); + if(str.indexOf('row.剪切值18mm')>-1){ + if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){ + str = str.split('||')[0]; + } + } + //`${剪切18mm}>31||${剪切值18mm}.indexOf("满")!=-1` let judge = eval(str); that.mlogbwlist[index][item.defect_name] = judge; }else{