From cb9aaa338c4f218b216da5f73848ade107c9c68c Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 16 Nov 2025 18:36:53 +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=8850%?= =?UTF-8?q?=EF=BC=89-=20in?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/erp/stock/check/index.vue | 2 ++ apps/web-antd/src/views/erp/stock/in/index.vue | 2 ++ apps/web-antd/src/views/erp/stock/move/index.vue | 2 ++ apps/web-antd/src/views/erp/stock/out/index.vue | 2 ++ apps/web-ele/src/views/erp/stock/check/index.vue | 2 +- .../src/views/erp/stock/check/modules/item-form.vue | 1 - apps/web-ele/src/views/erp/stock/in/index.vue | 13 ++++++++++++- .../src/views/erp/stock/in/modules/item-form.vue | 1 - .../src/views/erp/stock/move/modules/item-form.vue | 1 - .../src/views/erp/stock/out/modules/item-form.vue | 1 - 10 files changed, 21 insertions(+), 6 deletions(-) diff --git a/apps/web-antd/src/views/erp/stock/check/index.vue b/apps/web-antd/src/views/erp/stock/check/index.vue index de34ab122..3edef5eb3 100644 --- a/apps/web-antd/src/views/erp/stock/check/index.vue +++ b/apps/web-antd/src/views/erp/stock/check/index.vue @@ -196,6 +196,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ { label: row.status === 10 ? '审批' : '反审批', type: 'link', + icon: ACTION_ICON.AUDIT, auth: ['erp:stock-check:update-status'], popConfirm: { title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`, @@ -210,6 +211,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: $t('common.delete'), type: 'link', danger: true, + icon: ACTION_ICON.DELETE, auth: ['erp:stock-check:delete'], popConfirm: { title: $t('ui.actionMessage.deleteConfirm', [row.no]), diff --git a/apps/web-antd/src/views/erp/stock/in/index.vue b/apps/web-antd/src/views/erp/stock/in/index.vue index a7045c392..4b362c25f 100644 --- a/apps/web-antd/src/views/erp/stock/in/index.vue +++ b/apps/web-antd/src/views/erp/stock/in/index.vue @@ -193,6 +193,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ { label: row.status === 10 ? '审批' : '反审批', type: 'link', + icon: ACTION_ICON.AUDIT, auth: ['erp:stock-in:update-status'], popConfirm: { title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`, @@ -207,6 +208,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: $t('common.delete'), type: 'link', danger: true, + icon: ACTION_ICON.DELETE, auth: ['erp:stock-in:delete'], popConfirm: { title: $t('ui.actionMessage.deleteConfirm', [row.no]), diff --git a/apps/web-antd/src/views/erp/stock/move/index.vue b/apps/web-antd/src/views/erp/stock/move/index.vue index ee9b6177b..f5da612cd 100644 --- a/apps/web-antd/src/views/erp/stock/move/index.vue +++ b/apps/web-antd/src/views/erp/stock/move/index.vue @@ -196,6 +196,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ { label: row.status === 10 ? '审批' : '反审批', type: 'link', + icon: ACTION_ICON.AUDIT, auth: ['erp:stock-move:update-status'], popConfirm: { title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`, @@ -210,6 +211,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: $t('common.delete'), type: 'link', danger: true, + icon: ACTION_ICON.DELETE, auth: ['erp:stock-move:delete'], popConfirm: { title: $t('ui.actionMessage.deleteConfirm', [row.no]), diff --git a/apps/web-antd/src/views/erp/stock/out/index.vue b/apps/web-antd/src/views/erp/stock/out/index.vue index bcaa9cc26..8cd238561 100644 --- a/apps/web-antd/src/views/erp/stock/out/index.vue +++ b/apps/web-antd/src/views/erp/stock/out/index.vue @@ -196,6 +196,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ { label: row.status === 10 ? '审批' : '反审批', type: 'link', + icon: ACTION_ICON.AUDIT, auth: ['erp:stock-out:update-status'], popConfirm: { title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`, @@ -210,6 +211,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: $t('common.delete'), type: 'link', danger: true, + icon: ACTION_ICON.DELETE, auth: ['erp:stock-out:delete'], popConfirm: { title: $t('ui.actionMessage.deleteConfirm', [row.no]), diff --git a/apps/web-ele/src/views/erp/stock/check/index.vue b/apps/web-ele/src/views/erp/stock/check/index.vue index cbfe22f1b..144ab7619 100644 --- a/apps/web-ele/src/views/erp/stock/check/index.vue +++ b/apps/web-ele/src/views/erp/stock/check/index.vue @@ -196,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-check:update-status'], popConfirm: { title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`, diff --git a/apps/web-ele/src/views/erp/stock/check/modules/item-form.vue b/apps/web-ele/src/views/erp/stock/check/modules/item-form.vue index 010326580..0239140c5 100644 --- a/apps/web-ele/src/views/erp/stock/check/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/stock/check/modules/item-form.vue @@ -275,7 +275,6 @@ onMounted(async () => { label: '删除', type: 'danger', link: true, - icon: 'ant-design:delete-outlined', popConfirm: { title: '确认删除该产品吗？', confirm: handleDelete.bind(null, row), diff --git a/apps/web-ele/src/views/erp/stock/in/index.vue b/apps/web-ele/src/views/erp/stock/in/index.vue index e610753b1..4f6e1da26 100644 --- a/apps/web-ele/src/views/erp/stock/in/index.vue +++ b/apps/web-ele/src/views/erp/stock/in/index.vue @@ -155,6 +155,17 @@ const [Grid, gridApi] = useVbenVxeGrid({ auth: ['erp:stock-in:export'], onClick: handleExport, }, + { + label: '批量删除', + type: 'danger', + disabled: isEmpty(checkedIds), + icon: ACTION_ICON.DELETE, + auth: ['erp:stock-in:delete'], + popConfirm: { + title: `是否删除所选中数据？`, + confirm: handleDelete.bind(null, checkedIds), + }, + }, ]" /> @@ -182,7 +193,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-in:update-status'], popConfirm: { title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`, diff --git a/apps/web-ele/src/views/erp/stock/in/modules/item-form.vue b/apps/web-ele/src/views/erp/stock/in/modules/item-form.vue index b239ae826..5cda5f879 100644 --- a/apps/web-ele/src/views/erp/stock/in/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/stock/in/modules/item-form.vue @@ -264,7 +264,6 @@ onMounted(async () => { label: '删除', type: 'danger', link: true, - icon: 'ant-design:delete-outlined', popConfirm: { title: '确认删除该产品吗？', confirm: handleDelete.bind(null, row), diff --git a/apps/web-ele/src/views/erp/stock/move/modules/item-form.vue b/apps/web-ele/src/views/erp/stock/move/modules/item-form.vue index 3a06d56a1..4e94d1d44 100644 --- a/apps/web-ele/src/views/erp/stock/move/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/stock/move/modules/item-form.vue @@ -285,7 +285,6 @@ onMounted(async () => { label: '删除', type: 'danger', link: true, - icon: 'ant-design:delete-outlined', popConfirm: { title: '确认删除该产品吗？', confirm: handleDelete.bind(null, row), diff --git a/apps/web-ele/src/views/erp/stock/out/modules/item-form.vue b/apps/web-ele/src/views/erp/stock/out/modules/item-form.vue index 36c96a398..fb363f80f 100644 --- a/apps/web-ele/src/views/erp/stock/out/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/stock/out/modules/item-form.vue @@ -262,7 +262,6 @@ onMounted(async () => { label: '删除', type: 'danger', link: true, - icon: 'ant-design:delete-outlined', popConfirm: { title: '确认删除该产品吗？', confirm: handleDelete.bind(null, row),