zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:工艺路线输入物料按-create_time排序

This commit is contained in:
shijing 2025-10-13 16:13:31 +08:00
parent d99f14d543
commit f7ab449054
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/mtm/route_form.vue
View File

@ -401,7 +401,7 @@ export default {
getMaterialIn() { getMaterialIn() {
let that = this; let that = this;
that.$API.mtm.material.list 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) => { .then((res) => {
that.materialsIn = res; that.materialsIn = res;
}); });

30
src/views/wpm_bx/mlogbw_check_table.vue
View File

@ -636,13 +636,13 @@ export default {
if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
let str = item.rule_expression.replace(/`/g, ''); 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){ let judge = false;
if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){ try {
str = str.split('||')[0]; 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 = {}; obj.ftest = {};
@ -751,14 +751,18 @@ export default {
if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
let str = item.rule_expression.replace(/`/g, ''); 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(str.indexOf('row.剪切值18mm')>-1){
if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){ // if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){
str = str.split('||')[0]; // 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{ }else{
that.mlogbwlist[index][item.defect_name] = false; that.mlogbwlist[index][item.defect_name] = false;
} }