From 3448975c1770baf6290e2f48cdfabf373629fb96 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 19 Nov 2024 14:23:02 +0800
Subject: [PATCH] =?UTF-8?q?YT-1058=E4=B8=8A=E6=9E=B6=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=9D=A1=E4=BB=B6=E4=B8=AD=E7=9A=84=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=B1=BB=E5=9E=8B=E5=92=8CABC=E7=B1=BB=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/basicDataManage/itemManage/itembasic/index.vue | 5 ++++-
 .../strategySetting/strategy/upShelfStrategy/AddForm.vue     | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
index da269f299..078117066 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
@@ -371,11 +371,14 @@ const changeTabs = (item) => {
     tabsExtend.value = false
     allSchemas.value = Itembasic.allSchemas
   }
-  detailAllSchemas.value.tableColumns.map((item,index) => {
+  if (detailAllSchemas.value && detailAllSchemas.value.tableColumns) {
+     detailAllSchemas.value.tableColumns.map((item,index) => {
     if (item.field == 'action') {
       detailAllSchemas.value.tableColumns.splice(index,1)
     }
   })
+  }
+ 
   // 当前物料代码作为条件
   tableObjectExtend.value = [{
     key: 'itemCode',
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index a179cfd74..05a68ebac 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -1241,8 +1241,10 @@ const open = async (type: string, strategyCode: string, id?: number) => {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {
           if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& !Array.isArray(item.Value)) {
-            if (item.ParamCode != 'WarehouseCode' && item.ParamCode != 'AreaCode' &&item.ParamCode != 'LocationGroupCode' &&item.ParamCode != 'LocationCode' ) {
+            if (item.ParamCode != 'WarehouseCode' && item.ParamCode != 'AreaCode' && item.ParamCode != 'LocationGroupCode' && item.ParamCode != 'LocationCode') {
+              if (item.Value) {
                item.Value = item.Value.split(',')
+              }
             }
           }
         })