From 96bfd5023cf7eb8d49a1620bab8cb543b7b09fea Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 13 Nov 2024 19:28:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E5=8F=91=E6=96=99=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/deliverStrategy/AddForm.vue | 17 +++++++++++------ .../strategy/downShelfStrategy/AddForm.vue | 5 +++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue index 2c3204eea..8486e9be3 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue @@ -54,7 +54,7 @@ - + - + ', Value: [] }, // 库存状态 @@ -691,7 +691,7 @@ const changeSupplierCustomer = (e) => { getFormSupplierList() // 选择物料类型/物料分组/abc类/物料/项目 const changeItemsType = () => { - formData.value.condition[1].Value = '' + formData.value.condition[0].Value = '' } // 选择重量/体积/面积 const changeCalculation = () => { @@ -994,7 +994,12 @@ const open = async (type: string, strategyCode: string, id?: number) => { 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' ) { + console.log(item.Value) + item.Value = item.Value.split(',') + } }) + } if (data.configuration) { formData.value.configuration = JSON.parse(data.configuration) @@ -1115,10 +1120,10 @@ const resetForm = () => { status: true, //状态 //规则条件集合 condition: [ - // 供应商 - { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, // 物料类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, + // 供应商 + { ParamCode: 'CustomerCode', Operator: 'IN', Value: '' }, // /重量/体积/面积 { ParamCode: 'Weight', Operator: '>', Value: [] }, // 库存状态 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index c1d18040e..56731bb9b 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -1174,6 +1174,11 @@ const open = async (type: string, strategyCode: string, id?: number) => { 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(',') + } + }) } console.log(formData.value.condition) From ee2d9d742db400d0ce44b67050b990c6a3b3ebec Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Wed, 13 Nov 2024 20:01:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMainOKHOLD/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index e0dd56649..631ea87b9 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -487,13 +487,13 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:`wms:${routeName.value}:close`}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:`wms:${routeName.value}:reAdd`}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:refused`}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:${routeName.value}:handle`}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3'])}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1'])}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:`wms:${routeName.value}:delete`}), // 删除 ] }