From 42d2950cfd6f310acd746e3f8a1e724c8c7c5ea5 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 22 Aug 2024 14:27:44 +0800 Subject: [PATCH] =?UTF-8?q?HL-5281=E3=80=81HL-5538=20=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E7=AD=96=E7=95=A5=20=E4=B8=8B=E6=9E=B6=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/downShelfStrategy/AddForm.vue | 20 ++++++++++++---- .../strategy/upShelfStrategy/AddForm.vue | 24 ++++++++++++++----- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index 2c6d96846..3425a1cf7 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/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 = '' } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 5fc5dc31f..a8c533f04 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/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 = '' }