From fc6ed7861e7771b16452f8e88a5c67d9b0d9c9c6 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 十二月 2023 14:10:35 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/basic/location/index.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/basic/location/index.vue b/src/views/basic/location/index.vue
index dfb4f75..e102c95 100644
--- a/src/views/basic/location/index.vue
+++ b/src/views/basic/location/index.vue
@@ -194,7 +194,7 @@
             optList: () => {
               return this.getWarehouseLocGroupList()
             }
-          },
+          }/* ,
           // ERP搴撲綅
           {
             minWidth: '200',
@@ -204,7 +204,7 @@
             isTrue: false,
             isSearch: true,
             searchInfoType: 'text'
-          }
+          } */
         ],
         toolbar: [
           {

--
Gitblit v1.9.3