From 08446ec2c77e5675618cfec2c323efb1a7cfd30a Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 25 Jun 2024 10:04:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productputawayAssembleJobMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue index 109f6000b..af130fef1 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue @@ -159,7 +159,7 @@ const butttondata = (row,$index) => { defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 - defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 + // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] } From 826ca56b3de82d359e4a4b88e410fea1edf50c07 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 25 Jun 2024 10:15:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreceipt/productionreceiptJobMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue index 3b178cb82..feaba54ef 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue @@ -157,7 +157,7 @@ const butttondata = (row,$index) => { defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 - defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 + // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] } From d6d644af359ea4ea103fb068dcd62fe434b94693 Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 25 Jun 2024 11:12:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=A2=84=E8=AE=A1=E5=87=BA=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4api=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/expectout/index.ts | 5 +++++ src/views/wms/inventoryManage/expectout/index.vue | 1 + 2 files changed, 6 insertions(+) diff --git a/src/api/wms/expectout/index.ts b/src/api/wms/expectout/index.ts index 87868ace8..819320553 100644 --- a/src/api/wms/expectout/index.ts +++ b/src/api/wms/expectout/index.ts @@ -45,6 +45,11 @@ export const deleteExpectout = async (id: number) => { return await request.delete({ url: `/wms/expectout/delete?id=` + id }) } +// 批量删除预计出库存 +export const deleteExpectoutIds = async (ids: String) => { + return await request.delete({ url: `/wms/expectout/delete?ids=` + ids }) +} + // 导出预计出库存 Excel export const exportExpectout = async (params) => { if (params.isSearch) { diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue index 11c60c94b..1810539c6 100644 --- a/src/views/wms/inventoryManage/expectout/index.vue +++ b/src/views/wms/inventoryManage/expectout/index.vue @@ -132,6 +132,7 @@ const buttonBaseClick = (val, item) => { const butttondata = [ // defaultButtons.mainListEditBtn({hasPermi:'wms:expectout:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:expectout:delete'}), // 删除 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:expectout:deleteIds'}), // 批量删除 ] // 列表-操作按钮事件 From 15b8b46220b42f76c735910e77b344facea52195 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 25 Jun 2024 11:17:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/disposition/defaultButtons.ts | 13 ++++++ .../wms/inventoryManage/expectin/index.vue | 41 ++++++++++++++++- .../wms/inventoryManage/expectout/index.vue | 44 +++++++++++++++++-- 3 files changed, 92 insertions(+), 6 deletions(-) diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index d74160dc8..9faec3f8c 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -980,6 +980,19 @@ export function mainLisSelectiontPointBtn(option:any) { hasPermi: '' }) } +// 主列表-批量删除 +export function mainLisSelectiontDeleteBtn(option:any) { + return __defaultBtnOption(option,{ + label: t(`ts.批量删除`).replace('ts.', ''), + name: 'selection_delete', + hide: false, + type: 'primary', + icon: 'ep:download', + color: '', + float:'left', + hasPermi: '' + }) +} // 主列表-生成采购收货申请 export function mainListGenerateApplicationBtn(option:any) { return __defaultBtnOption(option,{ diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue index 42aafcfe4..b85574fd7 100644 --- a/src/views/wms/inventoryManage/expectin/index.vue +++ b/src/views/wms/inventoryManage/expectin/index.vue @@ -1,7 +1,7 @@