From 10bd1c0bbba80d86313b86559546557b2bdbc920 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 20 二月 2025 10:21:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/materialOrder/index.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index de58d9c..e0b3b07 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -237,14 +237,14 @@
if (params == 1) {
return '杩囨湡鐗╂枡'
} else {
- return ''
+ return null
}
},
formatType: (params) => {
if (params == 1) {
return 'info'
} else {
- return ''
+ return null
}
}
},
@@ -306,14 +306,14 @@
if (params == 1) {
return '杩囨湡鐗╂枡'
} else {
- return ''
+ return null
}
},
formatType: (params) => {
if (params == 1) {
return 'info'
} else {
- return ''
+ return null
}
}
},
@@ -381,14 +381,14 @@
if (params == 1) {
return '杩囨湡鐗╂枡'
} else {
- return ''
+ return null
}
},
formatType: (params) => {
if (params == 1) {
return 'info'
} else {
- return ''
+ return null
}
}
},
@@ -494,14 +494,14 @@
if (params == 1) {
return '杩囨湡鐗╂枡'
} else {
- return ''
+ return null
}
},
formatType: (params) => {
if (params == 1) {
return 'info'
} else {
- return ''
+ return null
}
}
},
@@ -560,14 +560,14 @@
if (params == 1) {
return '杩囨湡鐗╂枡'
} else {
- return ''
+ return null
}
},
formatType: (params) => {
if (params == 1) {
return 'info'
} else {
- return ''
+ return null
}
}
},
@@ -1036,8 +1036,8 @@
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
- this.dataDialogVisible = true;
this.dataLookInfo = row
+ this.dataDialogVisible = true;
},
// 鍏抽棴鏁版嵁鏌ョ湅寮规
closeDataLook () {
--
Gitblit v1.9.3