From feb544270086d5e6827b7679a9fc8916a022cf9c Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 3 Dec 2024 14:58:35 +0800 Subject: [PATCH 1/4] FWHL-32 --- .../packagemergeMain/packagemergeMain.data.ts | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts index 03634b036..75aa7aa68 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts @@ -302,22 +302,26 @@ export const PackagemergeDetail = useCrudSchemas(reactive([ width: 150 }, }, - // { - // label: '从库存状态', - // field: 'fromInventoryStatus', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - // { - // label: '到库存状态', - // field: 'toInventoryStatus', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: '从库存状态', + field: 'fromInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + }, // { // label: '从器具号', // field: 'fromContainerNumber', From d241a12a86211a69387af853099ac69fb4698208 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 4 Dec 2024 10:01:21 +0800 Subject: [PATCH 2/4] FWHL-71 --- .../supplierdeliver/purchasePlanMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index bf4d22be7..1b906d432 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -435,7 +435,7 @@ const getSearchTableData = async (number,formField,searchField)=>{ { label: t('ts.创建供应商发货申请'), name: 'supplierdeliver', - hide: isShowMainButton(row, ['4']), + hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty Date: Wed, 4 Dec 2024 10:40:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 1b906d432..bc6f4a3ad 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -435,7 +435,8 @@ const getSearchTableData = async (number,formField,searchField)=>{ { label: t('ts.创建供应商发货申请'), name: 'supplierdeliver', - hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty Date: Wed, 4 Dec 2024 16:55:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index bc6f4a3ad..1b906d432 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -435,8 +435,7 @@ const getSearchTableData = async (number,formField,searchField)=>{ { label: t('ts.创建供应商发货申请'), name: 'supplierdeliver', - hide: isShowMainButton(row, ['4']), - // hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty