From 94a0c2e5812a8191a5cee2a273a898ff21902403 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 16 Nov 2025 19:10:11 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90ele=E3=80=91=E3=80=90erp?= =?UTF-8?q?=E3=80=91sale=20=E7=9A=84=E8=BF=81=E7=A7=BB=EF=BC=8830%?= =?UTF-8?q?=EF=BC=89-=20order?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/erp/sale/order/data.ts | 2 +- apps/web-antd/src/views/erp/sale/order/index.vue | 2 ++ apps/web-antd/src/views/erp/sale/out/data.ts | 2 +- apps/web-antd/src/views/erp/sale/out/index.vue | 2 ++ apps/web-antd/src/views/erp/sale/return/data.ts | 2 +- apps/web-antd/src/views/erp/sale/return/index.vue | 2 ++ apps/web-ele/src/views/erp/finance/payment/data.ts | 1 - apps/web-ele/src/views/erp/finance/receipt/data.ts | 1 - apps/web-ele/src/views/erp/sale/order/data.ts | 1 - apps/web-ele/src/views/erp/sale/order/index.vue | 2 +- apps/web-ele/src/views/erp/sale/out/data.ts | 1 - apps/web-ele/src/views/erp/sale/return/data.ts | 1 - apps/web-ele/src/views/erp/stock/check/data.ts | 1 - apps/web-ele/src/views/erp/stock/in/data.ts | 1 - apps/web-ele/src/views/erp/stock/move/data.ts | 1 - apps/web-ele/src/views/erp/stock/out/data.ts | 1 - 16 files changed, 10 insertions(+), 13 deletions(-) diff --git a/apps/web-antd/src/views/erp/sale/order/data.ts b/apps/web-antd/src/views/erp/sale/order/data.ts index 03f0686a1..0bc3f4649 100644 --- a/apps/web-antd/src/views/erp/sale/order/data.ts +++ b/apps/web-antd/src/views/erp/sale/order/data.ts @@ -448,7 +448,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/sale/order/index.vue b/apps/web-antd/src/views/erp/sale/order/index.vue index 4f85d4d16..f0fa24c08 100644 --- a/apps/web-antd/src/views/erp/sale/order/index.vue +++ b/apps/web-antd/src/views/erp/sale/order/index.vue @@ -196,6 +196,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ { label: row.status === 10 ? '审批' : '反审批', type: 'link', + icon: ACTION_ICON.AUDIT, auth: ['erp:sale-order: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:sale-order:delete'], popConfirm: { title: $t('ui.actionMessage.deleteConfirm', [row.no]), diff --git a/apps/web-antd/src/views/erp/sale/out/data.ts b/apps/web-antd/src/views/erp/sale/out/data.ts index 54e0f56d0..d567994bf 100644 --- a/apps/web-antd/src/views/erp/sale/out/data.ts +++ b/apps/web-antd/src/views/erp/sale/out/data.ts @@ -517,7 +517,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/sale/out/index.vue b/apps/web-antd/src/views/erp/sale/out/index.vue index 79c1c923a..06f21645b 100644 --- a/apps/web-antd/src/views/erp/sale/out/index.vue +++ b/apps/web-antd/src/views/erp/sale/out/index.vue @@ -193,6 +193,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ { label: row.status === 10 ? '审批' : '反审批', type: 'link', + icon: ACTION_ICON.AUDIT, auth: ['erp:sale-out: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:sale-out:delete'], popConfirm: { title: $t('ui.actionMessage.deleteConfirm', [row.no]), diff --git a/apps/web-antd/src/views/erp/sale/return/data.ts b/apps/web-antd/src/views/erp/sale/return/data.ts index 47540944f..a3390c872 100644 --- a/apps/web-antd/src/views/erp/sale/return/data.ts +++ b/apps/web-antd/src/views/erp/sale/return/data.ts @@ -504,7 +504,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/sale/return/index.vue b/apps/web-antd/src/views/erp/sale/return/index.vue index 3e874b429..9d63d0dd0 100644 --- a/apps/web-antd/src/views/erp/sale/return/index.vue +++ b/apps/web-antd/src/views/erp/sale/return/index.vue @@ -196,6 +196,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ { label: row.status === 10 ? '审批' : '反审批', type: 'link', + icon: ACTION_ICON.AUDIT, auth: ['erp:sale-return: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:sale-return:delete'], popConfirm: { title: $t('ui.actionMessage.deleteConfirm', [row.no]), diff --git a/apps/web-ele/src/views/erp/finance/payment/data.ts b/apps/web-ele/src/views/erp/finance/payment/data.ts index d51c1d087..f81f932ef 100644 --- a/apps/web-ele/src/views/erp/finance/payment/data.ts +++ b/apps/web-ele/src/views/erp/finance/payment/data.ts @@ -37,7 +37,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] { componentProps: { disabled: formType === 'detail', placeholder: '选择付款时间', - type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', class: '!w-full', diff --git a/apps/web-ele/src/views/erp/finance/receipt/data.ts b/apps/web-ele/src/views/erp/finance/receipt/data.ts index 28f23c400..de929dfd7 100644 --- a/apps/web-ele/src/views/erp/finance/receipt/data.ts +++ b/apps/web-ele/src/views/erp/finance/receipt/data.ts @@ -37,7 +37,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] { componentProps: { disabled: formType === 'detail', placeholder: '选择收款时间', - type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', class: '!w-full', diff --git a/apps/web-ele/src/views/erp/sale/order/data.ts b/apps/web-ele/src/views/erp/sale/order/data.ts index 36a472ff3..43c6bbc5b 100644 --- a/apps/web-ele/src/views/erp/sale/order/data.ts +++ b/apps/web-ele/src/views/erp/sale/order/data.ts @@ -38,7 +38,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] { component: 'DatePicker', componentProps: { placeholder: '选择订单时间', - showTime: true, format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', class: '!w-full', diff --git a/apps/web-ele/src/views/erp/sale/order/index.vue b/apps/web-ele/src/views/erp/sale/order/index.vue index 592078854..e681b8696 100644 --- a/apps/web-ele/src/views/erp/sale/order/index.vue +++ b/apps/web-ele/src/views/erp/sale/order/index.vue @@ -196,7 +196,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: row.status === 10 ? '审批' : '反审批', type: 'primary', link: true, - icon: row.status === 10 ? ACTION_ICON.CHECK : ACTION_ICON.CLOSE, + icon: ACTION_ICON.AUDIT, auth: ['erp:sale-order:update-status'], popConfirm: { title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`, diff --git a/apps/web-ele/src/views/erp/sale/out/data.ts b/apps/web-ele/src/views/erp/sale/out/data.ts index 824c14a46..8b53f113f 100644 --- a/apps/web-ele/src/views/erp/sale/out/data.ts +++ b/apps/web-ele/src/views/erp/sale/out/data.ts @@ -40,7 +40,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] { componentProps: { disabled: formType === 'detail', placeholder: '选择出库时间', - showTime: true, format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', class: '!w-full', diff --git a/apps/web-ele/src/views/erp/sale/return/data.ts b/apps/web-ele/src/views/erp/sale/return/data.ts index 36309ef51..b7729a921 100644 --- a/apps/web-ele/src/views/erp/sale/return/data.ts +++ b/apps/web-ele/src/views/erp/sale/return/data.ts @@ -40,7 +40,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] { componentProps: { disabled: formType === 'detail', placeholder: '选择退货时间', - showTime: true, format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', class: '!w-full', diff --git a/apps/web-ele/src/views/erp/stock/check/data.ts b/apps/web-ele/src/views/erp/stock/check/data.ts index 685e940ef..a3c4a3ad9 100644 --- a/apps/web-ele/src/views/erp/stock/check/data.ts +++ b/apps/web-ele/src/views/erp/stock/check/data.ts @@ -35,7 +35,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] { component: 'DatePicker', componentProps: { placeholder: '选择盘点时间', - showTime: true, format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', class: '!w-full', diff --git a/apps/web-ele/src/views/erp/stock/in/data.ts b/apps/web-ele/src/views/erp/stock/in/data.ts index caa252a4a..47ec60a76 100644 --- a/apps/web-ele/src/views/erp/stock/in/data.ts +++ b/apps/web-ele/src/views/erp/stock/in/data.ts @@ -36,7 +36,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] { component: 'DatePicker', componentProps: { placeholder: '选择入库时间', - showTime: true, format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', class: '!w-full', diff --git a/apps/web-ele/src/views/erp/stock/move/data.ts b/apps/web-ele/src/views/erp/stock/move/data.ts index 5830a7a8d..3bbbf24b6 100644 --- a/apps/web-ele/src/views/erp/stock/move/data.ts +++ b/apps/web-ele/src/views/erp/stock/move/data.ts @@ -35,7 +35,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] { component: 'DatePicker', componentProps: { placeholder: '选择调度时间', - showTime: true, format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', class: '!w-full', diff --git a/apps/web-ele/src/views/erp/stock/out/data.ts b/apps/web-ele/src/views/erp/stock/out/data.ts index 481e5ccbf..804c99758 100644 --- a/apps/web-ele/src/views/erp/stock/out/data.ts +++ b/apps/web-ele/src/views/erp/stock/out/data.ts @@ -36,7 +36,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] { component: 'DatePicker', componentProps: { placeholder: '选择出库时间', - showTime: true, format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', class: '!w-full',