From 41583c5e419826425303584505e522cf133983f3 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 2 Sep 2025 23:16:28 +0800 Subject: [PATCH] =?UTF-8?q?review=EF=BC=9A=E3=80=90erp=20=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E3=80=91=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web-antd/src/api/erp/purchase/in/index.ts | 1 + apps/web-antd/src/api/erp/sale/order/index.ts | 1 - .../web-antd/src/api/erp/stock/check/index.ts | 2 +- .../src/views/crm/contact/modules/form.vue | 1 - .../src/views/crm/customer/modules/form.vue | 1 - .../src/views/crm/receivable/modules/form.vue | 1 - .../crm/receivable/plan/modules/form.vue | 1 - .../src/views/erp/finance/account/data.ts | 1 + .../erp/finance/account/modules/form.vue | 5 ++- .../erp/product/product/modules/form.vue | 1 - .../purchase/in/modules/purchase-in-form.vue | 12 +++---- .../in/modules/purchase-in-item-form.vue | 1 + .../in/modules/select-purchase-order-form.vue | 5 +-- .../in/modules/select-purchase-order-grid.vue | 1 + .../views/erp/purchase/order/modules/form.vue | 5 +-- .../modules/purchase-order-item-form.vue | 4 +-- .../return/modules/purchase-return-form.vue | 30 +++++++----------- .../modules/purchase-return-item-form.vue | 3 +- .../modules/select-purchase-order-form.vue | 5 +-- .../modules/select-purchase-order-grid.vue | 1 + .../src/views/erp/sale/customer/data.ts | 1 + .../views/erp/sale/customer/modules/form.vue | 1 - .../src/views/erp/sale/order/modules/form.vue | 4 +-- .../order/modules/sale-order-item-form.vue | 1 + .../erp/sale/out/modules/sale-out-form.vue | 7 ++--- .../sale/out/modules/sale-out-item-form.vue | 1 + .../out/modules/select-sale-order-form.vue | 5 +-- .../out/modules/select-sale-order-grid.vue | 1 + .../sale/return/modules/sale-return-form.vue | 31 ++++++++----------- .../return/modules/sale-return-item-form.vue | 1 + .../return/modules/select-sale-order-form.vue | 5 +-- .../return/modules/select-sale-order-grid.vue | 1 + .../views/erp/stock/check/modules/form.vue | 4 +-- .../check/modules/stock-check-item-form.vue | 5 +-- .../move/modules/stock-move-item-form.vue | 2 +- .../system/oauth2/client/modules/form.vue | 1 - .../src/views/system/tenant/modules/form.vue | 1 - .../src/views/system/user/modules/form.vue | 1 - 38 files changed, 70 insertions(+), 85 deletions(-) diff --git a/apps/web-antd/src/api/erp/purchase/in/index.ts b/apps/web-antd/src/api/erp/purchase/in/index.ts index 796645979..03b492a99 100644 --- a/apps/web-antd/src/api/erp/purchase/in/index.ts +++ b/apps/web-antd/src/api/erp/purchase/in/index.ts @@ -50,6 +50,7 @@ export namespace ErpPurchaseInApi { status?: number; } + // TODO @nehc：updatePurchaseInStatus 是不是需要？ /** 采购入库状态更新参数 */ export interface PurchaseInStatusParams { id: number; diff --git a/apps/web-antd/src/api/erp/sale/order/index.ts b/apps/web-antd/src/api/erp/sale/order/index.ts index 7bd9b4fad..37ce1be49 100644 --- a/apps/web-antd/src/api/erp/sale/order/index.ts +++ b/apps/web-antd/src/api/erp/sale/order/index.ts @@ -24,7 +24,6 @@ export namespace ErpSaleOrderApi { depositPrice?: number; // 定金金额，单位：元 items?: SaleOrderItem[]; // 销售订单产品明细列表 } - /** ERP 销售订单产品明细 */ export interface SaleOrderItem { id?: number; // 订单项编号 orderId?: number; // 采购订单编号 diff --git a/apps/web-antd/src/api/erp/stock/check/index.ts b/apps/web-antd/src/api/erp/stock/check/index.ts index 3c31a5e8f..60d581405 100644 --- a/apps/web-antd/src/api/erp/stock/check/index.ts +++ b/apps/web-antd/src/api/erp/stock/check/index.ts @@ -17,7 +17,6 @@ export namespace ErpStockCheckApi { creatorName?: string; // 创建人 items?: StockCheckItem[]; // 盘点产品清单 } - // 库存盘点单产品信息 export interface StockCheckItem { id?: number; // 编号 warehouseId?: number; // 仓库编号 @@ -33,6 +32,7 @@ export namespace ErpStockCheckApi { stockCount?: number; // 账面库存 remark?: string; // 备注 } + /** 库存盘点单分页查询参数 */ export interface StockCheckPageParams extends PageParam { no?: string; diff --git a/apps/web-antd/src/views/crm/contact/modules/form.vue b/apps/web-antd/src/views/crm/contact/modules/form.vue index 37c76d955..59aa15648 100644 --- a/apps/web-antd/src/views/crm/contact/modules/form.vue +++ b/apps/web-antd/src/views/crm/contact/modules/form.vue @@ -26,7 +26,6 @@ const [Form, formApi] = useVbenForm({ class: 'w-full', }, }, - // 一共2列 wrapperClass: 'grid-cols-2', layout: 'horizontal', schema: useFormSchema(), diff --git a/apps/web-antd/src/views/crm/customer/modules/form.vue b/apps/web-antd/src/views/crm/customer/modules/form.vue index ad13304db..06bdf3f34 100644 --- a/apps/web-antd/src/views/crm/customer/modules/form.vue +++ b/apps/web-antd/src/views/crm/customer/modules/form.vue @@ -30,7 +30,6 @@ const [Form, formApi] = useVbenForm({ class: 'w-full', }, }, - // 一共2列 wrapperClass: 'grid-cols-2', layout: 'horizontal', schema: useFormSchema(), diff --git a/apps/web-antd/src/views/crm/receivable/modules/form.vue b/apps/web-antd/src/views/crm/receivable/modules/form.vue index ce3dc4c3d..45313991e 100644 --- a/apps/web-antd/src/views/crm/receivable/modules/form.vue +++ b/apps/web-antd/src/views/crm/receivable/modules/form.vue @@ -30,7 +30,6 @@ const [Form, formApi] = useVbenForm({ class: 'w-full', }, }, - // 一共2列 wrapperClass: 'grid-cols-2', layout: 'horizontal', schema: useFormSchema(), diff --git a/apps/web-antd/src/views/crm/receivable/plan/modules/form.vue b/apps/web-antd/src/views/crm/receivable/plan/modules/form.vue index 229bff6c2..dcbd714d5 100644 --- a/apps/web-antd/src/views/crm/receivable/plan/modules/form.vue +++ b/apps/web-antd/src/views/crm/receivable/plan/modules/form.vue @@ -30,7 +30,6 @@ const [Form, formApi] = useVbenForm({ class: 'w-full', }, }, - // 一共2列 wrapperClass: 'grid-cols-2', layout: 'horizontal', schema: useFormSchema(), diff --git a/apps/web-antd/src/views/erp/finance/account/data.ts b/apps/web-antd/src/views/erp/finance/account/data.ts index dc11d945f..825b556f5 100644 --- a/apps/web-antd/src/views/erp/finance/account/data.ts +++ b/apps/web-antd/src/views/erp/finance/account/data.ts @@ -88,6 +88,7 @@ export function useFormSchema(): VbenFormSchema[] { ]; } +// TODO @xuzhiqiang：搜索的是不是缺了，placeholder /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { return [ diff --git a/apps/web-antd/src/views/erp/finance/account/modules/form.vue b/apps/web-antd/src/views/erp/finance/account/modules/form.vue index 9adcff6d1..d92a98c9c 100644 --- a/apps/web-antd/src/views/erp/finance/account/modules/form.vue +++ b/apps/web-antd/src/views/erp/finance/account/modules/form.vue @@ -21,8 +21,8 @@ const emit = defineEmits(['success']); const formData = ref(); const getTitle = computed(() => { return formData.value?.id - ? $t('ui.actionTitle.edit', ['结算产品']) - : $t('ui.actionTitle.create', ['结算产品']); + ? $t('ui.actionTitle.edit', ['结算账户']) + : $t('ui.actionTitle.create', ['结算账户']); }); const [Form, formApi] = useVbenForm({ @@ -31,7 +31,6 @@ const [Form, formApi] = useVbenForm({ class: 'w-full', }, }, - // 一共2列 wrapperClass: 'grid-cols-1', layout: 'horizontal', schema: useFormSchema(), diff --git a/apps/web-antd/src/views/erp/product/product/modules/form.vue b/apps/web-antd/src/views/erp/product/product/modules/form.vue index cbaf8072c..042a78c91 100644 --- a/apps/web-antd/src/views/erp/product/product/modules/form.vue +++ b/apps/web-antd/src/views/erp/product/product/modules/form.vue @@ -31,7 +31,6 @@ const [Form, formApi] = useVbenForm({ class: 'w-full', }, }, - // 一共2列 wrapperClass: 'grid-cols-2', layout: 'horizontal', schema: useFormSchema(), diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/purchase-in-form.vue b/apps/web-antd/src/views/erp/purchase/in/modules/purchase-in-form.vue index f86740fd9..8a4890cd5 100644 --- a/apps/web-antd/src/views/erp/purchase/in/modules/purchase-in-form.vue +++ b/apps/web-antd/src/views/erp/purchase/in/modules/purchase-in-form.vue @@ -78,12 +78,13 @@ const [Form, formApi] = useVbenForm({ }, }); +// TODO @XuZhiqiang 注释风格：使用 /** */ // 更新采购入库项 const handleUpdateItems = async (items: ErpPurchaseInApi.PurchaseInItem[]) => { if (formData.value) { const data = await formApi.getValues(); formData.value = { ...data, items }; - formApi.setValues(formData.value, false); + await formApi.setValues(formData.value, false); } }; @@ -125,10 +126,9 @@ watch( item.totalPrice = (item.totalProductPrice || 0) + (item.taxPrice || 0); }); // 计算总价 - const totalPrice = newItems.reduce((sum, item) => { + formData.value.totalPrice = newItems.reduce((sum, item) => { return sum + (item.totalProductPrice || 0) + (item.taxPrice || 0); }, 0); - formData.value.totalPrice = totalPrice; } else { formData.value.totalPrice = 0; } @@ -149,9 +149,7 @@ watch( { immediate: true }, ); -/** - * 创建或更新采购入库 - */ +/** 创建或更新采购入库 */ const [Modal, modalApi] = useVbenModal({ async onConfirm() { const { valid } = await formApi.validate(); @@ -221,7 +219,7 @@ const [Modal, modalApi] = useVbenModal({ otherPrice: 0, items: [], }; - formApi.setValues(formData.value, false); + await formApi.setValues(formData.value, false); return; } // 加载数据 diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/purchase-in-item-form.vue b/apps/web-antd/src/views/erp/purchase/in/modules/purchase-in-item-form.vue index 78a978eae..31c6f6d70 100644 --- a/apps/web-antd/src/views/erp/purchase/in/modules/purchase-in-item-form.vue +++ b/apps/web-antd/src/views/erp/purchase/in/modules/purchase-in-item-form.vue @@ -180,6 +180,7 @@ const init = (items: ErpPurchaseInApi.PurchaseInItem[] | undefined): void => { return newItem; }) : []; + // TODO @XuZhiqiang：使用 await 风格哈； nextTick(() => { gridApi.grid.reloadData(tableData.value); }); diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/select-purchase-order-form.vue b/apps/web-antd/src/views/erp/purchase/in/modules/select-purchase-order-form.vue index f02c79713..971c1ab17 100644 --- a/apps/web-antd/src/views/erp/purchase/in/modules/select-purchase-order-form.vue +++ b/apps/web-antd/src/views/erp/purchase/in/modules/select-purchase-order-form.vue @@ -24,8 +24,9 @@ const emit = defineEmits<{ }>(); const order = ref(); const open = ref(false); -const handleSelectOrder = (selectorder: ErpPurchaseOrderApi.PurchaseOrder) => { - order.value = selectorder; + +const handleSelectOrder = (selectOrder: ErpPurchaseOrderApi.PurchaseOrder) => { + order.value = selectOrder; }; const handleOk = () => { diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/select-purchase-order-grid.vue b/apps/web-antd/src/views/erp/purchase/in/modules/select-purchase-order-grid.vue index 4809eac80..25fdd9fb4 100644 --- a/apps/web-antd/src/views/erp/purchase/in/modules/select-purchase-order-grid.vue +++ b/apps/web-antd/src/views/erp/purchase/in/modules/select-purchase-order-grid.vue @@ -8,6 +8,7 @@ import { getPurchaseOrderPage } from '#/api/erp/purchase/order'; import { useOrderGridColumns, useOrderGridFormSchema } from '../data'; const emit = defineEmits(['selectRow']); + const [Grid] = useVbenVxeGrid({ formOptions: { schema: useOrderGridFormSchema(), diff --git a/apps/web-antd/src/views/erp/purchase/order/modules/form.vue b/apps/web-antd/src/views/erp/purchase/order/modules/form.vue index f6b69cfc9..cd3390503 100644 --- a/apps/web-antd/src/views/erp/purchase/order/modules/form.vue +++ b/apps/web-antd/src/views/erp/purchase/order/modules/form.vue @@ -71,10 +71,7 @@ const handleUpdateTotalPrice = (totalPrice: number) => { } }; -// TODO @nehc：这里的注释使用 /** */ 和别的模块一致哈； -/** - * 创建或更新采购订单 - */ +/** 创建或更新采购订单 */ const [Modal, modalApi] = useVbenModal({ async onConfirm() { const { valid } = await formApi.validate(); diff --git a/apps/web-antd/src/views/erp/purchase/order/modules/purchase-order-item-form.vue b/apps/web-antd/src/views/erp/purchase/order/modules/purchase-order-item-form.vue index 4202c34b4..0582cfc22 100644 --- a/apps/web-antd/src/views/erp/purchase/order/modules/purchase-order-item-form.vue +++ b/apps/web-antd/src/views/erp/purchase/order/modules/purchase-order-item-form.vue @@ -72,8 +72,7 @@ watch( await nextTick(); tableData.value = [...items]; await nextTick(); - // TODO @nehc：这里，是不是直接 await 下？ - gridApi.grid.reloadData(tableData.value); + await gridApi.grid.reloadData(tableData.value); }, { immediate: true, @@ -249,6 +248,7 @@ const init = ( return newItem; }) : []; + // TODO @XuZhiqiang: await 风格； nextTick(() => { gridApi.grid.reloadData(tableData.value); }); diff --git a/apps/web-antd/src/views/erp/purchase/return/modules/purchase-return-form.vue b/apps/web-antd/src/views/erp/purchase/return/modules/purchase-return-form.vue index 8b34a363f..4465eaec6 100644 --- a/apps/web-antd/src/views/erp/purchase/return/modules/purchase-return-form.vue +++ b/apps/web-antd/src/views/erp/purchase/return/modules/purchase-return-form.vue @@ -1,21 +1,17 @@