From f7ab449054cb66bfb6773d9be9f986c551634e4a Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 13 Oct 2025 16:13:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=89=A9=E6=96=99=E6=8C=89-create=5Ftime?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/route_form.vue            |  2 +-
 src/views/wpm_bx/mlogbw_check_table.vue | 30 ++++++++++++++-----------
 2 files changed, 18 insertions(+), 14 deletions(-)

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;
 				}