HL-5281、HL-5538 上架策略 下架策略

src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue

@@ -927,7 +927,9 @@ const blurWarehouse = async ()=>{
     })
     console.log('仓库verifyRes',verifyRes)
     if(verifyRes&&verifyRes.length>0){
-      formData.value.configuration[warehouseType.value] = verifyRes.map(item=>(item['code'])).join(',')
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
     }else{
       formData.value.configuration[warehouseType.value] = ''
     }
@@ -938,7 +940,9 @@ const blurWarehouse = async ()=>{
     })
     console.log('库区verifyRes',verifyRes)
     if(verifyRes&&verifyRes.length>0){
-      formData.value.configuration[warehouseType.value] = verifyRes.map(item=>(item['code'])).join(',')
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
     }else{
       formData.value.configuration[warehouseType.value] = ''
     }
@@ -949,7 +953,9 @@ const blurWarehouse = async ()=>{
     })
     console.log('库位组verifyRes',verifyRes)
     if(verifyRes&&verifyRes.length>0){
-      formData.value.configuration[warehouseType.value] = verifyRes.map(item=>(item['code'])).join(',')
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
     }else{
       formData.value.configuration[warehouseType.value] = ''
     }
@@ -961,7 +967,9 @@ const blurWarehouse = async ()=>{
     })
     console.log('库位组verifyRes',verifyRes)
     if(verifyRes&&verifyRes.length>0){
-      formData.value.configuration[warehouseType.value] = verifyRes.map(item=>(item['code'])).join(',')
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
     }else{
       formData.value.configuration[warehouseType.value] = ''
     }
@@ -998,7 +1006,9 @@ const blurTransactionType = async ()=>{
     })
     console.log('事务类型verifyRes',verifyRes)
     if(verifyRes&&verifyRes.length>0){
-      transactionType.Value = verifyRes.map(item=>(item['code'])).join(',')
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = transactionType.Value.split(',')
+      transactionType.Value = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
     }else{
       transactionType.Value = ''
     }

src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue

@@ -895,6 +895,7 @@ const searchWarehouse = ()=>{
 const blurWarehouse = async ()=>{
   // 校验的值
   let warehouseValue = formData.value.configuration[warehouseType.value]
+  
   if(warehouseType.value == 'WarehouseCode'){
     // 仓库
     let verifyRes = await WarehouseApi.verifyWarehouse({
@@ -902,7 +903,10 @@ const blurWarehouse = async ()=>{
     })
     console.log('仓库verifyRes',verifyRes)
     if(verifyRes&&verifyRes.length>0){
-      formData.value.configuration[warehouseType.value] = verifyRes.map(item=>(item['code'])).join(',')
+      // formData.value.configuration[warehouseType.value] = verifyRes.map(item=>(item['code'])).join(',')
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
     }else{
       formData.value.configuration[warehouseType.value] = ''
     }
@@ -913,7 +917,9 @@ const blurWarehouse = async ()=>{
     })
     console.log('库区verifyRes',verifyRes)
     if(verifyRes&&verifyRes.length>0){
-      formData.value.configuration[warehouseType.value] = verifyRes.map(item=>(item['code'])).join(',')
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
     }else{
       formData.value.configuration[warehouseType.value] = ''
     }
@@ -924,7 +930,9 @@ const blurWarehouse = async ()=>{
     })
     console.log('库位组verifyRes',verifyRes)
     if(verifyRes&&verifyRes.length>0){
-      formData.value.configuration[warehouseType.value] = verifyRes.map(item=>(item['code'])).join(',')
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
     }else{
       formData.value.configuration[warehouseType.value] = ''
     }
@@ -934,9 +942,11 @@ const blurWarehouse = async ()=>{
     let verifyRes = await LocationApi.verifyLocation({
       code:warehouseValue
     })
-    console.log('库位组verifyRes',verifyRes)
+    console.log('库位verifyRes',verifyRes)
     if(verifyRes&&verifyRes.length>0){
-      formData.value.configuration[warehouseType.value] = verifyRes.map(item=>(item['code'])).join(',')
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
     }else{
       formData.value.configuration[warehouseType.value] = ''
     }
@@ -973,7 +983,9 @@ const blurTransactionType = async ()=>{
     })
     console.log('事务类型verifyRes',verifyRes)
     if(verifyRes&&verifyRes.length>0){
-      transactionType.Value = verifyRes.map(item=>(item['code'])).join(',')
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = transactionType.Value.split(',')
+      transactionType.Value = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
     }else{
       transactionType.Value = ''
     }