From 8314c2943734770c6a38e67147e6367f683df8d1 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 07 三月 2025 11:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
index 81c4baa..3eb9521 100644
--- a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
@@ -63,7 +63,7 @@
             } else if (params == 3) {
               return '涓嶅垽瀹�'
             } else {
-              return ''
+              return null
             }
           },
           formatType: (params) => {
@@ -74,7 +74,7 @@
             } else if (params == 3) {
               return ''
             }  else {
-              return ''
+              return null
             }
           }
         },

--
Gitblit v1.9.3