From 268a2d550427239bacea82ca35e094adbf287b13 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 16 Nov 2025 11:15:49 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90ele=E3=80=91=E3=80=90erp?= =?UTF-8?q?=E3=80=91finance/payment=20=E7=9A=84=E8=BF=81=E7=A7=BB=EF=BC=88?= =?UTF-8?q?80%=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/components/table-action/icons.ts | 1 + apps/web-antd/src/views/erp/finance/payment/data.ts | 2 +- apps/web-antd/src/views/erp/finance/payment/index.vue | 3 ++- .../src/views/erp/finance/payment/modules/form.vue | 1 + .../erp/finance/payment/modules/purchase-in-select.vue | 2 +- .../erp/finance/payment/modules/sale-return-select.vue | 2 +- apps/web-ele/src/components/table-action/icons.ts | 1 + apps/web-ele/src/views/erp/finance/payment/data.ts | 3 ++- apps/web-ele/src/views/erp/finance/payment/index.vue | 3 ++- .../src/views/erp/finance/payment/modules/form.vue | 1 + .../erp/finance/payment/modules/purchase-in-select.vue | 9 +++++---- .../erp/finance/payment/modules/sale-return-select.vue | 9 +++++---- 12 files changed, 23 insertions(+), 14 deletions(-) diff --git a/apps/web-antd/src/components/table-action/icons.ts b/apps/web-antd/src/components/table-action/icons.ts index d474a6a25..578265f4c 100644 --- a/apps/web-antd/src/components/table-action/icons.ts +++ b/apps/web-antd/src/components/table-action/icons.ts @@ -12,4 +12,5 @@ export const ACTION_ICON = { COPY: 'lucide:copy', CLOSE: 'lucide:x', BOOK: 'lucide:book', + AUDIT: 'lucide:file-check', }; diff --git a/apps/web-antd/src/views/erp/finance/payment/data.ts b/apps/web-antd/src/views/erp/finance/payment/data.ts index 804490eb7..206b1983e 100644 --- a/apps/web-antd/src/views/erp/finance/payment/data.ts +++ b/apps/web-antd/src/views/erp/finance/payment/data.ts @@ -385,7 +385,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/finance/payment/index.vue b/apps/web-antd/src/views/erp/finance/payment/index.vue index 7abf85a18..03c88b777 100644 --- a/apps/web-antd/src/views/erp/finance/payment/index.vue +++ b/apps/web-antd/src/views/erp/finance/payment/index.vue @@ -196,6 +196,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ { label: row.status === 10 ? '审批' : '反审批', type: 'link', + icon: ACTION_ICON.AUDIT, auth: ['erp:finance-payment:update-status'], popConfirm: { title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`, @@ -210,7 +211,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: $t('common.delete'), type: 'link', danger: true, - color: 'error', + icon: ACTION_ICON.DELETE, auth: ['erp:finance-payment:delete'], popConfirm: { title: $t('ui.actionMessage.deleteConfirm', [row.no]), diff --git a/apps/web-antd/src/views/erp/finance/payment/modules/form.vue b/apps/web-antd/src/views/erp/finance/payment/modules/form.vue index 5778dca0e..767bd13b2 100644 --- a/apps/web-antd/src/views/erp/finance/payment/modules/form.vue +++ b/apps/web-antd/src/views/erp/finance/payment/modules/form.vue @@ -187,6 +187,7 @@ const [Modal, modalApi] = useVbenModal({ @update:items="handleUpdateItems" @update:total-price="handleUpdateTotalPrice" @update:payment-price="handleUpdatePaymentPrice" + class="w-full" /> diff --git a/apps/web-antd/src/views/erp/finance/payment/modules/purchase-in-select.vue b/apps/web-antd/src/views/erp/finance/payment/modules/purchase-in-select.vue index 0aafa2fd2..ea4e118e8 100644 --- a/apps/web-antd/src/views/erp/finance/payment/modules/purchase-in-select.vue +++ b/apps/web-antd/src/views/erp/finance/payment/modules/purchase-in-select.vue @@ -15,7 +15,7 @@ const emit = defineEmits<{ success: [rows: ErpPurchaseInApi.PurchaseIn[]]; }>(); -const supplierId = ref(); // 供应商ID +const supplierId = ref(); // 供应商 ID const open = ref(false); // 弹窗是否打开 const selectedRows = ref([]); // 选中的行 diff --git a/apps/web-antd/src/views/erp/finance/payment/modules/sale-return-select.vue b/apps/web-antd/src/views/erp/finance/payment/modules/sale-return-select.vue index 28460d516..a68cb945c 100644 --- a/apps/web-antd/src/views/erp/finance/payment/modules/sale-return-select.vue +++ b/apps/web-antd/src/views/erp/finance/payment/modules/sale-return-select.vue @@ -15,7 +15,7 @@ const emit = defineEmits<{ success: [rows: ErpPurchaseReturnApi.PurchaseReturn[]]; }>(); -const supplierId = ref(); // 供应商ID +const supplierId = ref(); // 供应商 ID const open = ref(false); // 弹窗是否打开 const selectedRows = ref([]); // 选中的行 diff --git a/apps/web-ele/src/components/table-action/icons.ts b/apps/web-ele/src/components/table-action/icons.ts index e6722e155..f8e5e90a7 100644 --- a/apps/web-ele/src/components/table-action/icons.ts +++ b/apps/web-ele/src/components/table-action/icons.ts @@ -11,4 +11,5 @@ export const ACTION_ICON = { VIEW: 'lucide:eye', COPY: 'lucide:copy', BOOK: 'lucide:book', + AUDIT: 'lucide:file-check', }; 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 a396b2e26..d51c1d087 100644 --- a/apps/web-ele/src/views/erp/finance/payment/data.ts +++ b/apps/web-ele/src/views/erp/finance/payment/data.ts @@ -40,6 +40,7 @@ export function useFormSchema(formType: string): VbenFormSchema[] { type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', + class: '!w-full', }, rules: 'required', }, @@ -391,7 +392,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/finance/payment/index.vue b/apps/web-ele/src/views/erp/finance/payment/index.vue index 0eef9e0c9..5c6750bf2 100644 --- a/apps/web-ele/src/views/erp/finance/payment/index.vue +++ b/apps/web-ele/src/views/erp/finance/payment/index.vue @@ -196,6 +196,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: row.status === 10 ? '审批' : '反审批', type: 'primary', link: true, + icon: ACTION_ICON.AUDIT, auth: ['erp:finance-payment:update-status'], popConfirm: { title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`, @@ -210,7 +211,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: $t('common.delete'), type: 'danger', link: true, - color: 'error', + icon: ACTION_ICON.DELETE, auth: ['erp:finance-payment:delete'], popConfirm: { title: $t('ui.actionMessage.deleteConfirm', [row.no]), diff --git a/apps/web-ele/src/views/erp/finance/payment/modules/form.vue b/apps/web-ele/src/views/erp/finance/payment/modules/form.vue index 9611eebb1..fe8796e12 100644 --- a/apps/web-ele/src/views/erp/finance/payment/modules/form.vue +++ b/apps/web-ele/src/views/erp/finance/payment/modules/form.vue @@ -187,6 +187,7 @@ const [Modal, modalApi] = useVbenModal({ @update:items="handleUpdateItems" @update:total-price="handleUpdateTotalPrice" @update:payment-price="handleUpdatePaymentPrice" + class="w-full" /> diff --git a/apps/web-ele/src/views/erp/finance/payment/modules/purchase-in-select.vue b/apps/web-ele/src/views/erp/finance/payment/modules/purchase-in-select.vue index 76979c09d..8169157d7 100644 --- a/apps/web-ele/src/views/erp/finance/payment/modules/purchase-in-select.vue +++ b/apps/web-ele/src/views/erp/finance/payment/modules/purchase-in-select.vue @@ -4,7 +4,7 @@ import type { ErpPurchaseInApi } from '#/api/erp/purchase/in'; import { ref } from 'vue'; -import { ElDialog, ElMessage } from 'element-plus'; +import { ElButton, ElDialog, ElMessage } from 'element-plus'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getPurchaseInPage } from '#/api/erp/purchase/in'; @@ -15,7 +15,7 @@ const emit = defineEmits<{ success: [rows: ErpPurchaseInApi.PurchaseIn[]]; }>(); -const supplierId = ref(); // 供应商ID +const supplierId = ref(); // 供应商 ID const open = ref(false); // 弹窗是否打开 const selectedRows = ref([]); // 选中的行 @@ -99,14 +99,15 @@ defineExpose({ open: openModal }); v-model="open" title="选择采购入库单" @confirm="handleOk" + :append-to-body="true" > diff --git a/apps/web-ele/src/views/erp/finance/payment/modules/sale-return-select.vue b/apps/web-ele/src/views/erp/finance/payment/modules/sale-return-select.vue index c65c506d6..ec57fd5cc 100644 --- a/apps/web-ele/src/views/erp/finance/payment/modules/sale-return-select.vue +++ b/apps/web-ele/src/views/erp/finance/payment/modules/sale-return-select.vue @@ -4,7 +4,7 @@ import type { ErpPurchaseReturnApi } from '#/api/erp/purchase/return'; import { ref } from 'vue'; -import { ElDialog, ElMessage } from 'element-plus'; +import { ElButton, ElDialog, ElMessage } from 'element-plus'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getPurchaseReturnPage } from '#/api/erp/purchase/return'; @@ -15,7 +15,7 @@ const emit = defineEmits<{ success: [rows: ErpPurchaseReturnApi.PurchaseReturn[]]; }>(); -const supplierId = ref(); // 供应商ID +const supplierId = ref(); // 供应商 ID const open = ref(false); // 弹窗是否打开 const selectedRows = ref([]); // 选中的行 @@ -103,14 +103,15 @@ defineExpose({ open: openModal }); v-model="open" title="选择采购退货单" @confirm="handleOk" + :append-to-body="true" >