From e70f066ab92f6dfbadeb49ad4fd23ae8415b54c7 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 19 Nov 2024 10:18:43 +0800
Subject: [PATCH] =?UTF-8?q?YT-1057=E7=BC=96=E8=BE=91=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E8=AE=BE=E7=BD=AE=E8=A7=84=E5=88=99=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E7=B3=BB=E7=BB=9F=E5=BC=B9=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategySetting/strategy/upShelfStrategy/AddForm.vue   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index d6a23d0eb..a179cfd74 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -82,7 +82,7 @@
                 <!-- 仓库 -->
                 <el-input style="flex:1" v-show="item.ParamCode == 'WarehouseCode'" placeholder="请选择从仓库" v-model="item.Value" @blur="blurWarehouse({module:'condition',type:'WarehouseCode'})" :disabled="formData.priority==0&&formType=='update'">
                     <template #suffix>
-                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse({module:'condition',type:'WarehouseCode'})">
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click.stop="searchWarehouse({module:'condition',type:'WarehouseCode'})">
                         <Icon icon="ep:search" class="mr-5px" /> 
                       </el-button> 
                     </template>
@@ -1045,6 +1045,7 @@ const blurWarehouse = async ({module='config',type})=>{
     return
   }
   let verifyRes = []
+  console.log(222,warehouseValue)
   if(module=='condition'&&type=='WarehouseCode' || module=='config'&&warehouseType.value == 'WarehouseCode'){
     // 仓库
     verifyRes = await WarehouseApi.verifyWarehouse({
@@ -1240,7 +1241,9 @@ 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)) {
-            item.Value = item.Value.split(',')
+            if (item.ParamCode != 'WarehouseCode' && item.ParamCode != 'AreaCode' &&item.ParamCode != 'LocationGroupCode' &&item.ParamCode != 'LocationCode' ) {
+               item.Value = item.Value.split(',')
+            }
           }
         })
       }