diff --git a/src/views/mtm/route_form.vue b/src/views/mtm/route_form.vue index a572433b..155ac56a 100644 --- a/src/views/mtm/route_form.vue +++ b/src/views/mtm/route_form.vue @@ -401,7 +401,7 @@ export default { getMaterialIn() { let that = this; that.$API.mtm.material.list - .req({ page: 0, type__in: "10,20,30" }) + .req({ page: 0, type__in: "10,20,30",ordering: "-create_time"}) .then((res) => { that.materialsIn = res; }); diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index 03cfa21a..e3a4b48e 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -636,13 +636,13 @@ 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); + row[index][item.defect_name] = judge; + }catch (error) { + console.error('error',error); } - let judge = eval(str); - row[item.defect_name] = judge; } }); obj.ftest = {}; @@ -751,14 +751,18 @@ 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]; - } + // 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); + that.mlogbwlist[index][item.defect_name] = judge; + }catch (error) { + console.error(error); } - //`${剪切18mm}>31||${剪切值18mm}.indexOf("满")!=-1` - let judge = eval(str); - that.mlogbwlist[index][item.defect_name] = judge; }else{ that.mlogbwlist[index][item.defect_name] = false; }