From 8de4a9b741b43821c15b1ff7678e906e2c1d3695 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 18 Dec 2024 11:10:21 +0800 Subject: [PATCH] =?UTF-8?q?YT-1724=E7=BC=96=E8=BE=91=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E7=AD=96=E7=95=A5=EF=BC=8C=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E5=88=B0=E8=A7=84=E5=88=99=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=A4=84=EF=BC=8C=E5=85=89=E6=A0=87=E7=A6=BB=E5=BC=80=E5=BC=B9?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arrivalInspectionStrategy/AddForm.vue | 5 ----- .../strategy/batchStrategy/AddForm.vue | 15 ++++++++++----- .../strategy/deliverStrategy/AddForm.vue | 6 ++---- .../strategy/downShelfStrategy/AddForm.vue | 5 ----- .../strategy/repairMaterialStrategy/AddForm.vue | 5 +++-- .../strategy/storageCapacityStrategy/AddForm.vue | 16 ++++++++-------- .../strategy/upShelfStrategy/AddForm.vue | 4 +--- .../warehouseStorageStrategy/AddForm.vue | 5 ----- 8 files changed, 24 insertions(+), 37 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue index f75ecb889..171db4c5a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue @@ -300,11 +300,6 @@ const open = async (type: string, strategyCode: string, id?: number) => { // } if (data.condition) { formData.value.condition = JSON.parse(data.condition) - formData.value.condition.forEach((item, index) => { - if (item.Operator == 'IN' || item.Operator == 'NOT IN') { - item.Value = item.Value.split(',') - } - }) } if (data.configuration) { formData.value.configuration = JSON.parse(data.configuration) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue index c39fed41c..48cfd7904 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue @@ -442,8 +442,8 @@ const open = async (type: string, strategyCode: string, id?: number) => { if (data.condition) { formData.value.condition = JSON.parse(data.condition) formData.value.condition.forEach((item, index) => { - if (item.Operator == 'IN' || item.Operator == 'NOT IN') { - item.Value = item.Value.split(',') + if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' ) { + item.Value = item.Value.split(',') } }) } @@ -733,9 +733,14 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { if(searchTableModule.value == 'condition'){ // module: config 配置 condition 条件 - // 仓库 库区 库位 库位组 - let conditionObj = formData.value.condition.find(item=>['ItemCode','WarehouseCode','AreaCode','LocationGroupCode','LocationCode'].includes(item['ParamCode'])) - conditionObj['Value'] = val.map(item=>(item['code'])).join(',') + // 供应商客户 + if (formField == 'SupplierCode' || formField == 'CustomerCode') { + let conditionObj = formData.value.condition.find(item => ['SupplierCode', 'CustomerCode'].includes(item['ParamCode'])) + conditionObj['Value'] = val.map(item=>(item['code'])).join(',') + } else if (formField == 'ItemCode') { + let conditionObjItem = formData.value.condition.find(item => [ 'ItemCode'].includes(item['ParamCode'])) + conditionObjItem['Value'] = val.map(item=>(item['code'])).join(',') + } }else{ // 配置 // 仓库 库区 库位 库位组 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue index 4b78e4c9d..d46dd2be8 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue @@ -983,6 +983,7 @@ const searchWarehouse = ()=>{ } const searchTableSuccess = (formField, searchField, val, type, row) => { + console.log(77,formField) if(formField=='Productionline'){ let transactionType = formData.value.condition.find(item=>item['ParamCode']=='Productionline') if(transactionType){ @@ -1067,10 +1068,7 @@ const open = async (type: string, strategyCode: string, id?: number) => { if (data.condition) { 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 == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' || item.ParamCode == 'CustomerCode' ) { + if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' ) { console.log(item.Value) item.Value = item.Value.split(',') } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index 81056e690..aecd1cbbb 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -807,11 +807,6 @@ const open = async (type: string, strategyCode: string, id?: number) => { if (data.condition) { formData.value.condition = JSON.parse(data.condition) formData.value.condition.forEach((item, index) => { - console.log(item) - if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { - console.log(item.Value) - item.Value = item.Value.split(',') - } if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus') { console.log(item.Value) item.Value = item.Value.split(',') diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index 871342dee..b542c19c3 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -474,11 +474,12 @@ const open = async (type: string, strategyCode: string, id?: number) => { if (data.condition) { formData.value.condition = JSON.parse(data.condition) formData.value.condition.forEach((item, index) => { - if (item.Operator == 'IN' || item.Operator == 'NOT IN') { + if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' ) { + console.log(item.Value) item.Value = item.Value.split(',') } }) - console.log(formData.value.condition) + // console.log(formData.value.condition) } if (data.configuration) { formData.value.configuration = JSON.parse(data.configuration) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue index 7ebeee92e..bf8534f94 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue @@ -466,11 +466,6 @@ const open = async (type: string, strategyCode: string, id?: number) => { // } if (data.condition) { formData.value.condition = JSON.parse(data.condition) - formData.value.condition.forEach((item, index) => { - if (item.Operator == 'IN' || item.Operator == 'NOT IN') { - item.Value = item.Value.split(',') - } - }) } if (data.configuration) { formData.value.configuration = JSON.parse(data.configuration) @@ -747,12 +742,17 @@ const blurWarehouse = async ({module='config',type})=>{ } } const searchTableSuccess = (formField, searchField, val, type, row) => { - + console.log(formField) if(searchTableModule.value == 'condition'){ // module: config 配置 condition 条件 // 仓库 库区 库位 库位组 - let conditionObj = formData.value.condition.find(item=>['ItemCode','WarehouseCode','AreaCode','LocationGroupCode','LocationCode'].includes(item['ParamCode'])) - conditionObj['Value'] = val.map(item=>(item['code'])).join(',') + if (formField == 'WarehouseCode' || formField == 'AreaCode' ||formField == 'LocationGroupCode' ||formField == 'LocationCode' ) { + let conditionObj = formData.value.condition.find(item => ['WarehouseCode', 'AreaCode', 'LocationGroupCode', 'LocationCode'].includes(item['ParamCode'])) + conditionObj['Value'] = val.map(item=>(item['code'])).join(',') + } else if (formField == 'ItemCode') { + let conditionObjItem = formData.value.condition.find(item => [ 'ItemCode'].includes(item['ParamCode'])) + conditionObjItem['Value'] = val.map(item=>(item['code'])).join(',') + } }else{ // 配置 // 仓库 库区 库位 库位组 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index aba846a01..74261b5d3 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -1251,13 +1251,11 @@ const open = async (type: string, strategyCode: string, id?: number) => { if (data.condition) { 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(',') } } - } }) } if (data.configuration) { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue index c226515df..f42ea124d 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue @@ -411,11 +411,6 @@ const open = async (type: string, strategyCode: string, id?: number) => { // } if (data.condition) { formData.value.condition = JSON.parse(data.condition) - formData.value.condition.forEach((item, index) => { - if (item.Operator == 'IN' || item.Operator == 'NOT IN') { - item.Value = item.Value.split(',') - } - }) } if (data.configuration) { formData.value.configuration = JSON.parse(data.configuration)