From bb749844fe77b497684133566fbb036fb0b0cbb4 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 16 Nov 2025 18:41:46 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90ele=E3=80=91=E3=80=90erp?= =?UTF-8?q?=E3=80=91stock=20=E7=9A=84=E8=BF=81=E7=A7=BB=EF=BC=88100%?= =?UTF-8?q?=EF=BC=89-=20move=E3=80=81out?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/erp/stock/move/data.ts | 2 +- apps/web-antd/src/views/erp/stock/out/data.ts | 2 +- apps/web-ele/src/views/erp/stock/move/index.vue | 13 ++++++++++++- apps/web-ele/src/views/erp/stock/out/index.vue | 13 ++++++++++++- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/apps/web-antd/src/views/erp/stock/move/data.ts b/apps/web-antd/src/views/erp/stock/move/data.ts index 74c2db117..89a148a17 100644 --- a/apps/web-antd/src/views/erp/stock/move/data.ts +++ b/apps/web-antd/src/views/erp/stock/move/data.ts @@ -307,7 +307,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { }, { title: '操作', - width: 220, + width: 260, fixed: 'right', slots: { default: 'actions' }, }, diff --git a/apps/web-antd/src/views/erp/stock/out/data.ts b/apps/web-antd/src/views/erp/stock/out/data.ts index 3fb67b704..4a2668d93 100644 --- a/apps/web-antd/src/views/erp/stock/out/data.ts +++ b/apps/web-antd/src/views/erp/stock/out/data.ts @@ -331,7 +331,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { }, { title: '操作', - width: 220, + width: 260, fixed: 'right', slots: { default: 'actions' }, }, diff --git a/apps/web-ele/src/views/erp/stock/move/index.vue b/apps/web-ele/src/views/erp/stock/move/index.vue index 67c91a326..c0a64812b 100644 --- a/apps/web-ele/src/views/erp/stock/move/index.vue +++ b/apps/web-ele/src/views/erp/stock/move/index.vue @@ -158,6 +158,17 @@ const [Grid, gridApi] = useVbenVxeGrid({ auth: ['erp:stock-move:export'], onClick: handleExport, }, + { + label: '批量删除', + type: 'danger', + disabled: isEmpty(checkedIds), + icon: ACTION_ICON.DELETE, + auth: ['erp:stock-move:delete'], + popConfirm: { + title: `是否删除所选中数据?`, + confirm: handleDelete.bind(null, checkedIds), + }, + }, ]" /> @@ -185,7 +196,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: row.status === 10 ? '审批' : '反审批', type: 'primary', link: true, - icon: row.status === 10 ? ACTION_ICON.AUDIT : ACTION_ICON.REJECT, + icon: ACTION_ICON.AUDIT, auth: ['erp:stock-move:update-status'], popConfirm: { title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗?`, diff --git a/apps/web-ele/src/views/erp/stock/out/index.vue b/apps/web-ele/src/views/erp/stock/out/index.vue index a44a8d93f..96c244e09 100644 --- a/apps/web-ele/src/views/erp/stock/out/index.vue +++ b/apps/web-ele/src/views/erp/stock/out/index.vue @@ -158,6 +158,17 @@ const [Grid, gridApi] = useVbenVxeGrid({ auth: ['erp:stock-out:export'], onClick: handleExport, }, + { + label: '批量删除', + type: 'danger', + disabled: isEmpty(checkedIds), + icon: ACTION_ICON.DELETE, + auth: ['erp:stock-out:delete'], + popConfirm: { + title: `是否删除所选中数据?`, + confirm: handleDelete.bind(null, checkedIds), + }, + }, ]" /> @@ -185,7 +196,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: row.status === 10 ? '审批' : '反审批', type: 'primary', link: true, - icon: row.status === 10 ? ACTION_ICON.AUDIT : ACTION_ICON.REJECT, + icon: ACTION_ICON.AUDIT, auth: ['erp:stock-out:update-status'], popConfirm: { title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗?`,