diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index f5b9712a..e3a4b48e 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -503,10 +503,8 @@ export default { }, getEquipments(){ let that = this; - let eqId = localStorage.getItem("bxerpChenckEquipmentId"); that.$API.em.equipment.list.req({page:0,cate__code:"6"}).then((res) => { that.equipmentOptions = res; - that.form.equipment = eqId; }) }, getdefects(){ @@ -753,6 +751,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 = false; try { judge = eval(str); @@ -806,7 +809,6 @@ export default { }, equipmentChange(){ let that = this; - localStorage.setItem("bxerpChenckEquipmentId",that.form.equipment); that.equipmentOptions.forEach(item => { if(item.id == that.form.equipment){ that.form.equipment_name = item.name;