Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

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({
@@ -1059,13 +1060,13 @@ const blurWarehouse = async ({module='config',type})=>{
     console.log('库区verifyRes',verifyRes)
   }else if(module=='condition'&&type=='LocationGroupCode' || module=='config'&&warehouseType.value == 'LocationGroupCode'){
     // 库位组
-    let verifyRes = await LocationgroupApi.verifyLocationgroup({
+    verifyRes = await LocationgroupApi.verifyLocationgroup({
       code:warehouseValue
     })
     console.log('库位组verifyRes',verifyRes)
   }else if(module=='condition'&&type=='LocationCode' || module=='config'&&warehouseType.value == 'LocationCode'){
     // 库位
-    let verifyRes = await LocationApi.verifyLocation({
+    verifyRes = await LocationApi.verifyLocation({
       code:warehouseValue
     })
     console.log('库位verifyRes',verifyRes)
@@ -1240,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' ) {
                item.Value = item.Value.split(',')
             }
+          }
         })
       }
       if (data.configuration) {