diff --git a/apps/web-antd/src/adapter/vxe-table.ts b/apps/web-antd/src/adapter/vxe-table.ts
index 96c85d1296e2e4c28dc5d789953fe31b027f7e43..7fe8876455d0f0753a5b2c353221bd7c84c0e49d 100644
--- a/apps/web-antd/src/adapter/vxe-table.ts
+++ b/apps/web-antd/src/adapter/vxe-table.ts
@@ -332,22 +332,22 @@ setupVbenVxeTable({
       },
     });
 
-    // add by 星语：数量格式化，例如说：金额
-    vxeUI.formats.add('formatNumber', {
+    // add by 星语：数量格式化，保留 3 位
+    vxeUI.formats.add('formatAmount3', {
       tableCellFormatMethod({ cellValue }) {
         return erpCountInputFormatter(cellValue);
       },
     });
-
+    // add by 星语：数量格式化，保留 2 位
     vxeUI.formats.add('formatAmount2', {
       tableCellFormatMethod({ cellValue }, digits = 2) {
-        return `${erpNumberFormatter(cellValue, digits)}元`;
+        return `${erpNumberFormatter(cellValue, digits)}`;
       },
     });
 
     vxeUI.formats.add('formatFenToYuanAmount', {
       tableCellFormatMethod({ cellValue }, digits = 2) {
-        return `${erpNumberFormatter(fenToYuan(cellValue), digits)}元`;
+        return `${erpNumberFormatter(fenToYuan(cellValue), digits)}`;
       },
     });
   },
diff --git a/apps/web-antd/src/api/erp/finance/payment/index.ts b/apps/web-antd/src/api/erp/finance/payment/index.ts
index e9dc1847a650d499cccb2ba01a7b9b907c210c4f..e87abfe16a29072e179c7acd9b379b8fd7b5002f 100644
--- a/apps/web-antd/src/api/erp/finance/payment/index.ts
+++ b/apps/web-antd/src/api/erp/finance/payment/index.ts
@@ -3,34 +3,57 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 namespace ErpFinancePaymentApi {
+  /** 付款单项 */
+  export interface FinancePaymentItem {
+    id?: number;
+    row_id?: number; // 前端使用的临时ID
+    bizId: number; // 业务ID
+    bizType: number; // 业务类型
+    bizNo: string; // 业务编号
+    totalPrice: number; // 应付金额
+    paidPrice: number; // 已付金额
+    paymentPrice: number; // 本次付款
+    remark?: string; // 备注
+  }
+
   /** 付款单信息 */
   export interface FinancePayment {
     id?: number; // 付款单编号
     no: string; // 付款单号
     supplierId: number; // 供应商编号
+    supplierName?: string; // 供应商名称
     paymentTime: Date; // 付款时间
     totalPrice: number; // 合计金额，单位：元
+    discountPrice: number; // 优惠金额
+    paymentPrice: number; // 实际付款金额
     status: number; // 状态
     remark: string; // 备注
+    fileUrl?: string; // 附件
+    accountId?: number; // 付款账户
+    accountName?: string; // 账户名称
+    financeUserId?: number; // 财务人员
+    financeUserName?: string; // 财务人员姓名
+    creator?: string; // 创建人
+    creatorName?: string; // 创建人姓名
+    items?: FinancePaymentItem[]; // 付款明细
+    bizNo?: string; // 业务单号
   }
 
   /** 付款单分页查询参数 */
   export interface FinancePaymentPageParams extends PageParam {
     no?: string;
+    paymentTime?: [string, string];
     supplierId?: number;
+    creator?: string;
+    financeUserId?: number;
+    accountId?: number;
     status?: number;
-  }
-
-  /** 付款单状态更新参数 */
-  export interface FinancePaymentStatusParams {
-    id: number;
-    status: number;
+    remark?: string;
+    bizNo?: string;
   }
 }
 
-/**
- * 查询付款单分页
- */
+/** 查询付款单分页 */
 export function getFinancePaymentPage(
   params: ErpFinancePaymentApi.FinancePaymentPageParams,
 ) {
@@ -42,47 +65,35 @@ export function getFinancePaymentPage(
   );
 }
 
-/**
- * 查询付款单详情
- */
+/** 查询付款单详情 */
 export function getFinancePayment(id: number) {
   return requestClient.get<ErpFinancePaymentApi.FinancePayment>(
     `/erp/finance-payment/get?id=${id}`,
   );
 }
 
-/**
- * 新增付款单
- */
+/** 新增付款单 */
 export function createFinancePayment(
   data: ErpFinancePaymentApi.FinancePayment,
 ) {
   return requestClient.post('/erp/finance-payment/create', data);
 }
 
-/**
- * 修改付款单
- */
+/** 修改付款单 */
 export function updateFinancePayment(
   data: ErpFinancePaymentApi.FinancePayment,
 ) {
   return requestClient.put('/erp/finance-payment/update', data);
 }
 
-/**
- * 更新付款单的状态
- */
-export function updateFinancePaymentStatus(
-  params: ErpFinancePaymentApi.FinancePaymentStatusParams,
-) {
+/** 更新付款单的状态 */
+export function updateFinancePaymentStatus(id: number, status: number) {
   return requestClient.put('/erp/finance-payment/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 
-/**
- * 删除付款单
- */
+/** 删除付款单 */
 export function deleteFinancePayment(ids: number[]) {
   return requestClient.delete('/erp/finance-payment/delete', {
     params: {
@@ -91,9 +102,7 @@ export function deleteFinancePayment(ids: number[]) {
   });
 }
 
-/**
- * 导出付款单 Excel
- */
+/** 导出付款单 Excel */
 export function exportFinancePayment(
   params: ErpFinancePaymentApi.FinancePaymentPageParams,
 ) {
diff --git a/apps/web-antd/src/api/erp/finance/receipt/index.ts b/apps/web-antd/src/api/erp/finance/receipt/index.ts
index 37b70e764977843f4a8a1ad0bb7fcd45e536f372..a02f8c5e8639fb7e0e462e6eeff81aaa4f79cbe1 100644
--- a/apps/web-antd/src/api/erp/finance/receipt/index.ts
+++ b/apps/web-antd/src/api/erp/finance/receipt/index.ts
@@ -3,34 +3,57 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 namespace ErpFinanceReceiptApi {
+  /** 收款单项 */
+  export interface FinanceReceiptItem {
+    id?: number;
+    row_id?: number; // 前端使用的临时ID
+    bizId: number; // 业务ID
+    bizType: number; // 业务类型
+    bizNo: string; // 业务编号
+    totalPrice: number; // 应收金额
+    receiptedPrice: number; // 已收金额
+    receiptPrice: number; // 本次收款
+    remark?: string; // 备注
+  }
+
   /** 收款单信息 */
   export interface FinanceReceipt {
     id?: number; // 收款单编号
     no: string; // 收款单号
     customerId: number; // 客户编号
+    customerName?: string; // 客户名称
     receiptTime: Date; // 收款时间
     totalPrice: number; // 合计金额，单位：元
+    discountPrice: number; // 优惠金额
+    receiptPrice: number; // 实际收款金额
     status: number; // 状态
     remark: string; // 备注
+    fileUrl?: string; // 附件
+    accountId?: number; // 收款账户
+    accountName?: string; // 账户名称
+    financeUserId?: number; // 财务人员
+    financeUserName?: string; // 财务人员姓名
+    creator?: string; // 创建人
+    creatorName?: string; // 创建人姓名
+    items?: FinanceReceiptItem[]; // 收款明细
+    bizNo?: string; // 业务单号
   }
 
   /** 收款单分页查询参数 */
   export interface FinanceReceiptPageParams extends PageParam {
     no?: string;
+    receiptTime?: [string, string];
     customerId?: number;
+    creator?: string;
+    financeUserId?: number;
+    accountId?: number;
     status?: number;
-  }
-
-  /** 收款单状态更新参数 */
-  export interface FinanceReceiptStatusParams {
-    id: number;
-    status: number;
+    remark?: string;
+    bizNo?: string;
   }
 }
 
-/**
- * 查询收款单分页
- */
+/** 查询收款单分页 */
 export function getFinanceReceiptPage(
   params: ErpFinanceReceiptApi.FinanceReceiptPageParams,
 ) {
@@ -42,47 +65,35 @@ export function getFinanceReceiptPage(
   );
 }
 
-/**
- * 查询收款单详情
- */
+/** 查询收款单详情 */
 export function getFinanceReceipt(id: number) {
   return requestClient.get<ErpFinanceReceiptApi.FinanceReceipt>(
     `/erp/finance-receipt/get?id=${id}`,
   );
 }
 
-/**
- * 新增收款单
- */
+/** 新增收款单 */
 export function createFinanceReceipt(
   data: ErpFinanceReceiptApi.FinanceReceipt,
 ) {
   return requestClient.post('/erp/finance-receipt/create', data);
 }
 
-/**
- * 修改收款单
- */
+/** 修改收款单 */
 export function updateFinanceReceipt(
   data: ErpFinanceReceiptApi.FinanceReceipt,
 ) {
   return requestClient.put('/erp/finance-receipt/update', data);
 }
 
-/**
- * 更新收款单的状态
- */
-export function updateFinanceReceiptStatus(
-  params: ErpFinanceReceiptApi.FinanceReceiptStatusParams,
-) {
+/** 更新收款单的状态 */
+export function updateFinanceReceiptStatus(id: number, status: number) {
   return requestClient.put('/erp/finance-receipt/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 
-/**
- * 删除收款单
- */
+/** 删除收款单 */
 export function deleteFinanceReceipt(ids: number[]) {
   return requestClient.delete('/erp/finance-receipt/delete', {
     params: {
@@ -91,9 +102,7 @@ export function deleteFinanceReceipt(ids: number[]) {
   });
 }
 
-/**
- * 导出收款单 Excel
- */
+/** 导出收款单 Excel */
 export function exportFinanceReceipt(
   params: ErpFinanceReceiptApi.FinanceReceiptPageParams,
 ) {
diff --git a/apps/web-antd/src/api/erp/product/category/index.ts b/apps/web-antd/src/api/erp/product/category/index.ts
index 74e5465c19acf1f12aacfcf7a9185b327f8d2609..87c85531907ba9dd6930ed6268abba7527120827 100644
--- a/apps/web-antd/src/api/erp/product/category/index.ts
+++ b/apps/web-antd/src/api/erp/product/category/index.ts
@@ -14,9 +14,10 @@ export namespace ErpProductCategoryApi {
 }
 
 /** 查询产品分类列表 */
-export function getProductCategoryList() {
+export function getProductCategoryList(params?: any) {
   return requestClient.get<ErpProductCategoryApi.ProductCategory[]>(
     '/erp/product-category/list',
+    { params },
   );
 }
 
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 03b492a99844ed94c6fd9fd57073abb15620eb39..f807e2800a779b239ab240609768457a3be5e2e7 100644
--- a/apps/web-antd/src/api/erp/purchase/in/index.ts
+++ b/apps/web-antd/src/api/erp/purchase/in/index.ts
@@ -49,13 +49,6 @@ export namespace ErpPurchaseInApi {
     supplierId?: number;
     status?: number;
   }
-
-  // TODO @nehc：updatePurchaseInStatus 是不是需要？
-  /** 采购入库状态更新参数 */
-  export interface PurchaseInStatusParams {
-    id: number;
-    status: number;
-  }
 }
 
 /**
diff --git a/apps/web-antd/src/api/erp/purchase/order/index.ts b/apps/web-antd/src/api/erp/purchase/order/index.ts
index ec08dc179624a984dc1596ca9ff401b3aa2f4a85..e2cc7a214c6a16a50accc8ef9ea12ade62c7122a 100644
--- a/apps/web-antd/src/api/erp/purchase/order/index.ts
+++ b/apps/web-antd/src/api/erp/purchase/order/index.ts
@@ -100,12 +100,7 @@ export function updatePurchaseOrderStatus(id: number, status: number) {
 }
 
 /** 删除采购订单 */
-export function deletePurchaseOrder(id: number) {
-  return requestClient.delete(`/erp/purchase-order/delete?id=${id}`);
-}
-
-/** 批量删除采购订单 */
-export function deletePurchaseOrderList(ids: number[]) {
+export function deletePurchaseOrder(ids: number[]) {
   return requestClient.delete('/erp/purchase-order/delete', {
     params: { ids: ids.join(',') },
   });
diff --git a/apps/web-antd/src/api/erp/purchase/return/index.ts b/apps/web-antd/src/api/erp/purchase/return/index.ts
index 86423c46fc943e275fae9ca9b089037cc9c89add..4114f1908f29cff7382a1ef423dbbce44e781d50 100644
--- a/apps/web-antd/src/api/erp/purchase/return/index.ts
+++ b/apps/web-antd/src/api/erp/purchase/return/index.ts
@@ -96,11 +96,9 @@ export function updatePurchaseReturn(
 /**
  * 更新采购退货的状态
  */
-export function updatePurchaseReturnStatus(
-  params: ErpPurchaseReturnApi.PurchaseReturnStatusParams,
-) {
+export function updatePurchaseReturnStatus(id: number, status: number) {
   return requestClient.put('/erp/purchase-return/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 
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 37ce1be49ece0f2497fa10ba23cadb4c928bd520..6aff41d82d947556d27453abd4b67a61d1f67b84 100644
--- a/apps/web-antd/src/api/erp/sale/order/index.ts
+++ b/apps/web-antd/src/api/erp/sale/order/index.ts
@@ -24,6 +24,7 @@ export namespace ErpSaleOrderApi {
     depositPrice?: number; // 定金金额，单位：元
     items?: SaleOrderItem[]; // 销售订单产品明细列表
   }
+
   export interface SaleOrderItem {
     id?: number; // 订单项编号
     orderId?: number; // 采购订单编号
@@ -66,6 +67,13 @@ export function getSaleOrder(id: number) {
   );
 }
 
+/** 查询销售订单项列表 */
+export function getSaleOrderItemListByOrderId(orderId: number) {
+  return requestClient.get<ErpSaleOrderApi.SaleOrderItem[]>(
+    `/erp/sale-order/item/list-by-order-id?orderId=${orderId}`,
+  );
+}
+
 /** 新增销售订单 */
 export function createSaleOrder(data: ErpSaleOrderApi.SaleOrder) {
   return requestClient.post('/erp/sale-order/create', data);
diff --git a/apps/web-antd/src/api/erp/sale/out/index.ts b/apps/web-antd/src/api/erp/sale/out/index.ts
index dc4f5d05f31accb8db9a24c2e32347999f67e694..d78a91bafad4f04fe0ff302d94062d132703d37a 100644
--- a/apps/web-antd/src/api/erp/sale/out/index.ts
+++ b/apps/web-antd/src/api/erp/sale/out/index.ts
@@ -23,6 +23,7 @@ export namespace ErpSaleOutApi {
     fileUrl?: string; // 附件地址
     items?: SaleOutItem[];
   }
+
   export interface SaleOutItem {
     count?: number;
     id?: number;
@@ -49,17 +50,9 @@ export namespace ErpSaleOutApi {
     customerId?: number;
     status?: number;
   }
-
-  /** 销售出库状态更新参数 */
-  export interface SaleOutStatusParams {
-    id: number;
-    status: number;
-  }
 }
 
-/**
- * 查询销售出库分页
- */
+/** 查询销售出库分页 */
 export function getSaleOutPage(params: ErpSaleOutApi.SaleOutPageParams) {
   return requestClient.get<PageResult<ErpSaleOutApi.SaleOut>>(
     '/erp/sale-out/page',
@@ -69,39 +62,29 @@ export function getSaleOutPage(params: ErpSaleOutApi.SaleOutPageParams) {
   );
 }
 
-/**
- * 查询销售出库详情
- */
+/** 查询销售出库详情 */
 export function getSaleOut(id: number) {
   return requestClient.get<ErpSaleOutApi.SaleOut>(`/erp/sale-out/get?id=${id}`);
 }
 
-/**
- * 新增销售出库
- */
+/** 新增销售出库 */
 export function createSaleOut(data: ErpSaleOutApi.SaleOut) {
   return requestClient.post('/erp/sale-out/create', data);
 }
 
-/**
- * 修改销售出库
- */
+/** 修改销售出库 */
 export function updateSaleOut(data: ErpSaleOutApi.SaleOut) {
   return requestClient.put('/erp/sale-out/update', data);
 }
 
-/**
- * 更新销售出库的状态
- */
-export function updateSaleOutStatus(params: ErpSaleOutApi.SaleOutStatusParams) {
+/** 更新销售出库的状态 */
+export function updateSaleOutStatus(id: number, status: number) {
   return requestClient.put('/erp/sale-out/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 
-/**
- * 删除销售出库
- */
+/** 删除销售出库 */
 export function deleteSaleOut(ids: number[]) {
   return requestClient.delete('/erp/sale-out/delete', {
     params: {
@@ -110,9 +93,7 @@ export function deleteSaleOut(ids: number[]) {
   });
 }
 
-/**
- * 导出销售出库 Excel
- */
+/** 导出销售出库 Excel */
 export function exportSaleOut(params: ErpSaleOutApi.SaleOutPageParams) {
   return requestClient.download('/erp/sale-out/export-excel', {
     params,
diff --git a/apps/web-antd/src/api/erp/sale/return/index.ts b/apps/web-antd/src/api/erp/sale/return/index.ts
index 91057f4df0c6695354aa4a144c1ab534fc187189..adc718cc3ca6a85b70ddcd7f55777024f6578b31 100644
--- a/apps/web-antd/src/api/erp/sale/return/index.ts
+++ b/apps/web-antd/src/api/erp/sale/return/index.ts
@@ -22,6 +22,7 @@ export namespace ErpSaleReturnApi {
     fileUrl?: string; // 附件地址
     items?: SaleReturnItem[];
   }
+
   export interface SaleReturnItem {
     count?: number;
     id?: number;
@@ -48,12 +49,6 @@ export namespace ErpSaleReturnApi {
     customerId?: number;
     status?: number;
   }
-
-  /** 销售退货状态更新参数 */
-  export interface SaleReturnStatusParams {
-    id: number;
-    status: number;
-  }
 }
 
 /**
@@ -96,11 +91,9 @@ export function updateSaleReturn(data: ErpSaleReturnApi.SaleReturn) {
 /**
  * 更新销售退货的状态
  */
-export function updateSaleReturnStatus(
-  params: ErpSaleReturnApi.SaleReturnStatusParams,
-) {
+export function updateSaleReturnStatus(id: number, status: number) {
   return requestClient.put('/erp/sale-return/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 
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 60d581405398370459c5701f4dcfd5c112852988..386948432842048f7ec7deb813f30ac038743667 100644
--- a/apps/web-antd/src/api/erp/stock/check/index.ts
+++ b/apps/web-antd/src/api/erp/stock/check/index.ts
@@ -17,6 +17,7 @@ export namespace ErpStockCheckApi {
     creatorName?: string; // 创建人
     items?: StockCheckItem[]; // 盘点产品清单
   }
+
   export interface StockCheckItem {
     id?: number; // 编号
     warehouseId?: number; // 仓库编号
@@ -38,12 +39,6 @@ export namespace ErpStockCheckApi {
     no?: string;
     status?: number;
   }
-
-  /** 库存盘点单状态更新参数 */
-  export interface StockCheckStatusParams {
-    id: number;
-    status: number;
-  }
 }
 
 /**
@@ -86,11 +81,9 @@ export function updateStockCheck(data: ErpStockCheckApi.StockCheck) {
 /**
  * 更新库存盘点单的状态
  */
-export function updateStockCheckStatus(
-  params: ErpStockCheckApi.StockCheckStatusParams,
-) {
+export function updateStockCheckStatus(id: number, status: number) {
   return requestClient.put('/erp/stock-check/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 
diff --git a/apps/web-antd/src/api/erp/stock/in/index.ts b/apps/web-antd/src/api/erp/stock/in/index.ts
index 8fe9bafd487869adaa21d748f0586d5fee1b352d..18e1093145a57cc51f1e87b8ce10b45afaf96735 100644
--- a/apps/web-antd/src/api/erp/stock/in/index.ts
+++ b/apps/web-antd/src/api/erp/stock/in/index.ts
@@ -42,12 +42,6 @@ export namespace ErpStockInApi {
     supplierId?: number;
     status?: number;
   }
-
-  /** 其它入库单状态更新参数 */
-  export interface StockInStatusParams {
-    id: number;
-    status: number;
-  }
 }
 
 /**
@@ -86,9 +80,9 @@ export function updateStockIn(data: ErpStockInApi.StockIn) {
 /**
  * 更新其它入库单的状态
  */
-export function updateStockInStatus(params: ErpStockInApi.StockInStatusParams) {
+export function updateStockInStatus(id: number, status: number) {
   return requestClient.put('/erp/stock-in/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 
diff --git a/apps/web-antd/src/api/erp/stock/move/index.ts b/apps/web-antd/src/api/erp/stock/move/index.ts
index 33e49f29923235591efdc62f55ca3e4c4d2c74b4..409ca8f64e7dc24ed9dcf21ed4853325610a4566 100644
--- a/apps/web-antd/src/api/erp/stock/move/index.ts
+++ b/apps/web-antd/src/api/erp/stock/move/index.ts
@@ -43,13 +43,6 @@ export namespace ErpStockMoveApi {
     status?: number;
   }
 
-  /** 库存调拨单状态更新参数 */
-  export interface StockMoveStatusParams {
-    id: number;
-    status: number;
-  }
-}
-
 /**
  * 查询库存调拨单分页
  */
@@ -88,11 +81,9 @@ export function updateStockMove(data: ErpStockMoveApi.StockMove) {
 /**
  * 更新库存调拨单的状态
  */
-export function updateStockMoveStatus(
-  params: ErpStockMoveApi.StockMoveStatusParams,
-) {
+export function updateStockMoveStatus(id: number, status: number) {
   return requestClient.put('/erp/stock-move/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 
diff --git a/apps/web-antd/src/api/erp/stock/out/index.ts b/apps/web-antd/src/api/erp/stock/out/index.ts
index a3873f94841c62ec7b3b5a9f38db035a7beb6656..2f64ff8676f322443bc091e1393d9c1b2b08eaa5 100644
--- a/apps/web-antd/src/api/erp/stock/out/index.ts
+++ b/apps/web-antd/src/api/erp/stock/out/index.ts
@@ -39,12 +39,6 @@ export namespace ErpStockOutApi {
     customerId?: number;
     status?: number;
   }
-
-  /** 其它出库单状态更新参数 */
-  export interface StockOutStatusParams {
-    id: number;
-    status: number;
-  }
 }
 
 /**
@@ -85,11 +79,9 @@ export function updateStockOut(data: ErpStockOutApi.StockOut) {
 /**
  * 更新其它出库单的状态
  */
-export function updateStockOutStatus(
-  params: ErpStockOutApi.StockOutStatusParams,
-) {
+export function updateStockOutStatus(id: number, status: number) {
   return requestClient.put('/erp/stock-out/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 
diff --git a/apps/web-antd/src/api/pay/app/index.ts b/apps/web-antd/src/api/pay/app/index.ts
index 53f676742b5a15341b4a062bd25974198ae1033a..081c7aa77defe18ae1d25d338424c5ece1d91b31 100644
--- a/apps/web-antd/src/api/pay/app/index.ts
+++ b/apps/web-antd/src/api/pay/app/index.ts
@@ -16,7 +16,7 @@ export namespace PayAppApi {
     merchantId: number;
     merchantName: string;
     createTime?: Date;
-    channelCodes: string[];
+    channelCodes?: string[];
   }
 
   /** 更新状态请求 */
@@ -25,20 +25,16 @@ export namespace PayAppApi {
     status: number;
   }
 
-  export interface AppPageReq extends PageParam {
+  export interface AppPageReqVO extends PageParam {
     name?: string;
+    appKey?: string;
     status?: number;
-    remark?: string;
-    payNotifyUrl?: string;
-    refundNotifyUrl?: string;
-    transferNotifyUrl?: string;
-    merchantName?: string;
     createTime?: Date[];
   }
 }
 
 /** 查询支付应用列表 */
-export function getAppPage(params: PayAppApi.AppPageReq) {
+export function getAppPage(params: PayAppApi.AppPageReqVO) {
   return requestClient.get<PageResult<PayAppApi.App>>('/pay/app/page', {
     params,
   });
@@ -60,7 +56,7 @@ export function updateApp(data: PayAppApi.App) {
 }
 
 /** 修改支付应用状态 */
-export function changeAppStatus(data: PayAppApi.UpdateStatusReq) {
+export function updateAppStatus(data: PayAppApi.UpdateStatusReq) {
   return requestClient.put('/pay/app/update-status', data);
 }
 
diff --git a/apps/web-antd/src/api/pay/demo/order/index.ts b/apps/web-antd/src/api/pay/demo/order/index.ts
index 63cb1396d8fa92e107450553b6cb691e534abfed..2623510593383e80a41b35153cd71cfb01623c29 100644
--- a/apps/web-antd/src/api/pay/demo/order/index.ts
+++ b/apps/web-antd/src/api/pay/demo/order/index.ts
@@ -20,7 +20,7 @@ export namespace DemoOrderApi {
     createTime?: Date;
   }
 
-  export interface OrderPageReq extends PageParam {
+  export interface OrderPageReqVO extends PageParam {
     spuId?: number;
     createTime?: Date[];
   }
@@ -32,7 +32,7 @@ export function createDemoOrder(data: DemoOrderApi.Order) {
 }
 
 /** 获得示例订单分页 */
-export function getDemoOrderPage(params: DemoOrderApi.OrderPageReq) {
+export function getDemoOrderPage(params: DemoOrderApi.OrderPageReqVO) {
   return requestClient.get<PageResult<DemoOrderApi.Order>>(
     '/pay/demo-order/page',
     {
diff --git a/apps/web-antd/src/api/pay/notify/index.ts b/apps/web-antd/src/api/pay/notify/index.ts
index b0b916ccb2ca18df68d20c61be3778b03baa599e..fe18ac03bdf873d01eed24372c41aacfc3311089 100644
--- a/apps/web-antd/src/api/pay/notify/index.ts
+++ b/apps/web-antd/src/api/pay/notify/index.ts
@@ -1,15 +1,52 @@
-import type { PageParam } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
+export namespace PayNotifyApi {
+  /** 支付通知任务 */
+  export interface NotifyTask {
+    id: number;
+    appId: number;
+    appName: string;
+    type: number;
+    dataId: number;
+    status: number;
+    merchantOrderId: string;
+    merchantRefundId?: string;
+    merchantTransferId?: string;
+    lastExecuteTime: Date;
+    nextNotifyTime: Date;
+    notifyTimes: number;
+    maxNotifyTimes: number;
+    createTime: Date;
+    updateTime: Date;
+    logs?: any[];
+  }
+
+  /** 支付通知任务分页请求 */
+  export interface NotifyTaskPageReqVO extends PageParam {
+    appId?: number;
+    type?: number;
+    dataId?: number;
+    status?: number;
+    merchantOrderId?: string;
+    merchantRefundId?: string;
+    merchantTransferId?: string;
+    createTime?: Date[];
+  }
+}
+
 /** 获得支付通知明细 */
 export function getNotifyTaskDetail(id: number) {
   return requestClient.get(`/pay/notify/get-detail?id=${id}`);
 }
 
 /** 获得支付通知分页 */
-export function getNotifyTaskPage(params: PageParam) {
-  return requestClient.get('/pay/notify/page', {
-    params,
-  });
+export function getNotifyTaskPage(params: PayNotifyApi.NotifyTaskPageReqVO) {
+  return requestClient.get<PageResult<PayNotifyApi.NotifyTask>>(
+    '/pay/notify/page',
+    {
+      params,
+    },
+  );
 }
diff --git a/apps/web-antd/src/api/pay/order/index.ts b/apps/web-antd/src/api/pay/order/index.ts
index aff890dfa70bba010d8e7081e484fa0a8299c083..44554919207b431da9dfa1a6ecbed3101fa7f1aa 100644
--- a/apps/web-antd/src/api/pay/order/index.ts
+++ b/apps/web-antd/src/api/pay/order/index.ts
@@ -40,60 +40,19 @@ export namespace PayOrderApi {
   }
 
   /** 支付订单分页请求 */
-  export interface OrderPageReq extends PageParam {
-    merchantId?: number;
+  export interface OrderPageReqVO extends PageParam {
     appId?: number;
-    channelId?: number;
     channelCode?: string;
     merchantOrderId?: string;
-    subject?: string;
-    body?: string;
-    notifyUrl?: string;
-    notifyStatus?: number;
-    amount?: number;
-    channelFeeRate?: number;
-    channelFeeAmount?: number;
-    status?: number;
-    expireTime?: Date[];
-    successTime?: Date[];
-    notifyTime?: Date[];
-    successExtensionId?: number;
-    refundStatus?: number;
-    refundTimes?: number;
-    channelUserId?: string;
     channelOrderNo?: string;
-    createTime?: Date[];
-  }
-
-  /** 支付订单导出请求 */
-  export interface OrderExportReq {
-    merchantId?: number;
-    appId?: number;
-    channelId?: number;
-    channelCode?: string;
-    merchantOrderId?: string;
-    subject?: string;
-    body?: string;
-    notifyUrl?: string;
-    notifyStatus?: number;
-    amount?: number;
-    channelFeeRate?: number;
-    channelFeeAmount?: number;
+    no?: string;
     status?: number;
-    expireTime?: Date[];
-    successTime?: Date[];
-    notifyTime?: Date[];
-    successExtensionId?: number;
-    refundStatus?: number;
-    refundTimes?: number;
-    channelUserId?: string;
-    channelOrderNo?: string;
     createTime?: Date[];
   }
 }
 
 /** 查询支付订单列表 */
-export function getOrderPage(params: PayOrderApi.OrderPageReq) {
+export function getOrderPage(params: PayOrderApi.OrderPageReqVO) {
   return requestClient.get<PageResult<PayOrderApi.Order>>('/pay/order/page', {
     params,
   });
@@ -120,6 +79,6 @@ export function submitOrder(data: any) {
 }
 
 /** 导出支付订单 */
-export function exportOrder(params: PayOrderApi.OrderExportReq) {
+export function exportOrder(params: any) {
   return requestClient.download('/pay/order/export-excel', { params });
 }
diff --git a/apps/web-antd/src/api/pay/refund/index.ts b/apps/web-antd/src/api/pay/refund/index.ts
index 44c36b7c6f35f148079ca6a23bb08c94573c2e74..bce2448bcf823f5832ac66f3ddb8e575974af17a 100644
--- a/apps/web-antd/src/api/pay/refund/index.ts
+++ b/apps/web-antd/src/api/pay/refund/index.ts
@@ -14,9 +14,12 @@ export namespace PayRefundApi {
     tradeNo: string;
     merchantOrderId: string;
     merchantRefundNo: string;
+    merchantRefundId: string;
     notifyUrl: string;
     notifyStatus: number;
     status: number;
+    payPrice: number;
+    refundPrice: number;
     type: number;
     payAmount: number;
     refundAmount: number;
@@ -35,36 +38,7 @@ export namespace PayRefundApi {
   }
 
   /** 退款订单分页请求 */
-  export interface RefundPageReq extends PageParam {
-    merchantId?: number;
-    appId?: number;
-    channelId?: number;
-    channelCode?: string;
-    orderId?: string;
-    tradeNo?: string;
-    merchantOrderId?: string;
-    merchantRefundNo?: string;
-    notifyUrl?: string;
-    notifyStatus?: number;
-    status?: number;
-    type?: number;
-    payAmount?: number;
-    refundAmount?: number;
-    reason?: string;
-    userIp?: string;
-    channelOrderNo?: string;
-    channelRefundNo?: string;
-    channelErrorCode?: string;
-    channelErrorMsg?: string;
-    channelExtras?: string;
-    expireTime?: Date[];
-    successTime?: Date[];
-    notifyTime?: Date[];
-    createTime?: Date[];
-  }
-
-  /** 退款订单导出请求 */
-  export interface RefundExportReq {
+  export interface RefundPageReqVO extends PageParam {
     merchantId?: number;
     appId?: number;
     channelId?: number;
@@ -94,7 +68,7 @@ export namespace PayRefundApi {
 }
 
 /** 查询退款订单列表 */
-export function getRefundPage(params: PayRefundApi.RefundPageReq) {
+export function getRefundPage(params: PayRefundApi.RefundPageReqVO) {
   return requestClient.get<PageResult<PayRefundApi.Refund>>(
     '/pay/refund/page',
     {
@@ -108,22 +82,7 @@ export function getRefund(id: number) {
   return requestClient.get<PayRefundApi.Refund>(`/pay/refund/get?id=${id}`);
 }
 
-/** 创建退款订单 */
-export function createRefund(data: PayRefundApi.Refund) {
-  return requestClient.post('/pay/refund/create', data);
-}
-
-/** 更新退款订单 */
-export function updateRefund(data: PayRefundApi.Refund) {
-  return requestClient.put('/pay/refund/update', data);
-}
-
-/** 删除退款订单 */
-export function deleteRefund(id: number) {
-  return requestClient.delete(`/pay/refund/delete?id=${id}`);
-}
-
 /** 导出退款订单 */
-export function exportRefund(params: PayRefundApi.RefundExportReq) {
+export function exportRefund(params: any) {
   return requestClient.download('/pay/refund/export-excel', { params });
 }
diff --git a/apps/web-antd/src/api/pay/transfer/index.ts b/apps/web-antd/src/api/pay/transfer/index.ts
index 4c588cb657bda24ae800a5086a19eb384cd9865f..75cd21153a2e48dc5cf67d1d80d1f8c52fb0b710 100644
--- a/apps/web-antd/src/api/pay/transfer/index.ts
+++ b/apps/web-antd/src/api/pay/transfer/index.ts
@@ -6,37 +6,42 @@ export namespace PayTransferApi {
   /** 转账单信息 */
   export interface Transfer {
     id: number;
+    no: string;
     appId: number;
+    appName: string;
     channelId: number;
     channelCode: string;
     merchantTransferId: string;
-    type: number;
+    channelTransferNo: string;
     price: number;
     subject: string;
     userName: string;
-    alipayLogonId: string;
-    openid: string;
+    userAccount: string;
+    userIp: string;
     status: number;
+    successTime: Date;
     createTime: Date;
+    updateTime: Date;
+    notifyUrl: string;
+    channelNotifyData: string;
   }
 
   /** 转账单分页请求 */
-  export interface TransferPageReq extends PageParam {
+  export interface TransferPageReqVO extends PageParam {
+    no?: string;
     appId?: number;
-    channelId?: number;
     channelCode?: string;
-    merchantTransferId?: string;
-    type?: number;
-    price?: number;
-    subject?: string;
-    userName?: string;
+    merchantOrderId?: string;
     status?: number;
+    userName?: string;
+    userAccount?: string;
+    channelTransferNo?: string;
     createTime?: Date[];
   }
 }
 
 /** 查询转账单列表 */
-export function getTransferPage(params: PayTransferApi.TransferPageReq) {
+export function getTransferPage(params: PayTransferApi.TransferPageReqVO) {
   return requestClient.get<PageResult<PayTransferApi.Transfer>>(
     '/pay/transfer/page',
     {
diff --git a/apps/web-antd/src/api/pay/wallet/balance/index.ts b/apps/web-antd/src/api/pay/wallet/balance/index.ts
index 71e8e76d609d8e214d9bc2c69b6a512c21967297..e3440f9117821268608ebf2f46223f1ae7269149 100644
--- a/apps/web-antd/src/api/pay/wallet/balance/index.ts
+++ b/apps/web-antd/src/api/pay/wallet/balance/index.ts
@@ -20,7 +20,7 @@ export namespace PayWalletApi {
   }
 
   /** 钱包分页请求 */
-  export interface WalletPageReq extends PageParam {
+  export interface WalletPageReqVO extends PageParam {
     userId?: number;
     userType?: number;
     balance?: number;
@@ -38,7 +38,7 @@ export function getWallet(params: PayWalletApi.PayWalletUserReq) {
 }
 
 /** 查询会员钱包列表 */
-export function getWalletPage(params: PayWalletApi.WalletPageReq) {
+export function getWalletPage(params: PayWalletApi.WalletPageReqVO) {
   return requestClient.get<PageResult<PayWalletApi.Wallet>>(
     '/pay/wallet/page',
     {
diff --git a/apps/web-antd/src/api/pay/wallet/rechargePackage/index.ts b/apps/web-antd/src/api/pay/wallet/rechargePackage/index.ts
index 32c3bbfaf008bcc27ca4fdc59dd1beccddd84ba5..7f8b5621fa06a6d79588672e240e3545ee90fca7 100644
--- a/apps/web-antd/src/api/pay/wallet/rechargePackage/index.ts
+++ b/apps/web-antd/src/api/pay/wallet/rechargePackage/index.ts
@@ -4,7 +4,7 @@ import { requestClient } from '#/api/request';
 
 export namespace WalletRechargePackageApi {
   /** 充值套餐信息 */
-  export interface Package {
+  export interface WalletRechargePackage {
     id?: number;
     name: string;
     payPrice: number;
@@ -14,33 +14,36 @@ export namespace WalletRechargePackageApi {
 }
 
 /** 查询充值套餐列表 */
-export function getPackagePage(params: PageParam) {
-  return requestClient.get<PageResult<WalletRechargePackageApi.Package>>(
-    '/pay/wallet-recharge-package/page',
-    {
-      params,
-    },
-  );
+export function getWalletRechargePackagePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<WalletRechargePackageApi.WalletRechargePackage>
+  >('/pay/wallet-recharge-package/page', {
+    params,
+  });
 }
 
 /** 查询充值套餐详情 */
-export function getPackage(id: number) {
-  return requestClient.get<WalletRechargePackageApi.Package>(
+export function getWalletRechargePackage(id: number) {
+  return requestClient.get<WalletRechargePackageApi.WalletRechargePackage>(
     `/pay/wallet-recharge-package/get?id=${id}`,
   );
 }
 
 /** 新增充值套餐 */
-export function createPackage(data: WalletRechargePackageApi.Package) {
+export function createWalletRechargePackage(
+  data: WalletRechargePackageApi.WalletRechargePackage,
+) {
   return requestClient.post('/pay/wallet-recharge-package/create', data);
 }
 
 /** 修改充值套餐 */
-export function updatePackage(data: WalletRechargePackageApi.Package) {
+export function updateWalletRechargePackage(
+  data: WalletRechargePackageApi.WalletRechargePackage,
+) {
   return requestClient.put('/pay/wallet-recharge-package/update', data);
 }
 
 /** 删除充值套餐 */
-export function deletePackage(id: number) {
+export function deleteWalletRechargePackage(id: number) {
   return requestClient.delete(`/pay/wallet-recharge-package/delete?id=${id}`);
 }
diff --git a/apps/web-antd/src/components/upload/input-upload.vue b/apps/web-antd/src/components/upload/input-upload.vue
index ef76658bb2474e9b261d8eca202f9994d3b72d81..66495467a455603e9a5886223ebe8a0428f07329 100644
--- a/apps/web-antd/src/components/upload/input-upload.vue
+++ b/apps/web-antd/src/components/upload/input-upload.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-// TODO @xingyu：这个组件，只有 pay 在用，和现有的 file-upload 和 image-upload 有点不一致。是不是可以考虑移除，只在 pay 那搞个复用的组件；
 import type { InputProps, TextAreaProps } from 'ant-design-vue';
 
 import type { FileUploadProps } from './typing';
@@ -61,8 +60,8 @@ const fileUploadProps = computed(() => {
 <template>
   <Row>
     <Col :span="18">
-      <Input v-if="inputType === 'input'" v-bind="inputProps" />
-      <Textarea v-else :row="4" v-bind="textareaProps" />
+      <Input readonly v-if="inputType === 'input'" v-bind="inputProps" />
+      <Textarea readonly v-else :row="4" v-bind="textareaProps" />
     </Col>
     <Col :span="6">
       <FileUpload
diff --git a/apps/web-antd/src/views/crm/product/components/data.ts b/apps/web-antd/src/views/crm/product/components/data.ts
index 385e6aa820d70a55ccaee29129ef1c5c9371d990..266a912918f34de3a6f15c87c63bbf3dd32a492d 100644
--- a/apps/web-antd/src/views/crm/product/components/data.ts
+++ b/apps/web-antd/src/views/crm/product/components/data.ts
@@ -43,7 +43,7 @@ export function useDetailListColumns(
     {
       field: 'count',
       title: '数量',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount3',
     },
     {
       field: 'totalPrice',
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 dab12441cd1fba031906ed3306e72c599b4e0c96..a93b42b8fd2ef3274d1c77c9c94296e1354d1176 100644
--- a/apps/web-antd/src/views/erp/finance/account/data.ts
+++ b/apps/web-antd/src/views/erp/finance/account/data.ts
@@ -1,13 +1,9 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { h } from 'vue';
-
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import { Tag } from 'ant-design-vue';
-
 import { z } from '#/adapter/form';
 
 /** 新增/修改的表单 */
@@ -49,7 +45,6 @@ export function useFormSchema(): VbenFormSchema[] {
       componentProps: {
         placeholder: '请输入排序',
         precision: 0,
-        class: 'w-full',
       },
       rules: 'required',
       defaultValue: 0,
@@ -86,11 +81,14 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'remark',
       label: '备注',
       component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        rows: 3,
+      },
     },
   ];
 }
 
-// TODO @xuzhiqiang：搜索的是不是缺了，placeholder
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
@@ -98,42 +96,65 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入名称',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'no',
       label: '编码',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入编码',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'remark',
       label: '备注',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入备注',
+        allowClear: true,
+      },
     },
   ];
 }
 
 /** 列表的字段 */
-export function useGridColumns(): VxeTableGridOptions['columns'] {
+export function useGridColumns<T = ErpAccountApi.Account>(
+  onDefaultStatusChange?: (
+    newStatus: boolean,
+    row: T,
+  ) => PromiseLike<boolean | undefined>,
+): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'name',
       title: '名称',
+      minWidth: 150,
     },
     {
       field: 'no',
       title: '编码',
+      minWidth: 120,
     },
     {
       field: 'remark',
       title: '备注',
+      minWidth: 150,
+      showOverflow: 'tooltip',
     },
     {
       field: 'sort',
       title: '排序',
+      minWidth: 80,
     },
     {
       field: 'status',
       title: '状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -142,22 +163,20 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'defaultStatus',
       title: '是否默认',
-      slots: {
-        default: ({ row }) => {
-          return h(
-            Tag,
-            {
-              class: 'mr-1',
-              color: row.defaultStatus ? 'blue' : 'red',
-            },
-            () => (row.defaultStatus ? '是' : '否'),
-          );
+      minWidth: 100,
+      cellRender: {
+        attrs: { beforeChange: onDefaultStatusChange },
+        name: 'CellSwitch',
+        props: {
+          checkedValue: true,
+          unCheckedValue: false,
         },
       },
     },
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
diff --git a/apps/web-antd/src/views/erp/finance/account/index.vue b/apps/web-antd/src/views/erp/finance/account/index.vue
index c613f82779a88d207d6f452f3ce733011b8878fb..55dd6e697daf096aa9c1a64c91168a34e8f64dd5 100644
--- a/apps/web-antd/src/views/erp/finance/account/index.vue
+++ b/apps/web-antd/src/views/erp/finance/account/index.vue
@@ -2,7 +2,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ErpAccountApi } from '#/api/erp/finance/account';
 
-import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
@@ -12,6 +12,7 @@ import {
   deleteAccount,
   exportAccount,
   getAccountPage,
+  updateAccountDefaultStatus,
 } from '#/api/erp/finance/account';
 import { $t } from '#/locales';
 
@@ -24,7 +25,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -52,21 +53,41 @@ async function handleDelete(row: ErpAccountApi.Account) {
   });
   try {
     await deleteAccount(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
+/** 修改默认状态 */
+async function handleDefaultStatusChange(
+  newStatus: boolean,
+  row: ErpAccountApi.Account,
+): Promise<boolean | undefined> {
+  return new Promise((resolve, reject) => {
+    const text = newStatus ? '设置' : '取消';
+    confirm({
+      content: `确认要${text}"${row.name}"默认吗?`,
+    })
+      .then(async () => {
+        // 更新默认状态
+        await updateAccountDefaultStatus(row.id!, newStatus);
+        message.success(`${text}默认成功`);
+        resolve(true);
+      })
+      .catch(() => {
+        reject(new Error('取消操作'));
+      });
+  });
+}
+
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
   },
   gridOptions: {
-    columns: useGridColumns(),
+    columns: useGridColumns(handleDefaultStatusChange),
     height: 'auto',
     keepSource: true,
     proxyConfig: {
@@ -100,7 +121,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/sale/finance-payment-receipt/"
       />
     </template>
-    <FormModal @success="onRefresh" />
+
+    <FormModal @success="handleRefresh" />
     <Grid table-title="结算账户列表">
       <template #toolbar-tools>
         <TableAction
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 2203d2ff1a0926db637ac1e8a7a6d762e5e8ba58..ef413e9ce504d986dbfbe2b19845730fb63135ed 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
@@ -30,8 +30,9 @@ const [Form, formApi] = useVbenForm({
     componentProps: {
       class: 'w-full',
     },
+    formItemClass: 'col-span-2',
+    labelWidth: 80,
   },
-  wrapperClass: 'grid-cols-1',
   layout: 'horizontal',
   schema: useFormSchema(),
   showDefaultActions: false,
@@ -79,7 +80,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal class="w-1/3" :title="getTitle">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/erp/finance/payment/data.ts b/apps/web-antd/src/views/erp/finance/payment/data.ts
new file mode 100644
index 0000000000000000000000000000000000000000..a33430fafbb332a41b6e1825e6a7b8147fa49814
--- /dev/null
+++ b/apps/web-antd/src/views/erp/finance/payment/data.ts
@@ -0,0 +1,597 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { erpPriceInputFormatter } from '@vben/utils';
+
+import { getAccountSimpleList } from '#/api/erp/finance/account';
+import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
+import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
+
+/** 表单的配置项 */
+export function useFormSchema(formType: string): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'no',
+      label: '付款单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '系统自动生成',
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'paymentTime',
+      label: '付款时间',
+      component: 'DatePicker',
+      componentProps: {
+        disabled: formType === 'detail',
+        placeholder: '选择付款时间',
+        showTime: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'supplierId',
+      label: '供应商',
+      component: 'ApiSelect',
+      componentProps: {
+        disabled: formType === 'detail',
+        placeholder: '请选择供应商',
+        allowClear: true,
+        showSearch: true,
+        api: getSupplierSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'financeUserId',
+      label: '财务人员',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择财务人员',
+        allowClear: true,
+        showSearch: true,
+        api: getSimpleUserList,
+        fieldNames: {
+          label: 'nickname',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        autoSize: { minRows: 1, maxRows: 1 },
+        disabled: formType === 'detail',
+      },
+      formItemClass: 'col-span-2',
+    },
+    {
+      fieldName: 'fileUrl',
+      label: '附件',
+      component: 'FileUpload',
+      componentProps: {
+        maxNumber: 1,
+        maxSize: 10,
+        accept: [
+          'pdf',
+          'doc',
+          'docx',
+          'xls',
+          'xlsx',
+          'txt',
+          'jpg',
+          'jpeg',
+          'png',
+        ],
+        showDescription: formType !== 'detail',
+        disabled: formType === 'detail',
+      },
+      formItemClass: 'col-span-3',
+    },
+    {
+      fieldName: 'items',
+      label: '采购入库、退货单',
+      component: 'Input',
+      formItemClass: 'col-span-3',
+    },
+    {
+      fieldName: 'accountId',
+      label: '付款账户',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择付款账户',
+        allowClear: true,
+        showSearch: true,
+        api: getAccountSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'totalPrice',
+      label: '合计付款',
+      component: 'InputNumber',
+      componentProps: {
+        placeholder: '合计付款',
+        precision: 2,
+        formatter: erpPriceInputFormatter,
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'discountPrice',
+      label: '优惠金额',
+      component: 'InputNumber',
+      componentProps: {
+        disabled: formType === 'detail',
+        placeholder: '请输入优惠金额',
+        precision: 2,
+        formatter: erpPriceInputFormatter,
+      },
+    },
+    {
+      fieldName: 'paymentPrice',
+      label: '实际付款',
+      component: 'InputNumber',
+      componentProps: {
+        placeholder: '实际付款',
+        precision: 2,
+        formatter: erpPriceInputFormatter,
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['totalPrice', 'discountPrice'],
+        componentProps: (values) => {
+          const totalPrice = values.totalPrice || 0;
+          const discountPrice = values.discountPrice || 0;
+          values.paymentPrice = totalPrice - discountPrice;
+          return {};
+        },
+      },
+    },
+  ];
+}
+
+/** 表单的明细表格列 */
+export function useFormItemColumns(): VxeTableGridOptions['columns'] {
+  return [
+    { type: 'seq', title: '序号', minWidth: 50, fixed: 'left' },
+    {
+      field: 'bizNo',
+      title: '采购单据编号',
+      minWidth: 200,
+    },
+    {
+      field: 'totalPrice',
+      title: '应付金额',
+      minWidth: 100,
+      formatter: 'formatAmount2',
+    },
+    {
+      field: 'paidPrice',
+      title: '已付金额',
+      minWidth: 100,
+      formatter: 'formatAmount2',
+    },
+    {
+      field: 'paymentPrice',
+      title: '本次付款',
+      minWidth: 115,
+      fixed: 'right',
+      slots: { default: 'paymentPrice' },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      slots: { default: 'remark' },
+    },
+    {
+      title: '操作',
+      width: 50,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'no',
+      label: '付款单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入付款单号',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'paymentTime',
+      label: '付款时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'supplierId',
+      label: '供应商',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择供应商',
+        allowClear: true,
+        showSearch: true,
+        api: getSupplierSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'creator',
+      label: '创建人',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择创建人',
+        allowClear: true,
+        showSearch: true,
+        api: getSimpleUserList,
+        fieldNames: {
+          label: 'nickname',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'financeUserId',
+      label: '财务人员',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择财务人员',
+        allowClear: true,
+        showSearch: true,
+        api: getSimpleUserList,
+        fieldNames: {
+          label: 'nickname',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'accountId',
+      label: '付款账户',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择付款账户',
+        allowClear: true,
+        showSearch: true,
+        api: getAccountSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
+        placeholder: '请选择状态',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入备注',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'bizNo',
+      label: '采购单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入采购单号',
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+      fixed: 'left',
+    },
+    {
+      field: 'no',
+      title: '付款单号',
+      width: 180,
+      fixed: 'left',
+    },
+    {
+      field: 'supplierName',
+      title: '供应商',
+      minWidth: 120,
+    },
+    {
+      field: 'paymentTime',
+      title: '付款时间',
+      width: 160,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'creatorName',
+      title: '创建人',
+      minWidth: 120,
+    },
+    {
+      field: 'financeUserName',
+      title: '财务人员',
+      minWidth: 120,
+    },
+    {
+      field: 'accountName',
+      title: '付款账户',
+      minWidth: 120,
+    },
+    {
+      field: 'totalPrice',
+      title: '合计付款',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'discountPrice',
+      title: '优惠金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'paymentPrice',
+      title: '实际付款',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      minWidth: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 220,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 采购入库单选择表单的配置项 */
+export function usePurchaseInGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'no',
+      label: '入库单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入入库单号',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'supplierId',
+      label: '供应商',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '已自动选择供应商',
+      },
+    },
+    {
+      fieldName: 'paymentStatus',
+      label: '付款状态',
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: '未付款', value: 0 },
+          { label: '部分付款', value: 1 },
+          { label: '全部付款', value: 2 },
+        ],
+        placeholder: '请选择付款状态',
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 采购入库单选择列表的字段 */
+export function usePurchaseInGridColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+      fixed: 'left',
+    },
+    {
+      field: 'no',
+      title: '入库单号',
+      width: 200,
+      fixed: 'left',
+    },
+    {
+      field: 'supplierName',
+      title: '供应商',
+      minWidth: 120,
+    },
+    {
+      field: 'inTime',
+      title: '入库时间',
+      width: 160,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'totalPrice',
+      title: '应付金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'paymentPrice',
+      title: '已付金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'unPaymentPrice',
+      title: '未付金额',
+      formatter: ({ row }) => {
+        return erpPriceInputFormatter(row.totalPrice - row.paymentPrice || 0);
+      },
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
+      },
+    },
+  ];
+}
+
+/** 采购退货单选择表单的配置项 */
+export function useSaleReturnGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'no',
+      label: '退货单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退货单号',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'supplierId',
+      label: '供应商',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '已自动选择供应商',
+      },
+    },
+    {
+      fieldName: 'refundStatus',
+      label: '退款状态',
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: '未退款', value: 0 },
+          { label: '部分退款', value: 1 },
+          { label: '全部退款', value: 2 },
+        ],
+        placeholder: '请选择退款状态',
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 采购退货单选择列表的字段 */
+export function useSaleReturnGridColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+      fixed: 'left',
+    },
+    {
+      field: 'no',
+      title: '退货单号',
+      width: 200,
+      fixed: 'left',
+    },
+    {
+      field: 'supplierName',
+      title: '供应商',
+      minWidth: 120,
+    },
+    {
+      field: 'returnTime',
+      title: '退货时间',
+      width: 160,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'totalPrice',
+      title: '应退金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'refundPrice',
+      title: '已退金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'unRefundPrice',
+      title: '未退金额',
+      formatter: ({ row }) => {
+        return erpPriceInputFormatter(row.totalPrice - row.refundPrice || 0);
+      },
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
+      },
+    },
+  ];
+}
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 ed6812177db6585be2f33ea130703ffe24a5a82d..7abf85a186b68ede8fff1e7d2683cf37f344dee9 100644
--- a/apps/web-antd/src/views/erp/finance/payment/index.vue
+++ b/apps/web-antd/src/views/erp/finance/payment/index.vue
@@ -1,34 +1,225 @@
 <script lang="ts" setup>
-import { DocAlert, Page } from '@vben/common-ui';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ErpFinancePaymentApi } from '#/api/erp/finance/payment';
 
-import { Button } from 'ant-design-vue';
+import { ref } from 'vue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteFinancePayment,
+  exportFinancePayment,
+  getFinancePaymentPage,
+  updateFinancePaymentStatus,
+} from '#/api/erp/finance/payment';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+/** ERP 付款单列表 */
+defineOptions({ name: 'ErpFinancePayment' });
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportFinancePayment(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '付款单.xls', source: data });
+}
+
+/** 新增付款单 */
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+/** 编辑付款单 */
+function handleEdit(row: ErpFinancePaymentApi.FinancePayment) {
+  formModalApi.setData({ type: 'edit', id: row.id }).open();
+}
+
+/** 删除付款单 */
+async function handleDelete(ids: number[]) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting'),
+    duration: 0,
+  });
+  try {
+    await deleteFinancePayment(ids);
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 审批/反审批操作 */
+async function handleUpdateStatus(
+  row: ErpFinancePaymentApi.FinancePayment,
+  status: number,
+) {
+  const hideLoading = message.loading({
+    content: `确定${status === 20 ? '审批' : '反审批'}该付款单吗？`,
+    duration: 0,
+  });
+  try {
+    await updateFinancePaymentStatus(row.id!, status);
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`);
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const checkedIds = ref<number[]>([]);
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ErpFinancePaymentApi.FinancePayment[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+
+/** 查看详情 */
+function handleDetail(row: ErpFinancePaymentApi.FinancePayment) {
+  formModalApi.setData({ type: 'detail', id: row.id }).open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getFinancePaymentPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<ErpFinancePaymentApi.FinancePayment>,
+  gridEvents: {
+    checkboxAll: handleRowCheckboxChange,
+    checkboxChange: handleRowCheckboxChange,
+  },
+});
 </script>
 
 <template>
-  <Page>
+  <Page auto-content-height>
     <template #doc>
       <DocAlert
         title="【财务】采购付款、销售收款"
         url="https://doc.iocoder.cn/sale/finance-payment-receipt/"
       />
     </template>
-    <Button
-      danger
-      type="link"
-      target="_blank"
-      href="https://github.com/yudaocode/yudao-ui-admin-vue3"
-    >
-      该功能支持 Vue3 + element-plus 版本！
-    </Button>
-    <br />
-    <Button
-      type="link"
-      target="_blank"
-      href="https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/erp/finance/payment/index"
-    >
-      可参考
-      https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/erp/finance/payment/index
-      代码，pull request 贡献给我们！
-    </Button>
+
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="付款单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['付款单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['erp:finance-payment:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['erp:finance-payment:export'],
+              onClick: handleExport,
+            },
+            {
+              label: '批量删除',
+              type: 'primary',
+              danger: true,
+              disabled: isEmpty(checkedIds),
+              icon: ACTION_ICON.DELETE,
+              auth: ['erp:finance-payment:delete'],
+              popConfirm: {
+                title: `是否删除所选中数据？`,
+                confirm: handleDelete.bind(null, checkedIds),
+              },
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.detail'),
+              type: 'link',
+              icon: ACTION_ICON.VIEW,
+              auth: ['erp:finance-payment:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['erp:finance-payment:update'],
+              ifShow: () => row.status !== 20,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: row.status === 10 ? '审批' : '反审批',
+              type: 'link',
+              auth: ['erp:finance-payment:update-status'],
+              popConfirm: {
+                title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`,
+                confirm: handleUpdateStatus.bind(
+                  null,
+                  row,
+                  row.status === 10 ? 20 : 10,
+                ),
+              },
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              color: 'error',
+              auth: ['erp:finance-payment:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.no]),
+                confirm: handleDelete.bind(null, [row.id!]),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
   </Page>
 </template>
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
new file mode 100644
index 0000000000000000000000000000000000000000..14ef85e8e668f3a4b54006a7c3ba057a783cbc53
--- /dev/null
+++ b/apps/web-antd/src/views/erp/finance/payment/modules/form.vue
@@ -0,0 +1,194 @@
+<script lang="ts" setup>
+import type { ErpFinancePaymentApi } from '#/api/erp/finance/payment';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { getAccountSimpleList } from '#/api/erp/finance/account';
+import {
+  createFinancePayment,
+  getFinancePayment,
+  updateFinancePayment,
+} from '#/api/erp/finance/payment';
+
+import { useFormSchema } from '../data';
+import ItemForm from './item-form.vue';
+
+const emit = defineEmits(['success']);
+const formData = ref<
+  ErpFinancePaymentApi.FinancePayment & {
+    fileUrl?: string;
+  }
+>({
+  id: undefined,
+  no: undefined,
+  supplierId: undefined,
+  accountId: undefined,
+  financeUserId: undefined,
+  paymentTime: undefined,
+  remark: undefined,
+  fileUrl: undefined,
+  totalPrice: 0,
+  discountPrice: 0,
+  paymentPrice: 0,
+  items: [],
+});
+
+const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const itemFormRef = ref<InstanceType<typeof ItemForm>>();
+
+/* eslint-disable unicorn/no-nested-ternary */
+const getTitle = computed(() =>
+  formType.value === 'create'
+    ? $t('ui.actionTitle.create', ['付款单'])
+    : formType.value === 'edit'
+      ? $t('ui.actionTitle.edit', ['付款单'])
+      : '付款单详情',
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    labelWidth: 120,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'vertical',
+  schema: useFormSchema(formType.value),
+  showDefaultActions: false,
+  handleValuesChange: (values, changedFields) => {
+    if (formData.value) {
+      if (changedFields.includes('supplierId')) {
+        formData.value.supplierId = values.supplierId;
+      }
+      // 目的：同步到 item-form 组件，触发整体的价格计算
+      if (changedFields.includes('discountPrice')) {
+        formData.value.discountPrice = values.discountPrice;
+        formData.value.paymentPrice =
+          formData.value.totalPrice - values.discountPrice;
+        formApi.setValues({
+          paymentPrice: formData.value.paymentPrice,
+        });
+      }
+    }
+  },
+});
+
+/** 更新付款项 */
+const handleUpdateItems = (
+  items: ErpFinancePaymentApi.FinancePaymentItem[],
+) => {
+  formData.value.items = items;
+  formApi.setValues({
+    items,
+  });
+};
+
+/** 更新总金额 */
+const handleUpdateTotalPrice = (totalPrice: number) => {
+  formData.value.totalPrice = totalPrice;
+  formApi.setValues({
+    totalPrice: formData.value.totalPrice,
+  });
+};
+
+/** 更新付款金额 */
+const handleUpdatePaymentPrice = (paymentPrice: number) => {
+  formData.value.paymentPrice = paymentPrice;
+  formApi.setValues({
+    paymentPrice: formData.value.paymentPrice,
+  });
+};
+
+/** 创建或更新付款单 */
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    const itemFormInstance = Array.isArray(itemFormRef.value)
+      ? itemFormRef.value[0]
+      : itemFormRef.value;
+    try {
+      itemFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
+      return;
+    }
+
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as ErpFinancePaymentApi.FinancePayment;
+    try {
+      await (formType.value === 'create'
+        ? createFinancePayment(data)
+        : updateFinancePayment(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; type: string }>();
+    formType.value = data.type;
+    formApi.setDisabled(formType.value === 'detail');
+    formApi.updateSchema(useFormSchema(formType.value));
+    if (!data || !data.id) {
+      // 新增时，默认选中账户
+      const accountList = await getAccountSimpleList();
+      const defaultAccount = accountList.find((item) => item.defaultStatus);
+      if (defaultAccount) {
+        await formApi.setValues({ accountId: defaultAccount.id });
+      }
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getFinancePayment(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value, false);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal
+    :title="getTitle"
+    class="w-3/4"
+    :show-confirm-button="formType !== 'detail'"
+  >
+    <Form class="mx-3">
+      <template #items>
+        <ItemForm
+          ref="itemFormRef"
+          :items="formData?.items ?? []"
+          :supplier-id="formData?.supplierId"
+          :disabled="formType === 'detail'"
+          :discount-price="formData?.discountPrice ?? 0"
+          @update:items="handleUpdateItems"
+          @update:total-price="handleUpdateTotalPrice"
+          @update:payment-price="handleUpdatePaymentPrice"
+        />
+      </template>
+    </Form>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/erp/finance/payment/modules/item-form.vue b/apps/web-antd/src/views/erp/finance/payment/modules/item-form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..3dfa62a8edc9457838593c577ad85e6a5461aaba
--- /dev/null
+++ b/apps/web-antd/src/views/erp/finance/payment/modules/item-form.vue
@@ -0,0 +1,292 @@
+<script lang="ts" setup>
+import type { ErpFinancePaymentApi } from '#/api/erp/finance/payment';
+import type { ErpPurchaseInApi } from '#/api/erp/purchase/in';
+import type { ErpPurchaseReturnApi } from '#/api/erp/purchase/return';
+
+import { computed, nextTick, ref, watch } from 'vue';
+
+import { ErpBizType } from '@vben/constants';
+import { erpPriceInputFormatter } from '@vben/utils';
+
+import { Input, InputNumber, message } from 'ant-design-vue';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+
+import { useFormItemColumns } from '../data';
+import PurchaseInSelect from './purchase-in-select.vue';
+import SaleReturnSelect from './sale-return-select.vue';
+
+interface Props {
+  items?: ErpFinancePaymentApi.FinancePaymentItem[];
+  supplierId?: number;
+  disabled?: boolean;
+  discountPrice?: number;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  items: () => [],
+  supplierId: undefined,
+  disabled: false,
+  discountPrice: 0,
+});
+
+const emit = defineEmits([
+  'update:items',
+  'update:total-price',
+  'update:payment-price',
+]);
+
+const tableData = ref<ErpFinancePaymentApi.FinancePaymentItem[]>([]); // 表格数据
+
+/** 获取表格合计数据 */
+const summaries = computed(() => {
+  return {
+    totalPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalPrice || 0),
+      0,
+    ),
+    paidPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.paidPrice || 0),
+      0,
+    ),
+    paymentPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.paymentPrice || 0),
+      0,
+    ),
+  };
+});
+
+/** 表格配置 */
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useFormItemColumns(),
+    data: tableData.value,
+    minHeight: 250,
+    autoResize: true,
+    border: true,
+    rowConfig: {
+      keyField: 'seq',
+      isHover: true,
+    },
+    pagerConfig: {
+      enabled: false,
+    },
+    toolbarConfig: {
+      enabled: false,
+    },
+  },
+});
+
+/** 监听外部传入的列数据 */
+watch(
+  () => props.items,
+  async (items) => {
+    if (!items) {
+      return;
+    }
+    tableData.value = [...items];
+    await nextTick(); // 特殊：保证 gridApi 已经初始化
+    await gridApi.grid.reloadData(tableData.value);
+  },
+  {
+    immediate: true,
+  },
+);
+
+/** 计算 totalPrice、paymentPrice 价格 */
+watch(
+  () => [tableData.value, props.discountPrice],
+  () => {
+    if (!tableData.value || tableData.value.length === 0) {
+      return;
+    }
+    const totalPrice = tableData.value.reduce(
+      (prev, curr) => prev + (curr.totalPrice || 0),
+      0,
+    );
+    const paymentPrice = tableData.value.reduce(
+      (prev, curr) => prev + (curr.paymentPrice || 0),
+      0,
+    );
+    const finalPaymentPrice = paymentPrice - (props.discountPrice || 0);
+    // 通知父组件更新
+    emit('update:total-price', totalPrice);
+    emit('update:payment-price', finalPaymentPrice);
+  },
+  { deep: true },
+);
+
+/** 添加采购入库单 */
+const purchaseInSelectRef = ref();
+const handleOpenPurchaseIn = () => {
+  if (!props.supplierId) {
+    message.error('请选择供应商');
+    return;
+  }
+  purchaseInSelectRef.value?.open(props.supplierId);
+};
+
+const handleAddPurchaseIn = (rows: ErpPurchaseInApi.PurchaseIn[]) => {
+  rows.forEach((row) => {
+    const newItem: ErpFinancePaymentApi.FinancePaymentItem = {
+      bizId: row.id,
+      bizType: ErpBizType.PURCHASE_IN,
+      bizNo: row.no,
+      totalPrice: row.totalPrice,
+      paidPrice: row.paymentPrice,
+      paymentPrice: row.totalPrice - row.paymentPrice,
+      remark: undefined,
+    };
+    tableData.value.push(newItem);
+  });
+  emit('update:items', [...tableData.value]);
+};
+
+/** 添加采购退货单 */
+const saleReturnSelectRef = ref();
+const handleOpenSaleReturn = () => {
+  if (!props.supplierId) {
+    message.error('请选择供应商');
+    return;
+  }
+  saleReturnSelectRef.value?.open(props.supplierId);
+};
+
+const handleAddSaleReturn = (rows: ErpPurchaseReturnApi.PurchaseReturn[]) => {
+  rows.forEach((row) => {
+    const newItem: ErpFinancePaymentApi.FinancePaymentItem = {
+      bizId: row.id,
+      bizType: ErpBizType.PURCHASE_RETURN,
+      bizNo: row.no,
+      totalPrice: -row.totalPrice,
+      paidPrice: -row.refundPrice,
+      paymentPrice: -row.totalPrice + row.refundPrice,
+      remark: undefined,
+    };
+    tableData.value.push(newItem);
+  });
+  emit('update:items', [...tableData.value]);
+};
+
+/** 删除行 */
+const handleDelete = async (row: any) => {
+  const index = tableData.value.findIndex(
+    (item) => item.bizId === row.bizId && item.bizType === row.bizType,
+  );
+  if (index !== -1) {
+    tableData.value.splice(index, 1);
+  }
+  // 通知父组件更新
+  emit('update:items', [...tableData.value]);
+};
+
+/** 处理行数据变更 */
+const handleRowChange = (row: any) => {
+  const index = tableData.value.findIndex(
+    (item) => item.bizId === row.bizId && item.bizType === row.bizType,
+  );
+  if (index === -1) {
+    tableData.value.push(row);
+  } else {
+    tableData.value[index] = row;
+  }
+  emit('update:items', [...tableData.value]);
+};
+
+/** 表单校验 */
+const validate = () => {
+  // 检查是否有明细
+  if (tableData.value.length === 0) {
+    throw new Error('请添加付款明细');
+  }
+  // 检查每行的付款金额
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (!item.paymentPrice || item.paymentPrice <= 0) {
+      throw new Error(`第 ${i + 1} 行：本次付款必须大于0`);
+    }
+  }
+};
+
+defineExpose({ validate });
+</script>
+
+<template>
+  <Grid class="w-full">
+    <template #paymentPrice="{ row }">
+      <InputNumber
+        v-model:value="row.paymentPrice"
+        :precision="2"
+        :disabled="disabled"
+        :formatter="erpPriceInputFormatter"
+        placeholder="请输入本次付款"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #remark="{ row }">
+      <Input
+        v-model:value="row.remark"
+        :disabled="disabled"
+        placeholder="请输入备注"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        v-if="!disabled"
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该付款明细吗？',
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+
+    <template #bottom>
+      <div class="border-border bg-muted mt-2 rounded border p-2">
+        <div class="text-muted-foreground flex justify-between text-sm">
+          <span class="text-foreground font-medium">合计：</span>
+          <div class="flex space-x-4">
+            <span>
+              合计付款：{{ erpPriceInputFormatter(summaries.totalPrice) }}
+            </span>
+            <span>
+              已付金额：{{ erpPriceInputFormatter(summaries.paidPrice) }}
+            </span>
+            <span>
+              本次付款：
+              {{ erpPriceInputFormatter(summaries.paymentPrice) }}
+            </span>
+          </div>
+        </div>
+      </div>
+      <TableAction
+        v-if="!disabled"
+        class="mt-2 flex justify-center"
+        :actions="[
+          {
+            label: '添加采购入库单',
+            type: 'default',
+            onClick: handleOpenPurchaseIn,
+          },
+          {
+            label: '添加采购退货单',
+            type: 'default',
+            onClick: handleOpenSaleReturn,
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+
+  <!-- 采购入库单选择组件 -->
+  <PurchaseInSelect ref="purchaseInSelectRef" @success="handleAddPurchaseIn" />
+  <!-- 采购退货单选择组件 -->
+  <SaleReturnSelect ref="saleReturnSelectRef" @success="handleAddSaleReturn" />
+</template>
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
new file mode 100644
index 0000000000000000000000000000000000000000..efcea61fcdbeff00c5a939c16b148685dcf00e67
--- /dev/null
+++ b/apps/web-antd/src/views/erp/finance/payment/modules/purchase-in-select.vue
@@ -0,0 +1,108 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ErpPurchaseInApi } from '#/api/erp/purchase/in';
+
+import { ref } from 'vue';
+
+import { message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getPurchaseInPage } from '#/api/erp/purchase/in';
+
+import { usePurchaseInGridColumns, usePurchaseInGridFormSchema } from '../data';
+
+const emit = defineEmits<{
+  success: [rows: ErpPurchaseInApi.PurchaseIn[]];
+}>();
+
+const supplierId = ref<number>(); // 供应商ID
+const open = ref<boolean>(false); // 弹窗是否打开
+const selectedRows = ref<ErpPurchaseInApi.PurchaseIn[]>([]); // 选中的行
+
+/** 表格配置 */
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: usePurchaseInGridFormSchema(),
+  },
+  gridOptions: {
+    columns: usePurchaseInGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getPurchaseInPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            supplierId: supplierId.value,
+            paymentEnable: true, // 只查询可付款的
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<ErpPurchaseInApi.PurchaseIn>,
+  gridEvents: {
+    checkboxChange: ({
+      records,
+    }: {
+      records: ErpPurchaseInApi.PurchaseIn[];
+    }) => {
+      selectedRows.value = records;
+    },
+    checkboxAll: ({ records }: { records: ErpPurchaseInApi.PurchaseIn[] }) => {
+      selectedRows.value = records;
+    },
+  },
+});
+
+/** 打开弹窗 */
+const openModal = (id: number) => {
+  // 重置数据
+  supplierId.value = id;
+  open.value = true;
+  selectedRows.value = [];
+  // 查询列表
+  gridApi.formApi?.resetForm();
+  gridApi.formApi?.setValues({ supplierId: id });
+  gridApi.query();
+};
+
+/** 确认选择采购入库单 */
+const handleOk = () => {
+  if (selectedRows.value.length === 0) {
+    message.warning('请选择要添加的采购入库单');
+    return;
+  }
+  emit('success', selectedRows.value);
+  open.value = false;
+};
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    class="!w-[50vw]"
+    v-model:open="open"
+    title="选择采购入库单"
+    @ok="handleOk"
+  >
+    <Grid
+      class="max-h-[600px]"
+      table-title="采购入库单列表(仅展示可付款的单据)"
+    />
+  </Modal>
+</template>
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
new file mode 100644
index 0000000000000000000000000000000000000000..e7100ad3528fd4d611d1742bab1f28465aa60024
--- /dev/null
+++ b/apps/web-antd/src/views/erp/finance/payment/modules/sale-return-select.vue
@@ -0,0 +1,112 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ErpPurchaseReturnApi } from '#/api/erp/purchase/return';
+
+import { ref } from 'vue';
+
+import { message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getPurchaseReturnPage } from '#/api/erp/purchase/return';
+
+import { useSaleReturnGridColumns, useSaleReturnGridFormSchema } from '../data';
+
+const emit = defineEmits<{
+  success: [rows: ErpPurchaseReturnApi.PurchaseReturn[]];
+}>();
+
+const supplierId = ref<number>(); // 供应商ID
+const open = ref<boolean>(false); // 弹窗是否打开
+const selectedRows = ref<ErpPurchaseReturnApi.PurchaseReturn[]>([]); // 选中的行
+
+/** 表格配置 */
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useSaleReturnGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useSaleReturnGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getPurchaseReturnPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            supplierId: supplierId.value,
+            refundEnable: true, // 只查询可退款的
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<ErpPurchaseReturnApi.PurchaseReturn>,
+  gridEvents: {
+    checkboxChange: ({
+      records,
+    }: {
+      records: ErpPurchaseReturnApi.PurchaseReturn[];
+    }) => {
+      selectedRows.value = records;
+    },
+    checkboxAll: ({
+      records,
+    }: {
+      records: ErpPurchaseReturnApi.PurchaseReturn[];
+    }) => {
+      selectedRows.value = records;
+    },
+  },
+});
+
+/** 打开弹窗 */
+const openModal = (id: number) => {
+  // 重置数据
+  supplierId.value = id;
+  open.value = true;
+  selectedRows.value = [];
+  // 查询列表
+  gridApi.formApi?.resetForm();
+  gridApi.formApi?.setValues({ supplierId: id });
+  gridApi.query();
+};
+
+/** 确认选择 */
+const handleOk = () => {
+  if (selectedRows.value.length === 0) {
+    message.warning('请选择要添加的采购退货单');
+    return;
+  }
+  emit('success', selectedRows.value);
+  open.value = false;
+};
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    class="!w-[50vw]"
+    v-model:open="open"
+    title="选择采购退货单"
+    @ok="handleOk"
+  >
+    <Grid
+      class="max-h-[600px]"
+      table-title="采购退货单列表(仅展示需退款的单据)"
+    />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/erp/finance/receipt/data.ts b/apps/web-antd/src/views/erp/finance/receipt/data.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e1839932a641a3c61a51f39f8e35c3f0742fb9c8
--- /dev/null
+++ b/apps/web-antd/src/views/erp/finance/receipt/data.ts
@@ -0,0 +1,597 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { erpPriceInputFormatter } from '@vben/utils';
+
+import { getAccountSimpleList } from '#/api/erp/finance/account';
+import { getCustomerSimpleList } from '#/api/erp/sale/customer';
+import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
+
+/** 表单的配置项 */
+export function useFormSchema(formType: string): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'no',
+      label: '收款单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '系统自动生成',
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'receiptTime',
+      label: '收款时间',
+      component: 'DatePicker',
+      componentProps: {
+        disabled: formType === 'detail',
+        placeholder: '选择收款时间',
+        showTime: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'customerId',
+      label: '客户',
+      component: 'ApiSelect',
+      componentProps: {
+        disabled: formType === 'detail',
+        placeholder: '请选择客户',
+        allowClear: true,
+        showSearch: true,
+        api: getCustomerSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'financeUserId',
+      label: '财务人员',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择财务人员',
+        allowClear: true,
+        showSearch: true,
+        api: getSimpleUserList,
+        fieldNames: {
+          label: 'nickname',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+        autoSize: { minRows: 1, maxRows: 1 },
+        disabled: formType === 'detail',
+      },
+      formItemClass: 'col-span-2',
+    },
+    {
+      fieldName: 'fileUrl',
+      label: '附件',
+      component: 'FileUpload',
+      componentProps: {
+        maxNumber: 1,
+        maxSize: 10,
+        accept: [
+          'pdf',
+          'doc',
+          'docx',
+          'xls',
+          'xlsx',
+          'txt',
+          'jpg',
+          'jpeg',
+          'png',
+        ],
+        showDescription: formType !== 'detail',
+        disabled: formType === 'detail',
+      },
+      formItemClass: 'col-span-3',
+    },
+    {
+      fieldName: 'items',
+      label: '销售出库、退货单',
+      component: 'Input',
+      formItemClass: 'col-span-3',
+    },
+    {
+      fieldName: 'accountId',
+      label: '收款账户',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择收款账户',
+        allowClear: true,
+        showSearch: true,
+        api: getAccountSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'totalPrice',
+      label: '合计收款',
+      component: 'InputNumber',
+      componentProps: {
+        placeholder: '合计收款',
+        precision: 2,
+        formatter: erpPriceInputFormatter,
+        disabled: true,
+      },
+    },
+    {
+      fieldName: 'discountPrice',
+      label: '优惠金额',
+      component: 'InputNumber',
+      componentProps: {
+        disabled: formType === 'detail',
+        placeholder: '请输入优惠金额',
+        precision: 2,
+        formatter: erpPriceInputFormatter,
+      },
+    },
+    {
+      fieldName: 'receiptPrice',
+      label: '实际收款',
+      component: 'InputNumber',
+      componentProps: {
+        placeholder: '实际收款',
+        precision: 2,
+        formatter: erpPriceInputFormatter,
+        disabled: true,
+      },
+      dependencies: {
+        triggerFields: ['totalPrice', 'discountPrice'],
+        componentProps: (values) => {
+          const totalPrice = values.totalPrice || 0;
+          const discountPrice = values.discountPrice || 0;
+          values.receiptPrice = totalPrice - discountPrice;
+          return {};
+        },
+      },
+    },
+  ];
+}
+
+/** 表单的明细表格列 */
+export function useFormItemColumns(): VxeTableGridOptions['columns'] {
+  return [
+    { type: 'seq', title: '序号', minWidth: 50, fixed: 'left' },
+    {
+      field: 'bizNo',
+      title: '销售单据编号',
+      minWidth: 200,
+    },
+    {
+      field: 'totalPrice',
+      title: '应收金额',
+      minWidth: 100,
+      formatter: 'formatAmount2',
+    },
+    {
+      field: 'receiptedPrice',
+      title: '已收金额',
+      minWidth: 100,
+      formatter: 'formatAmount2',
+    },
+    {
+      field: 'receiptPrice',
+      title: '本次收款',
+      minWidth: 115,
+      fixed: 'right',
+      slots: { default: 'receiptPrice' },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      slots: { default: 'remark' },
+    },
+    {
+      title: '操作',
+      width: 50,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'no',
+      label: '收款单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入收款单号',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'receiptTime',
+      label: '收款时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'customerId',
+      label: '客户',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择客户',
+        allowClear: true,
+        showSearch: true,
+        api: getCustomerSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'creator',
+      label: '创建人',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择创建人',
+        allowClear: true,
+        showSearch: true,
+        api: getSimpleUserList,
+        fieldNames: {
+          label: 'nickname',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'financeUserId',
+      label: '财务人员',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择财务人员',
+        allowClear: true,
+        showSearch: true,
+        api: getSimpleUserList,
+        fieldNames: {
+          label: 'nickname',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'accountId',
+      label: '收款账户',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择收款账户',
+        allowClear: true,
+        showSearch: true,
+        api: getAccountSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
+        placeholder: '请选择状态',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入备注',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'bizNo',
+      label: '销售单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入销售单号',
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+      fixed: 'left',
+    },
+    {
+      field: 'no',
+      title: '收款单号',
+      width: 180,
+      fixed: 'left',
+    },
+    {
+      field: 'customerName',
+      title: '客户',
+      minWidth: 120,
+    },
+    {
+      field: 'receiptTime',
+      title: '收款时间',
+      width: 160,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'creatorName',
+      title: '创建人',
+      minWidth: 120,
+    },
+    {
+      field: 'financeUserName',
+      title: '财务人员',
+      minWidth: 120,
+    },
+    {
+      field: 'accountName',
+      title: '收款账户',
+      minWidth: 120,
+    },
+    {
+      field: 'totalPrice',
+      title: '合计收款',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'discountPrice',
+      title: '优惠金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'receiptPrice',
+      title: '实际收款',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      minWidth: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 220,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 销售出库单选择表单的配置项 */
+export function useSaleOutGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'no',
+      label: '出库单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入出库单号',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'customerId',
+      label: '客户',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '已自动选择客户',
+      },
+    },
+    {
+      fieldName: 'receiptStatus',
+      label: '收款状态',
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: '未收款', value: 0 },
+          { label: '部分收款', value: 1 },
+          { label: '全部收款', value: 2 },
+        ],
+        placeholder: '请选择收款状态',
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 销售出库单选择列表的字段 */
+export function useSaleOutGridColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+      fixed: 'left',
+    },
+    {
+      field: 'no',
+      title: '出库单号',
+      width: 200,
+      fixed: 'left',
+    },
+    {
+      field: 'customerName',
+      title: '客户',
+      minWidth: 120,
+    },
+    {
+      field: 'outTime',
+      title: '出库时间',
+      width: 160,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'totalPrice',
+      title: '应收金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'receiptPrice',
+      title: '已收金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'unReceiptPrice',
+      title: '未收金额',
+      formatter: ({ row }) => {
+        return erpPriceInputFormatter(row.totalPrice - row.receiptPrice || 0);
+      },
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
+      },
+    },
+  ];
+}
+
+/** 销售退货单选择表单的配置项 */
+export function useSaleReturnGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'no',
+      label: '退货单号',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入退货单号',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'customerId',
+      label: '客户',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+        placeholder: '已自动选择客户',
+      },
+    },
+    {
+      fieldName: 'refundStatus',
+      label: '退款状态',
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: '未退款', value: 0 },
+          { label: '部分退款', value: 1 },
+          { label: '全部退款', value: 2 },
+        ],
+        placeholder: '请选择退款状态',
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 销售退货单选择列表的字段 */
+export function useSaleReturnGridColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      type: 'checkbox',
+      width: 50,
+      fixed: 'left',
+    },
+    {
+      field: 'no',
+      title: '退货单号',
+      width: 200,
+      fixed: 'left',
+    },
+    {
+      field: 'customerName',
+      title: '客户',
+      minWidth: 120,
+    },
+    {
+      field: 'returnTime',
+      title: '退货时间',
+      width: 160,
+      formatter: 'formatDate',
+    },
+    {
+      field: 'totalPrice',
+      title: '应退金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'refundPrice',
+      title: '已退金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'unRefundPrice',
+      title: '未退金额',
+      formatter: ({ row }) => {
+        return erpPriceInputFormatter(row.totalPrice - row.refundPrice || 0);
+      },
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/erp/finance/receipt/index.vue b/apps/web-antd/src/views/erp/finance/receipt/index.vue
index d173fe5ccbeb67fc6818c3b4e4ac06bd380253c0..53e65c591586ebc1fabd269742722b5b0a39cb94 100644
--- a/apps/web-antd/src/views/erp/finance/receipt/index.vue
+++ b/apps/web-antd/src/views/erp/finance/receipt/index.vue
@@ -1,34 +1,225 @@
 <script lang="ts" setup>
-import { DocAlert, Page } from '@vben/common-ui';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ErpFinanceReceiptApi } from '#/api/erp/finance/receipt';
 
-import { Button } from 'ant-design-vue';
+import { ref } from 'vue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteFinanceReceipt,
+  exportFinanceReceipt,
+  getFinanceReceiptPage,
+  updateFinanceReceiptStatus,
+} from '#/api/erp/finance/receipt';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+/** ERP 收款单列表 */
+defineOptions({ name: 'ErpFinanceReceipt' });
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportFinanceReceipt(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '收款单.xls', source: data });
+}
+
+/** 新增收款单 */
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+/** 编辑收款单 */
+function handleEdit(row: ErpFinanceReceiptApi.FinanceReceipt) {
+  formModalApi.setData({ type: 'edit', id: row.id }).open();
+}
+
+/** 删除收款单 */
+async function handleDelete(ids: number[]) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting'),
+    duration: 0,
+  });
+  try {
+    await deleteFinanceReceipt(ids);
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 审批/反审批操作 */
+async function handleUpdateStatus(
+  row: ErpFinanceReceiptApi.FinanceReceipt,
+  status: number,
+) {
+  const hideLoading = message.loading({
+    content: `确定${status === 20 ? '审批' : '反审批'}该收款单吗？`,
+    duration: 0,
+  });
+  try {
+    await updateFinanceReceiptStatus(row.id!, status);
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`);
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const checkedIds = ref<number[]>([]);
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ErpFinanceReceiptApi.FinanceReceipt[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+
+/** 查看详情 */
+function handleDetail(row: ErpFinanceReceiptApi.FinanceReceipt) {
+  formModalApi.setData({ type: 'detail', id: row.id }).open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getFinanceReceiptPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<ErpFinanceReceiptApi.FinanceReceipt>,
+  gridEvents: {
+    checkboxAll: handleRowCheckboxChange,
+    checkboxChange: handleRowCheckboxChange,
+  },
+});
 </script>
 
 <template>
-  <Page>
+  <Page auto-content-height>
     <template #doc>
       <DocAlert
         title="【财务】采购付款、销售收款"
         url="https://doc.iocoder.cn/sale/finance-payment-receipt/"
       />
     </template>
-    <Button
-      danger
-      type="link"
-      target="_blank"
-      href="https://github.com/yudaocode/yudao-ui-admin-vue3"
-    >
-      该功能支持 Vue3 + element-plus 版本！
-    </Button>
-    <br />
-    <Button
-      type="link"
-      target="_blank"
-      href="https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/erp/finance/receipt/index"
-    >
-      可参考
-      https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/erp/finance/receipt/index
-      代码，pull request 贡献给我们！
-    </Button>
+
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="收款单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['收款单']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['erp:finance-receipt:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['erp:finance-receipt:export'],
+              onClick: handleExport,
+            },
+            {
+              label: '批量删除',
+              type: 'primary',
+              danger: true,
+              disabled: isEmpty(checkedIds),
+              icon: ACTION_ICON.DELETE,
+              auth: ['erp:finance-receipt:delete'],
+              popConfirm: {
+                title: `是否删除所选中数据？`,
+                confirm: handleDelete.bind(null, checkedIds),
+              },
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.detail'),
+              type: 'link',
+              icon: ACTION_ICON.VIEW,
+              auth: ['erp:finance-receipt:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['erp:finance-receipt:update'],
+              ifShow: () => row.status !== 20,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: row.status === 10 ? '审批' : '反审批',
+              type: 'link',
+              auth: ['erp:finance-receipt:update-status'],
+              popConfirm: {
+                title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`,
+                confirm: handleUpdateStatus.bind(
+                  null,
+                  row,
+                  row.status === 10 ? 20 : 10,
+                ),
+              },
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              color: 'error',
+              auth: ['erp:finance-receipt:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.no]),
+                confirm: handleDelete.bind(null, [row.id!]),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/erp/finance/receipt/modules/form.vue b/apps/web-antd/src/views/erp/finance/receipt/modules/form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..7f7726fc3e7ce6955b7c5ebf1babab9fec8a8362
--- /dev/null
+++ b/apps/web-antd/src/views/erp/finance/receipt/modules/form.vue
@@ -0,0 +1,194 @@
+<script lang="ts" setup>
+import type { ErpFinanceReceiptApi } from '#/api/erp/finance/receipt';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { getAccountSimpleList } from '#/api/erp/finance/account';
+import {
+  createFinanceReceipt,
+  getFinanceReceipt,
+  updateFinanceReceipt,
+} from '#/api/erp/finance/receipt';
+
+import { useFormSchema } from '../data';
+import ItemForm from './item-form.vue';
+
+const emit = defineEmits(['success']);
+const formData = ref<
+  ErpFinanceReceiptApi.FinanceReceipt & {
+    fileUrl?: string;
+  }
+>({
+  id: undefined,
+  no: undefined,
+  customerId: undefined,
+  accountId: undefined,
+  financeUserId: undefined,
+  receiptTime: undefined,
+  remark: undefined,
+  fileUrl: undefined,
+  totalPrice: 0,
+  discountPrice: 0,
+  receiptPrice: 0,
+  items: [],
+});
+
+const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const itemFormRef = ref<InstanceType<typeof ItemForm>>();
+
+/* eslint-disable unicorn/no-nested-ternary */
+const getTitle = computed(() =>
+  formType.value === 'create'
+    ? $t('ui.actionTitle.create', ['收款单'])
+    : formType.value === 'edit'
+      ? $t('ui.actionTitle.edit', ['收款单'])
+      : '收款单详情',
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    labelWidth: 120,
+  },
+  wrapperClass: 'grid-cols-3',
+  layout: 'vertical',
+  schema: useFormSchema(formType.value),
+  showDefaultActions: false,
+  handleValuesChange: (values, changedFields) => {
+    if (formData.value) {
+      if (changedFields.includes('customerId')) {
+        formData.value.customerId = values.customerId;
+      }
+      // 目的：同步到 item-form 组件，触发整体的价格计算
+      if (changedFields.includes('discountPrice')) {
+        formData.value.discountPrice = values.discountPrice;
+        formData.value.receiptPrice =
+          formData.value.totalPrice - values.discountPrice;
+        formApi.setValues({
+          receiptPrice: formData.value.receiptPrice,
+        });
+      }
+    }
+  },
+});
+
+/** 更新收款项 */
+const handleUpdateItems = (
+  items: ErpFinanceReceiptApi.FinanceReceiptItem[],
+) => {
+  formData.value.items = items;
+  formApi.setValues({
+    items,
+  });
+};
+
+/** 更新总金额 */
+const handleUpdateTotalPrice = (totalPrice: number) => {
+  formData.value.totalPrice = totalPrice;
+  formApi.setValues({
+    totalPrice: formData.value.totalPrice,
+  });
+};
+
+/** 更新收款金额 */
+const handleUpdateReceiptPrice = (receiptPrice: number) => {
+  formData.value.receiptPrice = receiptPrice;
+  formApi.setValues({
+    receiptPrice: formData.value.receiptPrice,
+  });
+};
+
+/** 创建或更新收款单 */
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    const itemFormInstance = Array.isArray(itemFormRef.value)
+      ? itemFormRef.value[0]
+      : itemFormRef.value;
+    try {
+      itemFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
+      return;
+    }
+
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as ErpFinanceReceiptApi.FinanceReceipt;
+    try {
+      await (formType.value === 'create'
+        ? createFinanceReceipt(data)
+        : updateFinanceReceipt(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; type: string }>();
+    formType.value = data.type;
+    formApi.setDisabled(formType.value === 'detail');
+    formApi.updateSchema(useFormSchema(formType.value));
+    if (!data || !data.id) {
+      // 新增时，默认选中账户
+      const accountList = await getAccountSimpleList();
+      const defaultAccount = accountList.find((item) => item.defaultStatus);
+      if (defaultAccount) {
+        await formApi.setValues({ accountId: defaultAccount.id });
+      }
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getFinanceReceipt(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value, false);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal
+    :title="getTitle"
+    class="w-3/4"
+    :show-confirm-button="formType !== 'detail'"
+  >
+    <Form class="mx-3">
+      <template #items>
+        <ItemForm
+          ref="itemFormRef"
+          :items="formData?.items ?? []"
+          :customer-id="formData?.customerId"
+          :disabled="formType === 'detail'"
+          :discount-price="formData?.discountPrice ?? 0"
+          @update:items="handleUpdateItems"
+          @update:total-price="handleUpdateTotalPrice"
+          @update:receipt-price="handleUpdateReceiptPrice"
+        />
+      </template>
+    </Form>
+  </Modal>
+</template>
\ No newline at end of file
diff --git a/apps/web-antd/src/views/erp/finance/receipt/modules/item-form.vue b/apps/web-antd/src/views/erp/finance/receipt/modules/item-form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2d9230b690adc914c386f1e4583ee197eed51cf9
--- /dev/null
+++ b/apps/web-antd/src/views/erp/finance/receipt/modules/item-form.vue
@@ -0,0 +1,292 @@
+<script lang="ts" setup>
+import type { ErpFinanceReceiptApi } from '#/api/erp/finance/receipt';
+import type { ErpSaleOutApi } from '#/api/erp/sale/out';
+import type { ErpSaleReturnApi } from '#/api/erp/sale/return';
+
+import { computed, nextTick, ref, watch } from 'vue';
+
+import { ErpBizType } from '@vben/constants';
+import { erpPriceInputFormatter } from '@vben/utils';
+
+import { Input, InputNumber, message } from 'ant-design-vue';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+
+import { useFormItemColumns } from '../data';
+import SaleOutSelect from './sale-out-select.vue';
+import SaleReturnSelect from './sale-return-select.vue';
+
+interface Props {
+  items?: ErpFinanceReceiptApi.FinanceReceiptItem[];
+  customerId?: number;
+  disabled?: boolean;
+  discountPrice?: number;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  items: () => [],
+  customerId: undefined,
+  disabled: false,
+  discountPrice: 0,
+});
+
+const emit = defineEmits([
+  'update:items',
+  'update:total-price',
+  'update:receipt-price',
+]);
+
+const tableData = ref<ErpFinanceReceiptApi.FinanceReceiptItem[]>([]); // 表格数据
+
+/** 获取表格合计数据 */
+const summaries = computed(() => {
+  return {
+    totalPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalPrice || 0),
+      0,
+    ),
+    receiptedPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.receiptedPrice || 0),
+      0,
+    ),
+    receiptPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.receiptPrice || 0),
+      0,
+    ),
+  };
+});
+
+/** 表格配置 */
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useFormItemColumns(),
+    data: tableData.value,
+    minHeight: 250,
+    autoResize: true,
+    border: true,
+    rowConfig: {
+      keyField: 'seq',
+      isHover: true,
+    },
+    pagerConfig: {
+      enabled: false,
+    },
+    toolbarConfig: {
+      enabled: false,
+    },
+  },
+});
+
+/** 监听外部传入的列数据 */
+watch(
+  () => props.items,
+  async (items) => {
+    if (!items) {
+      return;
+    }
+    tableData.value = [...items];
+    await nextTick(); // 特殊：保证 gridApi 已经初始化
+    await gridApi.grid.reloadData(tableData.value);
+  },
+  {
+    immediate: true,
+  },
+);
+
+/** 计算 totalPrice、receiptPrice 价格 */
+watch(
+  () => [tableData.value, props.discountPrice],
+  () => {
+    if (!tableData.value || tableData.value.length === 0) {
+      return;
+    }
+    const totalPrice = tableData.value.reduce(
+      (prev, curr) => prev + (curr.totalPrice || 0),
+      0,
+    );
+    const receiptPrice = tableData.value.reduce(
+      (prev, curr) => prev + (curr.receiptPrice || 0),
+      0,
+    );
+    const finalReceiptPrice = receiptPrice - (props.discountPrice || 0);
+    // 通知父组件更新
+    emit('update:total-price', totalPrice);
+    emit('update:receipt-price', finalReceiptPrice);
+  },
+  { deep: true },
+);
+
+/** 添加销售出库单 */
+const saleOutSelectRef = ref();
+const handleOpenSaleOut = () => {
+  if (!props.customerId) {
+    message.error('请选择客户');
+    return;
+  }
+  saleOutSelectRef.value?.open(props.customerId);
+};
+
+const handleAddSaleOut = (rows: ErpSaleOutApi.SaleOut[]) => {
+  rows.forEach((row) => {
+    const newItem: ErpFinanceReceiptApi.FinanceReceiptItem = {
+      bizId: row.id,
+      bizType: ErpBizType.SALE_OUT,
+      bizNo: row.no,
+      totalPrice: row.totalPrice,
+      receiptedPrice: row.receiptPrice,
+      receiptPrice: row.totalPrice - row.receiptPrice,
+      remark: undefined,
+    };
+    tableData.value.push(newItem);
+  });
+  emit('update:items', [...tableData.value]);
+};
+
+/** 添加销售退货单 */
+const saleReturnSelectRef = ref();
+const handleOpenSaleReturn = () => {
+  if (!props.customerId) {
+    message.error('请选择客户');
+    return;
+  }
+  saleReturnSelectRef.value?.open(props.customerId);
+};
+
+const handleAddSaleReturn = (rows: ErpSaleReturnApi.SaleReturn[]) => {
+  rows.forEach((row) => {
+    const newItem: ErpFinanceReceiptApi.FinanceReceiptItem = {
+      bizId: row.id,
+      bizType: ErpBizType.SALE_RETURN,
+      bizNo: row.no,
+      totalPrice: -row.totalPrice,
+      receiptedPrice: -row.refundPrice,
+      receiptPrice: -row.totalPrice + row.refundPrice,
+      remark: undefined,
+    };
+    tableData.value.push(newItem);
+  });
+  emit('update:items', [...tableData.value]);
+};
+
+/** 删除行 */
+const handleDelete = async (row: any) => {
+  const index = tableData.value.findIndex(
+    (item) => item.bizId === row.bizId && item.bizType === row.bizType,
+  );
+  if (index !== -1) {
+    tableData.value.splice(index, 1);
+  }
+  // 通知父组件更新
+  emit('update:items', [...tableData.value]);
+};
+
+/** 处理行数据变更 */
+const handleRowChange = (row: any) => {
+  const index = tableData.value.findIndex(
+    (item) => item.bizId === row.bizId && item.bizType === row.bizType,
+  );
+  if (index === -1) {
+    tableData.value.push(row);
+  } else {
+    tableData.value[index] = row;
+  }
+  emit('update:items', [...tableData.value]);
+};
+
+/** 表单校验 */
+const validate = () => {
+  // 检查是否有明细
+  if (tableData.value.length === 0) {
+    throw new Error('请添加收款明细');
+  }
+  // 检查每行的收款金额
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (!item.receiptPrice || item.receiptPrice <= 0) {
+      throw new Error(`第 ${i + 1} 行：本次收款必须大于0`);
+    }
+  }
+};
+
+defineExpose({ validate });
+</script>
+
+<template>
+  <Grid class="w-full">
+    <template #receiptPrice="{ row }">
+      <InputNumber
+        v-model:value="row.receiptPrice"
+        :precision="2"
+        :disabled="disabled"
+        :formatter="erpPriceInputFormatter"
+        placeholder="请输入本次收款"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #remark="{ row }">
+      <Input
+        v-model:value="row.remark"
+        :disabled="disabled"
+        placeholder="请输入备注"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        v-if="!disabled"
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该收款明细吗？',
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+
+    <template #bottom>
+      <div class="border-border bg-muted mt-2 rounded border p-2">
+        <div class="text-muted-foreground flex justify-between text-sm">
+          <span class="text-foreground font-medium">合计：</span>
+          <div class="flex space-x-4">
+            <span>
+              合计收款：{{ erpPriceInputFormatter(summaries.totalPrice) }}
+            </span>
+            <span>
+              已收金额：{{ erpPriceInputFormatter(summaries.receiptedPrice) }}
+            </span>
+            <span>
+              本次收款：
+              {{ erpPriceInputFormatter(summaries.receiptPrice) }}
+            </span>
+          </div>
+        </div>
+      </div>
+      <TableAction
+        v-if="!disabled"
+        class="mt-2 flex justify-center"
+        :actions="[
+          {
+            label: '添加销售出库单',
+            type: 'default',
+            onClick: handleOpenSaleOut,
+          },
+          {
+            label: '添加销售退货单',
+            type: 'default',
+            onClick: handleOpenSaleReturn,
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+
+  <!-- 销售出库单选择组件 -->
+  <SaleOutSelect ref="saleOutSelectRef" @success="handleAddSaleOut" />
+  <!-- 销售退货单选择组件 -->
+  <SaleReturnSelect ref="saleReturnSelectRef" @success="handleAddSaleReturn" />
+</template>
diff --git a/apps/web-antd/src/views/erp/finance/receipt/modules/sale-out-select.vue b/apps/web-antd/src/views/erp/finance/receipt/modules/sale-out-select.vue
new file mode 100644
index 0000000000000000000000000000000000000000..19d0231258d167c73e2820066b11280fbf148d24
--- /dev/null
+++ b/apps/web-antd/src/views/erp/finance/receipt/modules/sale-out-select.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ErpSaleOutApi } from '#/api/erp/sale/out';
+
+import { ref } from 'vue';
+
+import { message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getSaleOutPage } from '#/api/erp/sale/out';
+
+import { useSaleOutGridColumns, useSaleOutGridFormSchema } from '../data';
+
+const emit = defineEmits<{
+  success: [rows: ErpSaleOutApi.SaleOut[]];
+}>();
+
+const customerId = ref<number>(); // 客户ID
+const open = ref<boolean>(false); // 弹窗是否打开
+const selectedRows = ref<ErpSaleOutApi.SaleOut[]>([]); // 选中的行
+
+/** 表格配置 */
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useSaleOutGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useSaleOutGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getSaleOutPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            customerId: customerId.value,
+            receiptEnable: true, // 只查询可收款的
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<ErpSaleOutApi.SaleOut>,
+  gridEvents: {
+    checkboxChange: ({ records }: { records: ErpSaleOutApi.SaleOut[] }) => {
+      selectedRows.value = records;
+    },
+    checkboxAll: ({ records }: { records: ErpSaleOutApi.SaleOut[] }) => {
+      selectedRows.value = records;
+    },
+  },
+});
+
+/** 打开弹窗 */
+const openModal = (id: number) => {
+  // 重置数据
+  customerId.value = id;
+  open.value = true;
+  selectedRows.value = [];
+  // 查询列表
+  gridApi.formApi?.resetForm();
+  gridApi.formApi?.setValues({ customerId: id });
+  gridApi.query();
+};
+
+/** 确认选择销售出库单 */
+const handleOk = () => {
+  if (selectedRows.value.length === 0) {
+    message.warning('请选择要添加的销售出库单');
+    return;
+  }
+  emit('success', selectedRows.value);
+  open.value = false;
+};
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    class="!w-[50vw]"
+    v-model:open="open"
+    title="选择销售出库单"
+    @ok="handleOk"
+  >
+    <Grid
+      class="max-h-[600px]"
+      table-title="销售出库单列表(仅展示可收款的单据)"
+    />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/erp/finance/receipt/modules/sale-return-select.vue b/apps/web-antd/src/views/erp/finance/receipt/modules/sale-return-select.vue
new file mode 100644
index 0000000000000000000000000000000000000000..8dfa97c3c06b1b4e67bd52c7a2e19d79ab5c2428
--- /dev/null
+++ b/apps/web-antd/src/views/erp/finance/receipt/modules/sale-return-select.vue
@@ -0,0 +1,108 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ErpSaleReturnApi } from '#/api/erp/sale/return';
+
+import { ref } from 'vue';
+
+import { message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getSaleReturnPage } from '#/api/erp/sale/return';
+
+import { useSaleReturnGridColumns, useSaleReturnGridFormSchema } from '../data';
+
+const emit = defineEmits<{
+  success: [rows: ErpSaleReturnApi.SaleReturn[]];
+}>();
+
+const customerId = ref<number>(); // 客户ID
+const open = ref<boolean>(false); // 弹窗是否打开
+const selectedRows = ref<ErpSaleReturnApi.SaleReturn[]>([]); // 选中的行
+
+/** 表格配置 */
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useSaleReturnGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useSaleReturnGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getSaleReturnPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            customerId: customerId.value,
+            refundEnable: true, // 只查询可退款的
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<ErpSaleReturnApi.SaleReturn>,
+  gridEvents: {
+    checkboxChange: ({
+      records,
+    }: {
+      records: ErpSaleReturnApi.SaleReturn[];
+    }) => {
+      selectedRows.value = records;
+    },
+    checkboxAll: ({ records }: { records: ErpSaleReturnApi.SaleReturn[] }) => {
+      selectedRows.value = records;
+    },
+  },
+});
+
+/** 打开弹窗 */
+const openModal = (id: number) => {
+  // 重置数据
+  customerId.value = id;
+  open.value = true;
+  selectedRows.value = [];
+  // 查询列表
+  gridApi.formApi?.resetForm();
+  gridApi.formApi?.setValues({ customerId: id });
+  gridApi.query();
+};
+
+/** 确认选择销售退货单 */
+const handleOk = () => {
+  if (selectedRows.value.length === 0) {
+    message.warning('请选择要添加的销售退货单');
+    return;
+  }
+  emit('success', selectedRows.value);
+  open.value = false;
+};
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    class="!w-[50vw]"
+    v-model:open="open"
+    title="选择销售退货单"
+    @ok="handleOk"
+  >
+    <Grid
+      class="max-h-[600px]"
+      table-title="销售退货单列表(仅展示可退款的单据)"
+    />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/erp/home/index.vue b/apps/web-antd/src/views/erp/home/index.vue
index 8befaf713178f48ac246c79b830510e026486010..7b9d86e26bc815d64da7a4a78ccfc15ccdb10716 100644
--- a/apps/web-antd/src/views/erp/home/index.vue
+++ b/apps/web-antd/src/views/erp/home/index.vue
@@ -5,8 +5,8 @@ import { DocAlert, Page } from '@vben/common-ui';
 
 import { Col, Row, Spin } from 'ant-design-vue';
 
-import SummaryCard from './components/SummaryCard.vue';
-import TimeSummaryChart from './components/TimeSummaryChart.vue';
+import SummaryCard from './modules/SummaryCard.vue';
+import TimeSummaryChart from './modules/TimeSummaryChart.vue';
 
 /** ERP首页 */
 defineOptions({ name: 'ErpHome' });
diff --git a/apps/web-antd/src/views/erp/home/components/SummaryCard.vue b/apps/web-antd/src/views/erp/home/modules/SummaryCard.vue
similarity index 96%
rename from apps/web-antd/src/views/erp/home/components/SummaryCard.vue
rename to apps/web-antd/src/views/erp/home/modules/SummaryCard.vue
index fc36c15d17fe39c11e46770fedc5863c12156259..ff98e556a0585025c693719ccf4d058e64b3abf7 100644
--- a/apps/web-antd/src/views/erp/home/components/SummaryCard.vue
+++ b/apps/web-antd/src/views/erp/home/modules/SummaryCard.vue
@@ -32,7 +32,6 @@ const props = withDefaults(defineProps<Props>(), {
 });
 
 /** 概览数据 */
-// TODO @nehc：应该是有 8 个小卡片，少了 4 个？
 const overviewItems = computed<AnalysisOverviewItem[]>(() => [
   {
     icon: SvgCardIcon,
diff --git a/apps/web-antd/src/views/erp/home/components/TimeSummaryChart.vue b/apps/web-antd/src/views/erp/home/modules/TimeSummaryChart.vue
similarity index 96%
rename from apps/web-antd/src/views/erp/home/components/TimeSummaryChart.vue
rename to apps/web-antd/src/views/erp/home/modules/TimeSummaryChart.vue
index e24f2e4b17051b7200a69eaca7cc0852bcafb1a1..9bdc96eedccc6e0e9b4787f1a930a71e767230fe 100644
--- a/apps/web-antd/src/views/erp/home/components/TimeSummaryChart.vue
+++ b/apps/web-antd/src/views/erp/home/modules/TimeSummaryChart.vue
@@ -123,11 +123,9 @@ watch(
     if (!val || val.length === 0) {
       return;
     }
-
     // 更新图表数据
     const xAxisData = val.map((item) => item.time);
     const seriesData = val.map((item) => item.price);
-
     const options = {
       ...lineChartOptions,
       xAxis: {
@@ -141,7 +139,6 @@ watch(
         },
       ],
     };
-
     renderEcharts(options);
   },
   { immediate: true },
@@ -151,14 +148,6 @@ watch(
 onMounted(() => {
   initData();
 });
-
-/** 暴露数据给父组件使用 */
-defineExpose({
-  saleSummary,
-  purchaseSummary,
-  saleTimeSummaryList,
-  purchaseTimeSummaryList,
-});
 </script>
 
 <template>
diff --git a/apps/web-antd/src/views/erp/product/category/data.ts b/apps/web-antd/src/views/erp/product/category/data.ts
index 2c04efb80a8bc742fba876b81ad8b32eb4637ddb..b5eb365ce4f55b5ecb44fc038261c70228315fe6 100644
--- a/apps/web-antd/src/views/erp/product/category/data.ts
+++ b/apps/web-antd/src/views/erp/product/category/data.ts
@@ -58,7 +58,7 @@ export function useFormSchema(): VbenFormSchema[] {
       componentProps: {
         placeholder: '请输入分类编码',
       },
-      rules: z.string().regex(/^[A-Z]+$/, '分类编码必须为大写字母'),
+      rules: 'required',
     },
     {
       fieldName: 'sort',
@@ -71,7 +71,6 @@ export function useFormSchema(): VbenFormSchema[] {
       },
       rules: 'required',
     },
-
     {
       fieldName: 'status',
       label: '状态',
@@ -86,6 +85,31 @@ export function useFormSchema(): VbenFormSchema[] {
   ];
 }
 
+/** 查询表单 */
+export function useQueryFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      component: 'Input',
+      fieldName: 'name',
+      label: '分类名称',
+      componentProps: {
+        placeholder: '请输入分类名称',
+        allowClear: true,
+      },
+    },
+    {
+      component: 'Select',
+      fieldName: 'status',
+      label: '开启状态',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择开启状态',
+        allowClear: true,
+      },
+    },
+  ];
+}
+
 /** 列表的字段 */
 export function useGridColumns(): VxeTableGridOptions<ErpProductCategoryApi.ProductCategory>['columns'] {
   return [
diff --git a/apps/web-antd/src/views/erp/product/category/index.vue b/apps/web-antd/src/views/erp/product/category/index.vue
index aae93224056f7d80b42d70d7402e950e01f021ad..cc22cb7a11910bfe8e4669e37432cba0afd08bea 100644
--- a/apps/web-antd/src/views/erp/product/category/index.vue
+++ b/apps/web-antd/src/views/erp/product/category/index.vue
@@ -5,17 +5,19 @@ import type { ErpProductCategoryApi } from '#/api/erp/product/category';
 import { ref } from 'vue';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
   deleteProductCategory,
+  exportProductCategory,
   getProductCategoryList,
 } from '#/api/erp/product/category';
 import { $t } from '#/locales';
 
-import { useGridColumns } from './data';
+import { useGridColumns, useQueryFormSchema } from './data';
 import Form from './modules/form.vue';
 
 const [FormModal, formModalApi] = useVbenModal({
@@ -25,16 +27,22 @@ const [FormModal, formModalApi] = useVbenModal({
 
 /** 切换树形展开/收缩状态 */
 const isExpanded = ref(true);
-function toggleExpand() {
+function handleExpand() {
   isExpanded.value = !isExpanded.value;
   gridApi.grid.setAllTreeExpand(isExpanded.value);
 }
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportProductCategory(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '产品分类.xls', source: data });
+}
+
 /** 创建分类 */
 function handleCreate() {
   formModalApi.setData(null).open();
@@ -58,29 +66,30 @@ async function handleDelete(row: ErpProductCategoryApi.ProductCategory) {
   });
   try {
     await deleteProductCategory(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useQueryFormSchema(),
+  },
   gridOptions: {
     columns: useGridColumns(),
     height: 'auto',
+    pagerConfig: {
+      enabled: false,
+    },
     proxyConfig: {
       ajax: {
-        query: async () => {
-          return await getProductCategoryList();
+        query: async (_, formValues) => {
+          return await getProductCategoryList(formValues);
         },
       },
     },
-    pagerConfig: {
-      enabled: false,
-    },
     rowConfig: {
       keyField: 'id',
       isHover: true,
@@ -90,11 +99,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
       search: true,
     },
     treeConfig: {
-      transform: true,
-      rowField: 'id',
       parentField: 'parentId',
+      rowField: 'id',
+      transform: true,
       expandAll: true,
-      accordion: false,
+      reserve: true,
     },
   } as VxeTableGridOptions<ErpProductCategoryApi.ProductCategory>,
 });
@@ -108,7 +117,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/erp/product/"
       />
     </template>
-    <FormModal @success="onRefresh" />
+
+    <FormModal @success="handleRefresh" />
     <Grid table-title="产品分类列表">
       <template #toolbar-tools>
         <TableAction
@@ -120,10 +130,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
               auth: ['erp:product-category:create'],
               onClick: handleCreate,
             },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['erp:product-category:export'],
+              onClick: handleExport,
+            },
             {
               label: isExpanded ? '收缩' : '展开',
               type: 'primary',
-              onClick: toggleExpand,
+              onClick: handleExpand,
             },
           ]"
         />
@@ -151,7 +168,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               danger: true,
               icon: ACTION_ICON.DELETE,
               auth: ['erp:product-category:delete'],
-              ifShow: !(row.children && row.children.length > 0),
+              disabled: row.children && row.children.length > 0,
               popConfirm: {
                 title: $t('ui.actionMessage.deleteConfirm', [row.name]),
                 confirm: handleDelete.bind(null, row),
diff --git a/apps/web-antd/src/views/erp/product/category/modules/form.vue b/apps/web-antd/src/views/erp/product/category/modules/form.vue
index ad6ffa89b5bdb64f8689f3149aa9bf86f3d2e89f..a8c6be62309f306e29ad6fc0c7dffd451c6ded1d 100644
--- a/apps/web-antd/src/views/erp/product/category/modules/form.vue
+++ b/apps/web-antd/src/views/erp/product/category/modules/form.vue
@@ -66,21 +66,20 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    let data = modalApi.getData<ErpProductCategoryApi.ProductCategory>();
-    if (!data) {
+    const data = modalApi.getData<ErpProductCategoryApi.ProductCategory>();
+    if (!data || !data.id) {
+      // 设置上级
+      await formApi.setValues(data);
       return;
     }
-    if (data.id) {
-      modalApi.lock();
-      try {
-        data = await getProductCategory(data.id);
-      } finally {
-        modalApi.unlock();
-      }
+    modalApi.lock();
+    try {
+      formData.value = await getProductCategory(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
     }
-    // 设置到 values
-    formData.value = data;
-    await formApi.setValues(formData.value);
   },
 });
 </script>
diff --git a/apps/web-antd/src/views/erp/product/product/data.ts b/apps/web-antd/src/views/erp/product/product/data.ts
index 942e2288ea53cd4789d4f4ec852bad817cd2e59b..cfde896dbe1e2d53b817b12cb7ed9b27bc651724 100644
--- a/apps/web-antd/src/views/erp/product/product/data.ts
+++ b/apps/web-antd/src/views/erp/product/product/data.ts
@@ -3,7 +3,6 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
-import { handleTree } from '@vben/utils';
 
 import { z } from '#/adapter/form';
 import { getProductCategorySimpleList } from '#/api/erp/product/category';
@@ -109,6 +108,9 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'InputNumber',
       componentProps: {
         placeholder: '请输入采购价格，单位：元',
+        precision: 2,
+        min: 0,
+        step: 0.01,
       },
     },
     {
@@ -117,6 +119,9 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'InputNumber',
       componentProps: {
         placeholder: '请输入销售价格，单位：元',
+        precision: 2,
+        min: 0,
+        step: 0.01,
       },
     },
     {
@@ -125,12 +130,18 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'InputNumber',
       componentProps: {
         placeholder: '请输入最低价格，单位：元',
+        precision: 2,
+        min: 0,
+        step: 0.01,
       },
     },
     {
       fieldName: 'remark',
       label: '备注',
       component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入备注',
+      },
     },
   ];
 }
@@ -142,6 +153,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入名称',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'categoryId',
@@ -169,38 +184,50 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'barCode',
       title: '条码',
+      minWidth: 120,
     },
     {
       field: 'name',
       title: '名称',
+      minWidth: 200,
     },
     {
       field: 'standard',
       title: '规格',
+      minWidth: 100,
     },
     {
       field: 'categoryName',
       title: '分类',
+      minWidth: 120,
     },
     {
       field: 'unitName',
       title: '单位',
+      minWidth: 100,
     },
     {
       field: 'purchasePrice',
       title: '采购价格',
+      minWidth: 100,
+      formatter: 'formatAmount2',
     },
     {
       field: 'salePrice',
       title: '销售价格',
+      minWidth: 100,
+      formatter: 'formatAmount2',
     },
     {
       field: 'minPrice',
       title: '最低价格',
+      minWidth: 100,
+      formatter: 'formatAmount2',
     },
     {
       field: 'status',
       title: '状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -209,6 +236,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
diff --git a/apps/web-antd/src/views/erp/product/product/index.vue b/apps/web-antd/src/views/erp/product/product/index.vue
index fe7a4e7cad8bcc274783900176b5e52ebd216e37..4b96bc3002597a81f29224aadf6b949eaa511e2d 100644
--- a/apps/web-antd/src/views/erp/product/product/index.vue
+++ b/apps/web-antd/src/views/erp/product/product/index.vue
@@ -24,7 +24,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -52,10 +52,8 @@ async function handleDelete(row: ErpProductApi.Product) {
   });
   try {
     await deleteProduct(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -100,7 +98,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/erp/product/"
       />
     </template>
-    <FormModal @success="onRefresh" />
+
+    <FormModal @success="handleRefresh" />
     <Grid table-title="产品列表">
       <template #toolbar-tools>
         <TableAction
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 dea93ec50429af07c8d5cc7fb4f560b3ad83e247..5f39d9935504f7bfac0f58103333e2377bcc2eea 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
@@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-1/2">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/erp/product/unit/data.ts b/apps/web-antd/src/views/erp/product/unit/data.ts
index aee0708c40372222f67904af9239c5d9286c62f2..7b7b1a3a257a59dc5d049237345ad43cdf19136d 100644
--- a/apps/web-antd/src/views/erp/product/unit/data.ts
+++ b/apps/web-antd/src/views/erp/product/unit/data.ts
@@ -22,6 +22,9 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '单位名称',
       rules: 'required',
+      componentProps: {
+        placeholder: '请输入单位名称',
+      },
     },
     {
       fieldName: 'status',
@@ -44,12 +47,17 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '单位名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入单位名称',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'status',
       label: '单位状态',
       component: 'Select',
       componentProps: {
+        placeholder: '请选择单位状态',
         allowClear: true,
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
       },
@@ -63,14 +71,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '单位编号',
+      minWidth: 100,
     },
     {
       field: 'name',
       title: '单位名称',
+      minWidth: 200,
     },
     {
       field: 'status',
       title: '单位状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -79,6 +90,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
diff --git a/apps/web-antd/src/views/erp/product/unit/index.vue b/apps/web-antd/src/views/erp/product/unit/index.vue
index 0a5871eadd42b6185a871a0d6980f0767f8c5ace..3a3feb31450f7ee163e1d0220a047dd63df7cfff 100644
--- a/apps/web-antd/src/views/erp/product/unit/index.vue
+++ b/apps/web-antd/src/views/erp/product/unit/index.vue
@@ -24,7 +24,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -52,10 +52,8 @@ async function handleDelete(row: ErpProductUnitApi.ProductUnit) {
   });
   try {
     await deleteProductUnit(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -100,7 +98,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/erp/product/"
       />
     </template>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="产品单位列表">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-antd/src/views/erp/product/unit/modules/form.vue b/apps/web-antd/src/views/erp/product/unit/modules/form.vue
index 39b23f76855b7286632ab084bd2be1edc4fbdc37..eac42a05a95478b49a6a18ff7bcd6d3bf4ccc306 100644
--- a/apps/web-antd/src/views/erp/product/unit/modules/form.vue
+++ b/apps/web-antd/src/views/erp/product/unit/modules/form.vue
@@ -82,7 +82,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-1/2">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/erp/purchase/in/data.ts b/apps/web-antd/src/views/erp/purchase/in/data.ts
index a53dc53b0189f9d77e336d71a342aa6ee689a103..c249080fea7a0ec90a94b4fea5951cab012e35f8 100644
--- a/apps/web-antd/src/views/erp/purchase/in/data.ts
+++ b/apps/web-antd/src/views/erp/purchase/in/data.ts
@@ -3,7 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
-import { erpPriceInputFormatter } from '@vben/utils';
+import { erpNumberFormatter, erpPriceInputFormatter } from '@vben/utils';
 
 import { z } from '#/adapter/form';
 import { getAccountSimpleList } from '#/api/erp/finance/account';
@@ -11,45 +11,39 @@ import { getProductSimpleList } from '#/api/erp/product/product';
 import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 表单的配置项 */
 export function useFormSchema(formType: string): VbenFormSchema[] {
   return [
     {
+      fieldName: 'id',
       component: 'Input',
-      componentProps: {
-        style: { display: 'none' },
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
       },
-      fieldName: 'id',
-      label: 'ID',
-      hideLabel: true,
-      formItemClass: 'hidden',
     },
     {
+      fieldName: 'no',
+      label: '入库单号',
       component: 'Input',
       componentProps: {
         placeholder: '系统自动生成',
         disabled: true,
       },
-      fieldName: 'no',
-      label: '入库单号',
     },
-
     {
-      component: 'ApiSelect',
+      fieldName: 'inTime',
+      label: '入库时间',
+      component: 'DatePicker',
       componentProps: {
-        disabled: true,
-        placeholder: '请选择供应商',
-        allowClear: true,
-        showSearch: true,
-        api: getSupplierSimpleList,
-        fieldNames: {
-          label: 'name',
-          value: 'id',
-        },
+        disabled: formType === 'detail',
+        placeholder: '选择入库时间',
+        showTime: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       },
-      fieldName: 'supplierId',
-      label: '供应商',
       rules: 'required',
     },
     {
@@ -57,44 +51,45 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
       label: '关联订单',
       component: 'Input',
       formItemClass: 'col-span-1',
+      rules: 'required',
       componentProps: {
-        disabled: formType === 'detail',
         placeholder: '请选择关联订单',
+        disabled: formType === 'detail',
       },
-      rules: 'required',
     },
     {
-      component: 'DatePicker',
+      fieldName: 'supplierId',
+      label: '供应商',
+      component: 'ApiSelect',
       componentProps: {
-        disabled: formType === 'detail',
-        placeholder: '选择订单时间',
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-        style: { width: '100%' },
+        disabled: true,
+        placeholder: '请选择供应商',
+        allowClear: true,
+        showSearch: true,
+        api: getSupplierSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
       },
-      fieldName: 'inTime',
-      label: '入库时间',
       rules: 'required',
     },
-
     {
+      fieldName: 'remark',
+      label: '备注',
       component: 'Textarea',
       componentProps: {
         placeholder: '请输入备注',
-        disabled: formType === 'detail',
         autoSize: { minRows: 1, maxRows: 1 },
-        class: 'w-full',
+        disabled: formType === 'detail',
       },
-      fieldName: 'remark',
-      label: '备注',
       formItemClass: 'col-span-2',
     },
-
     {
+      fieldName: 'fileUrl',
+      label: '附件',
       component: 'FileUpload',
       componentProps: {
-        disabled: formType === 'detail',
         maxNumber: 1,
         maxSize: 10,
         accept: [
@@ -108,73 +103,77 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
           'jpeg',
           'png',
         ],
-        showDescription: true,
+        showDescription: formType !== 'detail',
+        disabled: formType === 'detail',
       },
-      fieldName: 'fileUrl',
-      label: '附件',
       formItemClass: 'col-span-3',
     },
     {
-      fieldName: 'product',
-      label: '产品清单',
+      fieldName: 'items',
+      label: '入库产品清单',
       component: 'Input',
       formItemClass: 'col-span-3',
     },
     {
-      component: 'InputNumber',
       fieldName: 'discountPercent',
+      label: '优惠率(%)',
+      component: 'InputNumber',
       componentProps: {
-        placeholder: '优惠率',
+        placeholder: '请输入优惠率',
         min: 0,
         max: 100,
-        disabled: true,
         precision: 2,
-        style: { width: '100%' },
       },
-
-      label: '优惠率(%)',
+      rules: z.number().min(0).optional(),
     },
     {
+      fieldName: 'discountPrice',
+      label: '付款优惠',
       component: 'InputNumber',
       componentProps: {
         placeholder: '付款优惠',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
-        style: { width: '100%' },
       },
-      fieldName: 'discountPrice',
-      label: '付款优惠',
     },
     {
+      fieldName: 'discountedPrice',
+      label: '优惠后金额',
       component: 'InputNumber',
       componentProps: {
         placeholder: '优惠后金额',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
-        style: { width: '100%' },
       },
-      fieldName: 'discountedPrice',
-      label: '优惠后金额',
+      dependencies: {
+        triggerFields: ['totalPrice', 'otherPrice'],
+        componentProps: (values) => {
+          const totalPrice = values.totalPrice || 0;
+          const otherPrice = values.otherPrice || 0;
+          values.discountedPrice = totalPrice - otherPrice;
+          return {};
+        },
+      },
     },
     {
+      fieldName: 'otherPrice',
+      label: '其他费用',
       component: 'InputNumber',
       componentProps: {
         disabled: formType === 'detail',
         placeholder: '请输入其他费用',
         precision: 2,
         formatter: erpPriceInputFormatter,
-        style: { width: '100%' },
       },
-      fieldName: 'otherPrice',
-      label: '其他费用',
     },
     {
+      fieldName: 'accountId',
+      label: '结算账户',
       component: 'ApiSelect',
       componentProps: {
         placeholder: '请选择结算账户',
-        disabled: true,
         allowClear: true,
         showSearch: true,
         api: getAccountSimpleList,
@@ -183,26 +182,25 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
           value: 'id',
         },
       },
-      fieldName: 'accountId',
-      label: '结算账户',
     },
     {
+      fieldName: 'totalPrice',
+      label: '应付金额',
       component: 'InputNumber',
       componentProps: {
         precision: 2,
-        style: { width: '100%' },
-        disabled: true,
         min: 0,
+        disabled: true,
       },
-      fieldName: 'totalPrice',
-      label: '应付金额',
       rules: z.number().min(0).optional(),
     },
   ];
 }
 
-/** 采购订单项表格列定义 */
-export function usePurchaseOrderItemTableColumns(): VxeTableGridOptions['columns'] {
+/** 表单的明细表格列 */
+export function useFormItemColumns(
+  formData?: any[],
+): VxeTableGridOptions['columns'] {
   return [
     { type: 'seq', title: '序号', minWidth: 50, fixed: 'left' },
     {
@@ -219,7 +217,7 @@ export function usePurchaseOrderItemTableColumns(): VxeTableGridOptions['columns
     },
     {
       field: 'stockCount',
-      title: '仓库库存',
+      title: '库存',
       minWidth: 80,
     },
     {
@@ -232,15 +230,27 @@ export function usePurchaseOrderItemTableColumns(): VxeTableGridOptions['columns
       title: '单位',
       minWidth: 80,
     },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      slots: { default: 'remark' },
+    },
     {
       field: 'totalCount',
       title: '原数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
+      fixed: 'right',
+      visible: formData && formData[0]?.inCount !== undefined,
     },
     {
       field: 'inCount',
-      title: '已入库数量',
+      title: '已入库',
+      formatter: 'formatAmount3',
       minWidth: 120,
+      fixed: 'right',
+      visible: formData && formData[0]?.returnCount !== undefined,
     },
     {
       field: 'count',
@@ -267,7 +277,8 @@ export function usePurchaseOrderItemTableColumns(): VxeTableGridOptions['columns
       fixed: 'right',
       field: 'taxPercent',
       title: '税率(%)',
-      minWidth: 100,
+      minWidth: 105,
+      slots: { default: 'taxPercent' },
     },
     {
       fixed: 'right',
@@ -283,6 +294,12 @@ export function usePurchaseOrderItemTableColumns(): VxeTableGridOptions['columns
       minWidth: 120,
       formatter: 'formatAmount2',
     },
+    {
+      title: '操作',
+      width: 50,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
   ];
 }
 
@@ -318,10 +335,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '入库时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始时间', '结束时间'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
     {
@@ -350,7 +365,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
         api: getWarehouseSimpleList,
         labelField: 'name',
         valueField: 'id',
-        filterOption: false,
       },
     },
     {
@@ -377,6 +391,21 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
       },
     },
+    {
+      fieldName: 'accountId',
+      label: '结算账户',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择结算账户',
+        allowClear: true,
+        showSearch: true,
+        api: getAccountSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+    },
     {
       fieldName: 'paymentStatus',
       label: '付款状态',
@@ -387,18 +416,18 @@ export function useGridFormSchema(): VbenFormSchema[] {
           { label: '部分付款', value: 1 },
           { label: '全部付款', value: 2 },
         ],
-        placeholder: '请选择退货状态',
+        placeholder: '请选择付款状态',
         allowClear: true,
       },
     },
     {
       fieldName: 'status',
-      label: '状态',
+      label: '审批状态',
       component: 'Select',
       componentProps: {
-        placeholder: '请选择状态',
-        allowClear: true,
         options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
+        placeholder: '请选择审批状态',
+        allowClear: true,
       },
     },
     {
@@ -442,7 +471,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       field: 'inTime',
       title: '入库时间',
       width: 160,
-      formatter: 'formatDateTime',
+      formatter: 'formatDate',
     },
     {
       field: 'creatorName',
@@ -452,23 +481,32 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '应付金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'paymentPrice',
       title: '已付金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
+      minWidth: 120,
+    },
+    {
+      field: 'unPaymentPrice',
+      title: '未付金额',
+      formatter: ({ row }) => {
+        return `${erpNumberFormatter(row.totalPrice - row.paymentPrice, 2)}元`;
+      },
       minWidth: 120,
     },
     {
       field: 'status',
-      title: '状态',
+      title: '审批状态',
       minWidth: 120,
       cellRender: {
         name: 'CellDict',
@@ -477,12 +515,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       title: '操作',
-      minWidth: 250,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
+
 /** 列表的搜索表单 */
 export function useOrderGridFormSchema(): VbenFormSchema[] {
   return [
@@ -493,7 +532,6 @@ export function useOrderGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         placeholder: '请输入订单单号',
         allowClear: true,
-        disabled: true,
       },
     },
     {
@@ -516,10 +554,8 @@ export function useOrderGridFormSchema(): VbenFormSchema[] {
       label: '订单时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始时间', '结束时间'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
   ];
@@ -564,23 +600,25 @@ export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'inCount',
       title: '入库数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalProductPrice',
       title: '金额合计',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '含税金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
   ];
diff --git a/apps/web-antd/src/views/erp/purchase/in/index.vue b/apps/web-antd/src/views/erp/purchase/in/index.vue
index dd9558d57fd01a1777db8a68c5ab16664675a3c7..2b4e3487a24599527946d777382305043d9f3736 100644
--- a/apps/web-antd/src/views/erp/purchase/in/index.vue
+++ b/apps/web-antd/src/views/erp/purchase/in/index.vue
@@ -19,87 +19,82 @@ import {
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import PurchaseInForm from './modules/purchase-in-form.vue';
+import Form from './modules/form.vue';
 
 /** ERP 采购入库列表 */
 defineOptions({ name: 'ErpPurchaseIn' });
 
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: PurchaseInForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-// TODO @Xuzhiqiang：批量删除待实现
-const checkedIds = ref<number[]>([]);
-
-/** 详情 */
-function handleDetail(row: ErpPurchaseInApi.PurchaseIn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportPurchaseIn(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '采购入库.xls', source: data });
 }
 
-/** 新增 */
+/** 新增采购入库 */
 function handleCreate() {
   formModalApi.setData({ type: 'create' }).open();
 }
 
-/** 编辑 */
+/** 编辑采购入库 */
 function handleEdit(row: ErpPurchaseInApi.PurchaseIn) {
   formModalApi.setData({ type: 'edit', id: row.id }).open();
 }
 
-/** 删除 */
+/** 删除采购入库 */
 async function handleDelete(ids: number[]) {
   const hideLoading = message.loading({
     content: $t('ui.actionMessage.deleting'),
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
     await deletePurchaseIn(ids);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess'),
-      key: 'action_process_msg',
-    });
-    onRefresh();
-  } catch {
-    // 处理错误
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
 /** 审批/反审批操作 */
-function handleUpdateStatus(row: ErpPurchaseInApi.PurchaseIn, status: number) {
+async function handleUpdateStatus(
+  row: ErpPurchaseInApi.PurchaseIn,
+  status: number,
+) {
   const hideLoading = message.loading({
     content: `确定${status === 20 ? '审批' : '反审批'}该订单吗？`,
     duration: 0,
-    key: 'action_process_msg',
   });
-  updatePurchaseInStatus(row.id!, status)
-    .then(() => {
-      message.success({
-        content: `${status === 20 ? '审批' : '反审批'}成功`,
-        key: 'action_process_msg',
-      });
-      onRefresh();
-    })
-    .catch(() => {
-      // 处理错误
-    })
-    .finally(() => {
-      hideLoading();
-    });
+  try {
+    await updatePurchaseInStatus(row.id!, status);
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`);
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
 }
 
-/** 导出 */
-async function handleExport() {
-  const data = await exportPurchaseIn(await gridApi.formApi.getValues());
-  downloadFileFromBlobPart({ fileName: '采购入库.xls', source: data });
+const checkedIds = ref<number[]>([]);
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ErpPurchaseInApi.PurchaseIn[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+
+/** 查看详情 */
+function handleDetail(row: ErpPurchaseInApi.PurchaseIn) {
+  formModalApi.setData({ type: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -130,6 +125,10 @@ const [Grid, gridApi] = useVbenVxeGrid({
       search: true,
     },
   } as VxeTableGridOptions<ErpPurchaseInApi.PurchaseIn>,
+  gridEvents: {
+    checkboxAll: handleRowCheckboxChange,
+    checkboxChange: handleRowCheckboxChange,
+  },
 });
 </script>
 
@@ -141,8 +140,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/erp/purchase/"
       />
     </template>
-    <FormModal @success="onRefresh" />
 
+    <FormModal @success="handleRefresh" />
     <Grid table-title="采购入库列表">
       <template #toolbar-tools>
         <TableAction
@@ -170,14 +169,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               auth: ['erp:purchase-in:delete'],
               popConfirm: {
                 title: `是否删除所选中数据？`,
-                confirm: () => {
-                  const checkboxRecords = gridApi.grid.getCheckboxRecords();
-                  if (checkboxRecords.length === 0) {
-                    message.warning('请选择要删除的数据');
-                    return;
-                  }
-                  handleDelete(checkboxRecords.map((item) => item.id!));
-                },
+                confirm: handleDelete.bind(null, checkedIds),
               },
             },
           ]"
@@ -222,7 +214,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               auth: ['erp:purchase-in:delete'],
               popConfirm: {
                 title: $t('ui.actionMessage.deleteConfirm', [row.no]),
-                confirm: () => handleDelete([row.id!]),
+                confirm: handleDelete.bind(null, [row.id!]),
               },
             },
           ]"
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/form.vue
similarity index 42%
rename from apps/web-antd/src/views/erp/purchase/in/modules/purchase-in-form.vue
rename to apps/web-antd/src/views/erp/purchase/in/modules/form.vue
index 8a4890cd58303d9d51349e3c3a0c7e9064500ce5..029092f83a00f067f06b9ef6d8314061dd36aa15 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/form.vue
@@ -2,13 +2,15 @@
 import type { ErpPurchaseInApi } from '#/api/erp/purchase/in';
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 
-import { computed, nextTick, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
 
 import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
+import { getAccountSimpleList } from '#/api/erp/finance/account';
 import {
   createPurchaseIn,
   getPurchaseIn,
@@ -16,20 +18,19 @@ import {
 } from '#/api/erp/purchase/in';
 
 import { useFormSchema } from '../data';
-import PurchaseInItemForm from './purchase-in-item-form.vue';
-import SelectPurchaseOrderForm from './select-purchase-order-form.vue';
+import ItemForm from './item-form.vue';
+import PurchaseOrderSelect from './purchase-order-select.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<
   ErpPurchaseInApi.PurchaseIn & {
     accountId?: number;
-    discountedPrice?: number;
+    customerId?: number;
     discountPercent?: number;
     fileUrl?: string;
     order?: ErpPurchaseOrderApi.PurchaseOrder;
     orderId?: number;
     orderNo?: string;
-    supplierId?: number;
   }
 >({
   id: undefined,
@@ -43,17 +44,19 @@ const formData = ref<
   discountPrice: 0,
   totalPrice: 0,
   otherPrice: 0,
-  discountedPrice: 0,
   items: [],
 });
-const formType = ref('');
-const itemFormRef = ref();
-
-const getTitle = computed(() => {
-  if (formType.value === 'create') return '添加采购入库';
-  if (formType.value === 'update') return '编辑采购入库';
-  return '采购入库详情';
-});
+const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const itemFormRef = ref<InstanceType<typeof ItemForm>>();
+
+/* eslint-disable unicorn/no-nested-ternary */
+const getTitle = computed(() =>
+  formType.value === 'create'
+    ? $t('ui.actionTitle.create', ['采购入库'])
+    : formType.value === 'edit'
+      ? $t('ui.actionTitle.edit', ['采购入库'])
+      : '采购入库详情',
+);
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -67,28 +70,48 @@ const [Form, formApi] = useVbenForm({
   schema: useFormSchema(formType.value),
   showDefaultActions: false,
   handleValuesChange: (values, changedFields) => {
-    if (formData.value && changedFields.includes('otherPrice')) {
-      formData.value.otherPrice = values.otherPrice;
-      formData.value.totalPrice =
-        (formData.value.discountedPrice || 0) +
-        (formData.value.otherPrice || 0);
-
-      formApi.setValues(formData.value, false);
+    // 目的：同步到 item-form 组件，触发整体的价格计算
+    if (formData.value) {
+      if (changedFields.includes('otherPrice')) {
+        formData.value.otherPrice = values.otherPrice;
+      }
+      if (changedFields.includes('discountPercent')) {
+        formData.value.discountPercent = values.discountPercent;
+      }
     }
   },
 });
 
-// TODO @XuZhiqiang 注释风格：使用 /** */
-// 更新采购入库项
-const handleUpdateItems = async (items: ErpPurchaseInApi.PurchaseInItem[]) => {
-  if (formData.value) {
-    const data = await formApi.getValues();
-    formData.value = { ...data, items };
-    await formApi.setValues(formData.value, false);
-  }
+/** 更新采购入库项 */
+const handleUpdateItems = (items: ErpPurchaseInApi.PurchaseInItem[]) => {
+  formData.value.items = items;
+  formApi.setValues({
+    items,
+  });
 };
 
-// 选择采购订单
+/** 更新其他费用 */
+const handleUpdateOtherPrice = (otherPrice: number) => {
+  formApi.setValues({
+    otherPrice,
+  });
+};
+
+/** 更新优惠金额 */
+const handleUpdateDiscountPrice = (discountPrice: number) => {
+  formApi.setValues({
+    discountPrice,
+  });
+};
+
+/** 更新总金额 */
+const handleUpdateTotalPrice = (totalPrice: number) => {
+  formApi.setValues({
+    totalPrice,
+  });
+};
+
+/** 选择采购订单 */
 const handleUpdateOrder = (order: ErpPurchaseOrderApi.PurchaseOrder) => {
   formData.value = {
     ...formData.value,
@@ -110,45 +133,9 @@ const handleUpdateOrder = (order: ErpPurchaseOrderApi.PurchaseOrder) => {
   formData.value.items = order.items!.filter(
     (item) => item.count && item.count > 0,
   ) as ErpPurchaseInApi.PurchaseInItem[];
-
   formApi.setValues(formData.value, false);
 };
 
-watch(
-  () => formData.value.items!,
-  (newItems: ErpPurchaseInApi.PurchaseInItem[]) => {
-    if (newItems && newItems.length > 0) {
-      // 计算每个产品的总价、税额和总价
-      newItems.forEach((item) => {
-        item.totalProductPrice = (item.productPrice || 0) * (item.count || 0);
-        item.taxPrice =
-          (item.totalProductPrice || 0) * ((item.taxPercent || 0) / 100);
-        item.totalPrice = (item.totalProductPrice || 0) + (item.taxPrice || 0);
-      });
-      // 计算总价
-      formData.value.totalPrice = newItems.reduce((sum, item) => {
-        return sum + (item.totalProductPrice || 0) + (item.taxPrice || 0);
-      }, 0);
-    } else {
-      formData.value.totalPrice = 0;
-    }
-    // 优惠金额
-    formData.value.discountPrice =
-      ((formData.value.totalPrice || 0) *
-        (formData.value.discountPercent || 0)) /
-      100;
-    // 优惠后价格
-    formData.value.discountedPrice =
-      formData.value.totalPrice - formData.value.discountPrice;
-
-    // 计算最终价格(包含其他费用)
-    formData.value.totalPrice =
-      formData.value.discountedPrice + (formData.value.otherPrice || 0);
-    formApi.setValues(formData.value, false);
-  },
-  { immediate: true },
-);
-
 /** 创建或更新采购入库 */
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
@@ -156,41 +143,19 @@ const [Modal, modalApi] = useVbenModal({
     if (!valid) {
       return;
     }
-    await nextTick();
-
     const itemFormInstance = Array.isArray(itemFormRef.value)
       ? itemFormRef.value[0]
       : itemFormRef.value;
-    if (itemFormInstance && typeof itemFormInstance.validate === 'function') {
-      try {
-        const isValid = await itemFormInstance.validate();
-        if (!isValid) {
-          message.error('子表单验证失败');
-          return;
-        }
-      } catch (error: any) {
-        message.error(error.message || '子表单验证失败');
-        return;
-      }
-    } else {
-      message.error('子表单验证方法不存在');
-      return;
-    }
-
-    // 验证产品清单不能为空
-    if (!formData.value?.items || formData.value.items.length === 0) {
-      message.error('产品清单不能为空，请至少添加一个产品');
+    try {
+      itemFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
       return;
     }
 
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as ErpPurchaseInApi.PurchaseIn;
-    data.items = formData.value?.items?.map((item) => ({
-      ...item,
-      // 解决新增采购入库报错
-      id: undefined,
-    }));
     try {
       await (formType.value === 'create'
         ? createPurchaseIn(data)
@@ -198,110 +163,64 @@ const [Modal, modalApi] = useVbenModal({
       // 关闭并提示
       await modalApi.close();
       emit('success');
-      message.success(formType.value === 'create' ? '新增成功' : '更新成功');
+      message.success($t('ui.actionMessage.operationSuccess'));
     } finally {
       modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      formData.value = {
-        id: undefined,
-        no: undefined,
-        accountId: undefined,
-        inTime: undefined,
-        remark: undefined,
-        fileUrl: undefined,
-        discountPercent: 0,
-        supplierId: undefined,
-        discountPrice: 0,
-        totalPrice: 0,
-        otherPrice: 0,
-        items: [],
-      };
-      await formApi.setValues(formData.value, false);
+      formData.value = undefined;
       return;
     }
     // 加载数据
     const data = modalApi.getData<{ id?: number; type: string }>();
-    if (!data) {
-      return;
-    }
     formType.value = data.type;
+    formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
-
-    if (!data.id) {
-      // 初始化空的表单数据
-      formData.value = {
-        id: undefined,
-        no: undefined,
-        accountId: undefined,
-        inTime: undefined,
-        remark: undefined,
-        fileUrl: undefined,
-        discountPercent: 0,
-        supplierId: undefined,
-        discountPrice: 0,
-        totalPrice: 0,
-        otherPrice: 0,
-        items: [],
-      } as unknown as ErpPurchaseInApi.PurchaseIn;
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init([]);
+    if (!data || !data.id) {
+      // 新增时，默认选中账户
+      const accountList = await getAccountSimpleList();
+      const defaultAccount = accountList.find((item) => item.defaultStatus);
+      if (defaultAccount) {
+        await formApi.setValues({ accountId: defaultAccount.id });
       }
       return;
     }
-
     modalApi.lock();
     try {
       formData.value = await getPurchaseIn(data.id);
-
       // 设置到 values
       await formApi.setValues(formData.value, false);
-      // 初始化子表单
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init(formData.value.items || []);
-      }
     } finally {
       modalApi.unlock();
     }
   },
 });
-
-defineExpose({ modalApi });
 </script>
 
 <template>
   <Modal
-    v-bind="$attrs"
     :title="getTitle"
-    class="w-2/3"
-    :closable="true"
-    :mask-closable="true"
+    class="w-3/4"
     :show-confirm-button="formType !== 'detail'"
   >
     <Form class="mx-3">
-      <template #product="slotProps">
-        <PurchaseInItemForm
-          v-bind="slotProps"
+      <template #items>
+        <ItemForm
           ref="itemFormRef"
-          class="w-full"
           :items="formData?.items ?? []"
           :disabled="formType === 'detail'"
+          :discount-percent="formData?.discountPercent ?? 0"
+          :other-price="formData?.otherPrice ?? 0"
           @update:items="handleUpdateItems"
+          @update:discount-price="handleUpdateDiscountPrice"
+          @update:other-price="handleUpdateOtherPrice"
+          @update:total-price="handleUpdateTotalPrice"
         />
       </template>
-      <template #orderNo="slotProps">
-        <SelectPurchaseOrderForm
-          v-bind="slotProps"
+      <template #orderNo>
+        <PurchaseOrderSelect
           :order-no="formData?.orderNo"
           @update:order="handleUpdateOrder"
         />
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/item-form.vue
similarity index 39%
rename from apps/web-antd/src/views/erp/purchase/in/modules/purchase-in-item-form.vue
rename to apps/web-antd/src/views/erp/purchase/in/modules/item-form.vue
index 31c6f6d70527588ef428c6ffe817bd22acd00b78..45dce43804df82aac5ca752a8a85d093e203af62 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/item-form.vue
@@ -1,51 +1,78 @@
 <script lang="ts" setup>
 import type { ErpPurchaseInApi } from '#/api/erp/purchase/in';
 
-import { nextTick, onMounted, ref, watch } from 'vue';
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
-import { erpPriceMultiply } from '@vben/utils';
+import {
+  erpCountInputFormatter,
+  erpPriceInputFormatter,
+  erpPriceMultiply,
+} from '@vben/utils';
 
-import { InputNumber, Select } from 'ant-design-vue';
+import { Input, InputNumber, Select } from 'ant-design-vue';
 
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProductSimpleList } from '#/api/erp/product/product';
 import { getWarehouseStockCount } from '#/api/erp/stock/stock';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 
-import { usePurchaseOrderItemTableColumns } from '../data';
+import { useFormItemColumns } from '../data';
+
+interface Props {
+  items?: ErpPurchaseInApi.PurchaseInItem[];
+  disabled?: boolean;
+  discountPercent?: number;
+  otherPrice?: number;
+}
 
 const props = withDefaults(defineProps<Props>(), {
   items: () => [],
   disabled: false,
+  discountPercent: 0,
+  otherPrice: 0,
 });
 
-const emit = defineEmits(['update:items', 'update:totalPrice']);
+const emit = defineEmits([
+  'update:items',
+  'update:discount-price',
+  'update:other-price',
+  'update:total-price',
+]);
 
-interface Props {
-  items?: ErpPurchaseInApi.PurchaseInItem[];
-  disabled?: boolean;
-}
+const tableData = ref<ErpPurchaseInApi.PurchaseInItem[]>([]); // 表格数据
+const productOptions = ref<any[]>([]); // 产品下拉选项
+const warehouseOptions = ref<any[]>([]); // 仓库下拉选项
 
-const tableData = ref<ErpPurchaseInApi.PurchaseInItem[]>([]);
-const productOptions = ref<any[]>([]);
-const warehouseOptions = ref<any[]>([]);
+/** 获取表格合计数据 */
+const summaries = computed(() => {
+  return {
+    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
+    totalProductPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalProductPrice || 0),
+      0,
+    ),
+    taxPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.taxPrice || 0),
+      0,
+    ),
+    totalPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalPrice || 0),
+      0,
+    ),
+  };
+});
 
 /** 表格配置 */
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    editConfig: {
-      trigger: 'click',
-      mode: 'cell',
-    },
-    columns: usePurchaseOrderItemTableColumns(),
+    columns: useFormItemColumns(tableData.value),
     data: tableData.value,
-    border: true,
-    showOverflow: true,
-    autoResize: true,
     minHeight: 250,
-    keepSource: true,
+    autoResize: true,
+    border: true,
     rowConfig: {
-      keyField: 'id',
+      keyField: 'seq',
+      isHover: true,
     },
     pagerConfig: {
       enabled: false,
@@ -63,44 +90,68 @@ watch(
     if (!items) {
       return;
     }
-    await nextTick();
+    items.forEach((item) => initRow(item));
     tableData.value = [...items];
-    await nextTick();
-    gridApi.grid.reloadData(tableData.value);
+    await nextTick(); // 特殊：保证 gridApi 已经初始化
+    await gridApi.grid.reloadData(tableData.value);
+    // 更新表格列配置（目的：原数量、已入库动态列）
+    const columns = useFormItemColumns(tableData.value);
+    await gridApi.grid.reloadColumn(columns);
   },
   {
     immediate: true,
   },
 );
 
-/** 初始化 */
-onMounted(async () => {
-  productOptions.value = await getProductSimpleList();
-  warehouseOptions.value = await getWarehouseSimpleList();
-});
+/** 计算 discountPrice、otherPrice、totalPrice 价格 */
+watch(
+  () => [tableData.value, props.discountPercent, props.otherPrice],
+  () => {
+    if (!tableData.value || tableData.value.length === 0) {
+      return;
+    }
+    const totalPrice = tableData.value.reduce(
+      (prev, curr) => prev + (curr.totalPrice || 0),
+      0,
+    );
+    const discountPrice =
+      props.discountPercent === null
+        ? 0
+        : erpPriceMultiply(totalPrice, props.discountPercent / 100);
+    const discountedPrice = totalPrice - discountPrice!;
+    const finalTotalPrice = discountedPrice + (props.otherPrice || 0);
 
-function handlePriceChange(row: any) {
-  if (row.productPrice && row.count) {
-    row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
-    row.taxPrice =
-      erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
-    row.totalPrice = row.totalProductPrice + row.taxPrice;
+    // 通知父组件更新
+    emit('update:discount-price', discountPrice);
+    emit('update:other-price', props.otherPrice || 0);
+    emit('update:total-price', finalTotalPrice);
+  },
+  { deep: true },
+);
+
+/** 处理删除 */
+function handleDelete(row: ErpPurchaseInApi.PurchaseInItem) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index !== -1) {
+    tableData.value.splice(index, 1);
   }
-  handleUpdateValue(row);
+  // 通知父组件更新
+  emit('update:items', [...tableData.value]);
 }
 
+/** 处理仓库变更 */
 const handleWarehouseChange = async (row: ErpPurchaseInApi.PurchaseInItem) => {
-  const warehouseId = row.warehouseId;
   const stockCount = await getWarehouseStockCount({
     productId: row.productId!,
-    warehouseId: warehouseId!,
+    warehouseId: row.warehouseId!,
   });
   row.stockCount = stockCount || 0;
-  handleUpdateValue(row);
+  handleRowChange(row);
 };
 
-function handleUpdateValue(row: any) {
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index === -1) {
     tableData.value.push(row);
   } else {
@@ -109,87 +160,39 @@ function handleUpdateValue(row: any) {
   emit('update:items', [...tableData.value]);
 }
 
-const getSummaries = (): {
-  count: number;
-  productName: string;
-  taxPrice: number;
-  totalPrice: number;
-  totalProductPrice: number;
-} => {
-  const count = tableData.value.reduce(
-    (sum, item) => sum + (item.count || 0),
-    0,
-  );
-  const totalProductPrice = tableData.value.reduce(
-    (sum, item) => sum + (item.totalProductPrice || 0),
-    0,
-  );
-  const taxPrice = tableData.value.reduce(
-    (sum, item) => sum + (item.taxPrice || 0),
-    0,
-  );
-  const totalPrice = tableData.value.reduce(
-    (sum, item) => sum + (item.totalPrice || 0),
-    0,
-  );
-  return {
-    productName: '合计',
-    count,
-    totalProductPrice,
-    taxPrice,
-    totalPrice,
-  };
+/** 初始化行数据 */
+const initRow = (row: ErpPurchaseInApi.PurchaseInItem): void => {
+  if (row.productPrice && row.count) {
+    row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+    row.taxPrice =
+      erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
+    row.totalPrice = row.totalProductPrice + row.taxPrice;
+  }
 };
 
-const validate = async (): Promise<boolean> => {
-  try {
-    for (let i = 0; i < tableData.value.length; i++) {
-      const item = tableData.value[i];
-      if (item) {
-        if (!item.warehouseId) {
-          throw new Error(`第 ${i + 1} 行：仓库不能为空`);
-        }
-        if (!item.count || item.count <= 0) {
-          throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
-        }
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (item) {
+      if (!item.warehouseId) {
+        throw new Error(`第 ${i + 1} 行：仓库不能为空`);
+      }
+      if (!item.count || item.count <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
       }
     }
-    return true;
-  } catch (error) {
-    console.error('验证失败:', error);
-    throw error;
   }
-};
-
-const getData = (): ErpPurchaseInApi.PurchaseInItem[] => tableData.value;
-const init = (items: ErpPurchaseInApi.PurchaseInItem[] | undefined): void => {
-  tableData.value =
-    items && items.length > 0
-      ? items.map((item) => {
-          const newItem = { ...item };
-          if (newItem.productPrice && newItem.count) {
-            newItem.totalProductPrice =
-              erpPriceMultiply(newItem.productPrice, newItem.count) ?? 0;
-            newItem.taxPrice =
-              erpPriceMultiply(
-                newItem.totalProductPrice,
-                (newItem.taxPercent || 0) / 100,
-              ) ?? 0;
-            newItem.totalPrice = newItem.totalProductPrice + newItem.taxPrice;
-          }
-          return newItem;
-        })
-      : [];
-  // TODO @XuZhiqiang：使用 await 风格哈；
-  nextTick(() => {
-    gridApi.grid.reloadData(tableData.value);
-  });
-};
+}
 
 defineExpose({
   validate,
-  getData,
-  init,
+});
+
+/** 初始化 */
+onMounted(async () => {
+  productOptions.value = await getProductSimpleList();
+  warehouseOptions.value = await getWarehouseSimpleList();
 });
 </script>
 
@@ -213,29 +216,60 @@ defineExpose({
         v-model:value="row.productId"
         :options="productOptions"
         :field-names="{ label: 'name', value: 'id' }"
-        style="width: 100%"
+        class="w-full"
         placeholder="请选择产品"
         show-search
       />
     </template>
-
     <template #count="{ row }">
       <InputNumber
         v-if="!disabled"
         v-model:value="row.count"
         :min="0"
         :precision="2"
-        @change="handlePriceChange(row)"
+        @change="handleRowChange(row)"
       />
-      <span v-else>{{ row.count || '-' }}</span>
+      <span v-else>{{ erpCountInputFormatter(row.count) || '-' }}</span>
     </template>
     <template #productPrice="{ row }">
       <InputNumber
-        disabled
+        v-if="!disabled"
         v-model:value="row.productPrice"
         :min="0"
         :precision="2"
-        @change="handlePriceChange(row)"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ erpPriceInputFormatter(row.productPrice) || '-' }}</span>
+    </template>
+    <template #remark="{ row }">
+      <Input v-if="!disabled" v-model:value="row.remark" class="w-full" />
+      <span v-else>{{ row.remark || '-' }}</span>
+    </template>
+    <template #taxPercent="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.taxPercent"
+        :min="0"
+        :max="100"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ row.taxPercent || '-' }}</span>
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        v-if="!disabled"
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该产品吗？',
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
       />
     </template>
 
@@ -244,10 +278,14 @@ defineExpose({
         <div class="text-muted-foreground flex justify-between text-sm">
           <span class="text-foreground font-medium">合计：</span>
           <div class="flex space-x-4">
-            <span>数量：{{ getSummaries().count }}</span>
-            <span>金额：{{ getSummaries().totalProductPrice }}</span>
-            <span>税额：{{ getSummaries().taxPrice }}</span>
-            <span>税额合计：{{ getSummaries().totalPrice }}</span>
+            <span>数量：{{ erpCountInputFormatter(summaries.count) }}</span>
+            <span>
+              金额：{{ erpPriceInputFormatter(summaries.totalProductPrice) }}
+            </span>
+            <span>税额：{{ erpPriceInputFormatter(summaries.taxPrice) }}</span>
+            <span>
+              税额合计：{{ erpPriceInputFormatter(summaries.totalPrice) }}
+            </span>
           </div>
         </div>
       </div>
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/purchase-order-select.vue
similarity index 44%
rename from apps/web-antd/src/views/erp/purchase/in/modules/select-purchase-order-grid.vue
rename to apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue
index 25fdd9fb447576e1c8e12b436b758ad4927ccfd9..2f28dc454cc8450f7c4079eb9e689640c5a27a82 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/purchase-order-select.vue
@@ -2,13 +2,36 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 
+import { ref } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, message, Modal } from 'ant-design-vue';
+
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getPurchaseOrderPage } from '#/api/erp/purchase/order';
 
 import { useOrderGridColumns, useOrderGridFormSchema } from '../data';
 
-const emit = defineEmits(['selectRow']);
+defineProps({
+  orderNo: {
+    type: String,
+    default: () => undefined,
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits<{
+  'update:order': [order: ErpPurchaseOrderApi.PurchaseOrder];
+}>();
+
+const order = ref<ErpPurchaseOrderApi.PurchaseOrder>(); // 选择的采购订单
+const open = ref<boolean>(false); // 选择采购订单弹窗是否打开
 
+/** 表格配置 */
 const [Grid] = useVbenVxeGrid({
   formOptions: {
     schema: useOrderGridFormSchema(),
@@ -44,12 +67,51 @@ const [Grid] = useVbenVxeGrid({
   } as VxeTableGridOptions<ErpPurchaseOrderApi.PurchaseOrder>,
   gridEvents: {
     radioChange: ({ row }: { row: ErpPurchaseOrderApi.PurchaseOrder }) => {
-      emit('selectRow', row);
+      handleSelectOrder(row);
     },
   },
 });
+
+/** 选择采购订单 */
+function handleSelectOrder(selectOrder: ErpPurchaseOrderApi.PurchaseOrder) {
+  order.value = selectOrder;
+}
+
+/** 确认选择采购订单 */
+const handleOk = () => {
+  if (!order.value) {
+    message.warning('请选择一个采购订单');
+    return;
+  }
+  emit('update:order', order.value);
+  open.value = false;
+};
 </script>
 
 <template>
-  <Grid class="max-h-[600px]" table-title="采购订单列表(仅展示可入库)" />
+  <Input
+    readonly
+    :value="orderNo"
+    :disabled="disabled"
+    @click="() => !disabled && (open = true)"
+  >
+    <template #addonAfter>
+      <div>
+        <IconifyIcon
+          class="h-full w-6 cursor-pointer"
+          icon="ant-design:setting-outlined"
+          :style="{ cursor: disabled ? 'not-allowed' : 'pointer' }"
+          @click="() => !disabled && (open = true)"
+        />
+      </div>
+    </template>
+  </Input>
+  <Modal
+    class="!w-[50vw]"
+    v-model:open="open"
+    title="选择关联订单"
+    @ok="handleOk"
+  >
+    <Grid class="max-h-[600px]" table-title="采购订单列表(仅展示可退货)" />
+  </Modal>
 </template>
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
deleted file mode 100644
index 971c1ab17b99ba3a6933d112be6bbeb8c9fef595..0000000000000000000000000000000000000000
--- a/apps/web-antd/src/views/erp/purchase/in/modules/select-purchase-order-form.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<script lang="ts" setup>
-import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
-
-import { ref } from 'vue';
-
-import { IconifyIcon } from '@vben/icons';
-
-import { Input, message, Modal } from 'ant-design-vue';
-
-import SelectPurchaseOrderGrid from './select-purchase-order-grid.vue';
-
-const props = defineProps({
-  orderNo: {
-    type: String,
-    default: () => undefined,
-  },
-  disabled: {
-    type: Boolean,
-    default: false,
-  },
-});
-const emit = defineEmits<{
-  'update:order': [order: ErpPurchaseOrderApi.PurchaseOrder];
-}>();
-const order = ref<ErpPurchaseOrderApi.PurchaseOrder>();
-const open = ref<boolean>(false);
-
-const handleSelectOrder = (selectOrder: ErpPurchaseOrderApi.PurchaseOrder) => {
-  order.value = selectOrder;
-};
-
-const handleOk = () => {
-  if (!order.value) {
-    message.warning('请选择一个采购订单');
-    return;
-  }
-  emit('update:order', order.value);
-  open.value = false;
-};
-</script>
-
-<template>
-  <Input
-    v-bind="$attrs"
-    readonly
-    :value="orderNo"
-    :disabled="disabled"
-    @click="() => !disabled && (open = true)"
-  >
-    <template #addonAfter>
-      <div>
-        <IconifyIcon
-          class="h-full w-6 cursor-pointer"
-          icon="ant-design:setting-outlined"
-          :style="{ cursor: props.disabled ? 'not-allowed' : 'pointer' }"
-          @click="() => !props.disabled && (open = true)"
-        />
-      </div>
-    </template>
-  </Input>
-  <Modal
-    v-model:open="open"
-    title="选择关联订单"
-    class="!w-[50vw]"
-    :show-confirm-button="true"
-    @ok="handleOk"
-  >
-    <SelectPurchaseOrderGrid @select-row="handleSelectOrder" />
-  </Modal>
-</template>
diff --git a/apps/web-antd/src/views/erp/purchase/order/data.ts b/apps/web-antd/src/views/erp/purchase/order/data.ts
index 7da9466bc14513f7362825039345a939f2c90874..1ca7e5a57112393df0f1b3ddd95b4628ad163f1b 100644
--- a/apps/web-antd/src/views/erp/purchase/order/data.ts
+++ b/apps/web-antd/src/views/erp/purchase/order/data.ts
@@ -10,30 +10,43 @@ import { getAccountSimpleList } from '#/api/erp/finance/account';
 import { getProductSimpleList } from '#/api/erp/product/product';
 import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
 import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 表单的配置项 */
-export function useFormSchema(): VbenFormSchema[] {
+export function useFormSchema(formType: string): VbenFormSchema[] {
   return [
     {
+      fieldName: 'id',
       component: 'Input',
-      componentProps: {
-        style: { display: 'none' },
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
       },
-      fieldName: 'id',
-      label: 'ID',
-      hideLabel: true,
-      formItemClass: 'hidden',
     },
     {
+      fieldName: 'no',
+      label: '订单单号',
       component: 'Input',
       componentProps: {
         placeholder: '系统自动生成',
         disabled: true,
       },
-      fieldName: 'no',
-      label: '订单单号',
     },
     {
+      fieldName: 'orderTime',
+      label: '订单时间',
+      component: 'DatePicker',
+      componentProps: {
+        placeholder: '选择订单时间',
+        showTime: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      label: '供应商',
+      fieldName: 'supplierId',
       component: 'ApiSelect',
       componentProps: {
         placeholder: '请选择供应商',
@@ -45,35 +58,22 @@ export function useFormSchema(): VbenFormSchema[] {
           value: 'id',
         },
       },
-      fieldName: 'supplierId',
-      label: '供应商',
-      rules: 'required',
-    },
-    {
-      component: 'DatePicker',
-      componentProps: {
-        placeholder: '选择订单时间',
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-        style: { width: '100%' },
-      },
-      fieldName: 'orderTime',
-      label: '订单时间',
       rules: 'required',
     },
     {
+      fieldName: 'remark',
+      label: '备注',
       component: 'Textarea',
       componentProps: {
         placeholder: '请输入备注',
-        autoSize: { minRows: 2, maxRows: 4 },
-        class: 'w-full',
+        autoSize: { minRows: 1, maxRows: 1 },
+        disabled: formType === 'detail',
       },
-      fieldName: 'remark',
-      label: '备注',
-      formItemClass: 'col-span-3',
+      formItemClass: 'col-span-2',
     },
     {
+      fieldName: 'fileUrl',
+      label: '附件',
       component: 'FileUpload',
       componentProps: {
         maxNumber: 1,
@@ -89,56 +89,54 @@ export function useFormSchema(): VbenFormSchema[] {
           'jpeg',
           'png',
         ],
-        showDescription: true,
+        showDescription: formType !== 'detail',
+        disabled: formType === 'detail',
       },
-      fieldName: 'fileUrl',
-      label: '附件',
       formItemClass: 'col-span-3',
     },
     {
-      fieldName: 'product',
-      label: '产品清单',
+      fieldName: 'items',
+      label: '采购产品清单',
       component: 'Input',
       formItemClass: 'col-span-3',
     },
     {
+      fieldName: 'discountPercent',
+      label: '优惠率(%)',
       component: 'InputNumber',
       componentProps: {
         placeholder: '请输入优惠率',
         min: 0,
         max: 100,
         precision: 2,
-        style: { width: '100%' },
       },
-      fieldName: 'discountPercent',
-      label: '优惠率(%)',
       rules: z.number().min(0).optional(),
     },
     {
+      fieldName: 'discountPrice',
+      label: '付款优惠',
       component: 'InputNumber',
       componentProps: {
         placeholder: '付款优惠',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
-        style: { width: '100%' },
       },
-      fieldName: 'discountPrice',
-      label: '付款优惠',
     },
     {
+      fieldName: 'totalPrice',
+      label: '优惠后金额',
       component: 'InputNumber',
       componentProps: {
         placeholder: '优惠后金额',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
-        style: { width: '100%' },
       },
-      fieldName: 'totalPrice',
-      label: '优惠后金额',
     },
     {
+      fieldName: 'accountId',
+      label: '结算账户',
       component: 'ApiSelect',
       componentProps: {
         placeholder: '请选择结算账户',
@@ -150,15 +148,12 @@ export function useFormSchema(): VbenFormSchema[] {
           value: 'id',
         },
       },
-      fieldName: 'accountId',
-      label: '结算账户',
     },
     {
       component: 'InputNumber',
       componentProps: {
         placeholder: '请输入支付订金',
         precision: 2,
-        style: { width: '100%' },
         min: 0,
       },
       fieldName: 'depositPrice',
@@ -168,8 +163,8 @@ export function useFormSchema(): VbenFormSchema[] {
   ];
 }
 
-/** 采购订单项表格列定义 */
-export function usePurchaseOrderItemTableColumns(): VxeTableGridOptions['columns'] {
+/** 表单的明细表格列 */
+export function useFormItemColumns(): VxeTableGridOptions['columns'] {
   return [
     { type: 'seq', title: '序号', minWidth: 50, fixed: 'left' },
     {
@@ -193,48 +188,54 @@ export function usePurchaseOrderItemTableColumns(): VxeTableGridOptions['columns
       title: '单位',
       minWidth: 80,
     },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      slots: { default: 'remark' },
+    },
     {
       field: 'count',
       title: '数量',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'count' },
     },
     {
       field: 'productPrice',
       title: '产品单价',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'productPrice' },
     },
     {
       field: 'totalProductPrice',
       title: '金额',
       minWidth: 120,
+      fixed: 'right',
       formatter: 'formatAmount2',
     },
     {
       field: 'taxPercent',
       title: '税率(%)',
-      minWidth: 100,
+      minWidth: 105,
+      fixed: 'right',
       slots: { default: 'taxPercent' },
     },
     {
       field: 'taxPrice',
       title: '税额',
       minWidth: 120,
+      fixed: 'right',
       formatter: 'formatAmount2',
     },
     {
       field: 'totalPrice',
       title: '税额合计',
       minWidth: 120,
+      fixed: 'right',
       formatter: 'formatAmount2',
     },
-    {
-      field: 'remark',
-      title: '备注',
-      minWidth: 150,
-      slots: { default: 'remark' },
-    },
     {
       title: '操作',
       width: 50,
@@ -254,7 +255,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         placeholder: '请输入订单单号',
         allowClear: true,
-        disabled: true,
       },
     },
     {
@@ -277,10 +277,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '订单时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始时间', '结束时间'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
     {
@@ -323,6 +321,29 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
       },
     },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入备注',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'inStatus',
+      label: '入库状态',
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: '未入库', value: 0 },
+          { label: '部分入库', value: 1 },
+          { label: '全部入库', value: 2 },
+        ],
+        placeholder: '请选择入库状态',
+        allowClear: true,
+      },
+    },
     {
       fieldName: 'returnStatus',
       label: '退货状态',
@@ -369,7 +390,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       field: 'orderTime',
       title: '订单时间',
       width: 160,
-      formatter: 'formatDateTime',
+      formatter: 'formatDate',
     },
     {
       field: 'creatorName',
@@ -379,34 +400,37 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'inCount',
       title: '入库数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'returnCount',
       title: '退货数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalProductPrice',
       title: '金额合计',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '含税金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'depositPrice',
       title: '支付订金',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
diff --git a/apps/web-antd/src/views/erp/purchase/order/index.vue b/apps/web-antd/src/views/erp/purchase/order/index.vue
index 8193d04e332fc59356ccd45c8ab0d94c12964a12..7e427c0c0a00f16ed2665a578d0e1392265f4366 100644
--- a/apps/web-antd/src/views/erp/purchase/order/index.vue
+++ b/apps/web-antd/src/views/erp/purchase/order/index.vue
@@ -12,7 +12,6 @@ import { message } from 'ant-design-vue';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
   deletePurchaseOrder,
-  deletePurchaseOrderList,
   exportPurchaseOrder,
   getPurchaseOrderPage,
   updatePurchaseOrderStatus,
@@ -20,81 +19,70 @@ import {
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import PurchaseOrderForm from './modules/form.vue';
+import Form from './modules/form.vue';
 
 /** ERP 采购订单列表 */
 defineOptions({ name: 'ErpPurchaseOrder' });
 
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: PurchaseOrderForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 详情 */
-function handleDetail(row: ErpPurchaseOrderApi.PurchaseOrder) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportPurchaseOrder(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '采购订单.xls', source: data });
 }
 
-/** 新增 */
+/** 新增采购订单 */
 function handleCreate() {
   formModalApi.setData({ type: 'create' }).open();
 }
 
-/** 编辑 */
+/** 编辑采购订单 */
 function handleEdit(row: ErpPurchaseOrderApi.PurchaseOrder) {
   formModalApi.setData({ type: 'edit', id: row.id }).open();
 }
 
-/** 删除 */
-async function handleDelete(row: ErpPurchaseOrderApi.PurchaseOrder) {
+/** 删除采购订单 */
+async function handleDelete(ids: number[]) {
   const hideLoading = message.loading({
     content: $t('ui.actionMessage.deleting'),
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
-    if (row.id) await deletePurchaseOrder(row.id);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess'),
-      key: 'action_process_msg',
-    });
-    onRefresh();
-  } catch {
-    // 处理错误
+    await deletePurchaseOrder(ids);
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
-/** 批量删除 */
-// TODO @nehc handleBatchDelete 是不是和别的模块，一个风格
-async function handleBatchDelete() {
+/** 审批/反审批操作 */
+async function handleUpdateStatus(
+  row: ErpPurchaseOrderApi.PurchaseOrder,
+  status: number,
+) {
   const hideLoading = message.loading({
-    content: $t('ui.actionMessage.deleting'),
+    content: `确定${status === 20 ? '审批' : '反审批'}该订单吗？`,
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
-    await deletePurchaseOrderList(checkedIds.value);
-    checkedIds.value = [];
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess'),
-      key: 'action_process_msg',
-    });
-    onRefresh();
-  } catch {
-    // 处理错误
+    await updatePurchaseOrderStatus(row.id!, status);
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`);
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
-// TODO @Xuzhiqiang：批量删除待实现
 const checkedIds = ref<number[]>([]);
 function handleRowCheckboxChange({
   records,
@@ -104,37 +92,9 @@ function handleRowCheckboxChange({
   checkedIds.value = records.map((item) => item.id!);
 }
 
-/** 审批/反审批操作 */
-function handleUpdateStatus(
-  row: ErpPurchaseOrderApi.PurchaseOrder,
-  status: number,
-) {
-  // TODO @nehc 是不是和别的模块，类似的 status 处理一个风格
-  const hideLoading = message.loading({
-    content: `确定${status === 20 ? '审批' : '反审批'}该订单吗？`,
-    duration: 0,
-    key: 'action_process_msg',
-  });
-  updatePurchaseOrderStatus(row.id!, status)
-    .then(() => {
-      message.success({
-        content: `${status === 20 ? '审批' : '反审批'}成功`,
-        key: 'action_process_msg',
-      });
-      onRefresh();
-    })
-    .catch(() => {
-      // 处理错误
-    })
-    .finally(() => {
-      hideLoading();
-    });
-}
-
-/** 导出 */
-async function handleExport() {
-  const data = await exportPurchaseOrder(await gridApi.formApi.getValues());
-  downloadFileFromBlobPart({ fileName: '采购订单.xls', source: data });
+/** 查看详情 */
+function handleDetail(row: ErpPurchaseOrderApi.PurchaseOrder) {
+  formModalApi.setData({ type: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -181,8 +141,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
 
-    <FormModal @success="onRefresh" />
-
+    <FormModal @success="handleRefresh" />
     <Grid table-title="采购订单列表">
       <template #toolbar-tools>
         <TableAction
@@ -210,7 +169,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               auth: ['erp:purchase-order:delete'],
               popConfirm: {
                 title: `是否删除所选中数据？`,
-                confirm: handleBatchDelete,
+                confirm: handleDelete.bind(null, checkedIds),
               },
             },
           ]"
@@ -234,8 +193,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
               ifShow: () => row.status !== 20,
               onClick: handleEdit.bind(null, row),
             },
-          ]"
-          :drop-down-actions="[
             {
               label: row.status === 10 ? '审批' : '反审批',
               type: 'link',
@@ -255,10 +212,9 @@ const [Grid, gridApi] = useVbenVxeGrid({
               danger: true,
               color: 'error',
               auth: ['erp:purchase-order:delete'],
-              onClick: handleDelete.bind(null, row),
               popConfirm: {
                 title: $t('ui.actionMessage.deleteConfirm', [row.no]),
-                confirm: handleDelete.bind(null, row),
+                confirm: handleDelete.bind(null, [row.id!]),
               },
             },
           ]"
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 cd33905033b35b51496608af9397e5f06a70baee..2fa57d4136e9fdc24bed45e0b56bbad863fdbb16 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
@@ -1,32 +1,37 @@
 <script lang="ts" setup>
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 
-import { computed, nextTick, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
 import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
+import { getAccountSimpleList } from '#/api/erp/finance/account';
 import {
   createPurchaseOrder,
   getPurchaseOrder,
   updatePurchaseOrder,
 } from '#/api/erp/purchase/order';
+import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
-import PurchaseOrderItemForm from './purchase-order-item-form.vue';
+import PurchaseOrderItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpPurchaseOrderApi.PurchaseOrder>();
-const formType = ref('');
-const itemFormRef = ref();
-
-const getTitle = computed(() => {
-  if (formType.value === 'create') return '添加采购订单';
-  if (formType.value === 'update') return '编辑采购订单';
-  return '采购订单详情';
-});
+const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const itemFormRef = ref<InstanceType<typeof PurchaseOrderItemForm>>();
+
+/* eslint-disable unicorn/no-nested-ternary */
+const getTitle = computed(() =>
+  formType.value === 'create'
+    ? $t('ui.actionTitle.create', ['采购订单'])
+    : formType.value === 'update'
+      ? $t('ui.actionTitle.edit', ['采购订单'])
+      : '采购订单详情',
+);
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -37,38 +42,37 @@ const [Form, formApi] = useVbenForm({
   },
   wrapperClass: 'grid-cols-3',
   layout: 'vertical',
-  schema: useFormSchema(),
+  schema: useFormSchema(formType.value),
   showDefaultActions: false,
   handleValuesChange: (values, changedFields) => {
+    // 目的：同步到 item-form 组件，触发整体的价格计算
     if (formData.value && changedFields.includes('discountPercent')) {
       formData.value.discountPercent = values.discountPercent;
     }
   },
 });
 
+/** 更新采购订单项 */
 const handleUpdateItems = (items: ErpPurchaseOrderApi.PurchaseOrderItem[]) => {
   formData.value = modalApi.getData<ErpPurchaseOrderApi.PurchaseOrder>();
-  if (formData.value) {
-    formData.value.items = items;
-  }
+  formData.value.items = items;
+  formApi.setValues({
+    items,
+  });
 };
 
+/** 更新优惠金额 */
 const handleUpdateDiscountPrice = (discountPrice: number) => {
-  if (formData.value) {
-    formData.value.discountPrice = discountPrice;
-    formApi.setValues({
-      discountPrice: formData.value.discountPrice,
-    });
-  }
+  formApi.setValues({
+    discountPrice,
+  });
 };
 
+/** 更新总金额 */
 const handleUpdateTotalPrice = (totalPrice: number) => {
-  if (formData.value) {
-    formData.value.totalPrice = totalPrice;
-    formApi.setValues({
-      totalPrice: formData.value.totalPrice,
-    });
-  }
+  formApi.setValues({
+    totalPrice,
+  });
 };
 
 /** 创建或更新采购订单 */
@@ -78,31 +82,13 @@ const [Modal, modalApi] = useVbenModal({
     if (!valid) {
       return;
     }
-    await nextTick();
-
-    // TODO @nehc：应该不会不存在，直接校验，简洁一点！另外，可以看看别的模块，主子表的处理哈；
     const itemFormInstance = Array.isArray(itemFormRef.value)
       ? itemFormRef.value[0]
       : itemFormRef.value;
-    if (itemFormInstance && typeof itemFormInstance.validate === 'function') {
-      try {
-        const isValid = await itemFormInstance.validate();
-        if (!isValid) {
-          message.error('子表单验证失败');
-          return;
-        }
-      } catch (error: any) {
-        message.error(error.message || '子表单验证失败');
-        return;
-      }
-    } else {
-      message.error('子表单验证方法不存在');
-      return;
-    }
-
-    // 验证产品清单不能为空
-    if (!formData.value?.items || formData.value.items.length === 0) {
-      message.error('产品清单不能为空，请至少添加一个产品');
+    try {
+      itemFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
       return;
     }
 
@@ -126,7 +112,7 @@ const [Modal, modalApi] = useVbenModal({
       // 关闭并提示
       await modalApi.close();
       emit('success');
-      message.success(formType.value === 'create' ? '新增成功' : '更新成功');
+      message.success($t('ui.actionMessage.operationSuccess'));
     } finally {
       modalApi.unlock();
     }
@@ -138,62 +124,40 @@ const [Modal, modalApi] = useVbenModal({
     }
     // 加载数据
     const data = modalApi.getData<{ id?: number; type: string }>();
-    if (!data) {
-      return;
-    }
     formType.value = data.type;
-
-    if (!data.id) {
-      // 初始化空的表单数据
-      formData.value = { items: [] } as ErpPurchaseOrderApi.PurchaseOrder;
-      await nextTick();
-      // TODO @nehc：看看有没办法简化
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init([]);
+    formApi.setDisabled(formType.value === 'detail');
+    formApi.updateSchema(useFormSchema(formType.value));
+    if (!data || !data.id) {
+      // 新增时，默认选中账户
+      const accountList = await getAccountSimpleList();
+      const defaultAccount = accountList.find((item) => item.defaultStatus);
+      if (defaultAccount) {
+        await formApi.setValues({ accountId: defaultAccount.id });
       }
       return;
     }
-
     modalApi.lock();
     try {
       formData.value = await getPurchaseOrder(data.id);
       // 设置到 values
       await formApi.setValues(formData.value);
-      // 初始化子表单
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init(formData.value.items || []);
-      }
     } finally {
       modalApi.unlock();
     }
   },
 });
-
-defineExpose({ modalApi });
 </script>
 
 <template>
   <Modal
-    v-bind="$attrs"
     :title="getTitle"
-    class="w-1/2"
-    :closable="true"
-    :mask-closable="true"
+    class="w-3/4"
     :show-confirm-button="formType !== 'detail'"
   >
     <Form class="mx-3">
-      <template #product="slotProps">
+      <template #items>
         <PurchaseOrderItemForm
-          v-bind="slotProps"
           ref="itemFormRef"
-          class="w-full"
           :items="formData?.items ?? []"
           :disabled="formType === 'detail'"
           :discount-percent="formData?.discountPercent ?? 0"
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/item-form.vue
similarity index 60%
rename from apps/web-antd/src/views/erp/purchase/order/modules/purchase-order-item-form.vue
rename to apps/web-antd/src/views/erp/purchase/order/modules/item-form.vue
index 0582cfc22b63bba932b9a9aceeacdc6fb309950e..9f4e840a00d619ed3ec5941baad1aba4be0bd992 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/item-form.vue
@@ -1,10 +1,14 @@
 <script lang="ts" setup>
-// TODO @nehc：看看整个逻辑，和 erp 风格的主子表，能不能更统一一些；
+import type { ErpProductApi } from '#/api/erp/product/product';
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 
-import { nextTick, onMounted, ref, watch } from 'vue';
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
-import { erpPriceMultiply } from '@vben/utils';
+import {
+  erpCountInputFormatter,
+  erpPriceInputFormatter,
+  erpPriceMultiply,
+} from '@vben/utils';
 
 import { Input, InputNumber, Select } from 'ant-design-vue';
 
@@ -12,7 +16,13 @@ import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProductSimpleList } from '#/api/erp/product/product';
 import { getStockCount } from '#/api/erp/stock/stock';
 
-import { usePurchaseOrderItemTableColumns } from '../data';
+import { useFormItemColumns } from '../data';
+
+interface Props {
+  items?: ErpPurchaseOrderApi.PurchaseOrderItem[];
+  disabled?: boolean;
+  discountPercent?: number;
+}
 
 const props = withDefaults(defineProps<Props>(), {
   items: () => [],
@@ -26,32 +36,39 @@ const emit = defineEmits([
   'update:total-price',
 ]);
 
-// TODO @nehc:这种一次性的，是不是可以不定义哈？
-interface Props {
-  items?: ErpPurchaseOrderApi.PurchaseOrderItem[];
-  disabled?: boolean;
-  discountPercent?: number;
-}
+const tableData = ref<ErpPurchaseOrderApi.PurchaseOrderItem[]>([]); // 表格数据
+const productOptions = ref<ErpProductApi.Product[]>([]); // 产品下拉选项
 
-const tableData = ref<ErpPurchaseOrderApi.PurchaseOrderItem[]>([]);
-const productOptions = ref<any[]>([]);
+/** 获取表格合计数据 */
+const summaries = computed(() => {
+  return {
+    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
+    totalProductPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalProductPrice || 0),
+      0,
+    ),
+    taxPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.taxPrice || 0),
+      0,
+    ),
+    totalPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalPrice || 0),
+      0,
+    ),
+  };
+});
 
 /** 表格配置 */
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    editConfig: {
-      trigger: 'click',
-      mode: 'cell',
-    },
-    columns: usePurchaseOrderItemTableColumns(),
+    columns: useFormItemColumns(),
     data: tableData.value,
-    border: true,
-    showOverflow: true,
-    autoResize: true,
     minHeight: 250,
-    keepSource: true,
+    autoResize: true,
+    border: true,
     rowConfig: {
-      keyField: 'id',
+      keyField: 'seq',
+      isHover: true,
     },
     pagerConfig: {
       enabled: false,
@@ -69,9 +86,9 @@ watch(
     if (!items) {
       return;
     }
-    await nextTick();
+    items.forEach((item) => initRow(item));
     tableData.value = [...items];
-    await nextTick();
+    await nextTick(); // 特殊：保证 gridApi 已经初始化
     await gridApi.grid.reloadData(tableData.value);
   },
   {
@@ -95,82 +112,64 @@ watch(
         ? 0
         : erpPriceMultiply(totalPrice, props.discountPercent / 100);
     const finalTotalPrice = totalPrice - discountPrice!;
-
-    // 发送计算结果给父组件
+    // 通知父组件更新
     emit('update:discount-price', discountPrice);
     emit('update:total-price', finalTotalPrice);
   },
   { deep: true },
 );
 
-/** 初始化 */
-onMounted(async () => {
-  productOptions.value = await getProductSimpleList();
-});
-
+/** 处理新增 */
 function handleAdd() {
   const newRow = {
+    id: undefined,
     productId: undefined,
-    productName: '',
-    productUnitId: undefined,
-    productUnitName: '',
-    productBarCode: '',
+    productUnitName: undefined, // 产品单位
+    productBarCode: undefined, // 产品条码
+    productPrice: undefined,
+    stockCount: undefined,
     count: 1,
-    productPrice: 0,
-    totalProductPrice: 0,
+    totalProductPrice: undefined,
     taxPercent: 0,
-    taxPrice: 0,
-    totalPrice: 0,
-    stockCount: 0,
-    remark: '',
+    taxPrice: undefined,
+    totalPrice: undefined,
+    remark: undefined,
   };
-  // TODO @nehc：这里的红色告警哈？
   tableData.value.push(newRow);
-  gridApi.grid.insertAt(newRow, -1);
+  // 通知父组件更新
   emit('update:items', [...tableData.value]);
 }
 
+/** 处理删除 */
 function handleDelete(row: ErpPurchaseOrderApi.PurchaseOrderItem) {
-  gridApi.grid.remove(row);
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index !== -1) {
     tableData.value.splice(index, 1);
   }
+  // 通知父组件更新
   emit('update:items', [...tableData.value]);
 }
 
+/** 处理产品变更 */
 async function handleProductChange(productId: any, row: any) {
   const product = productOptions.value.find((p) => p.id === productId);
   if (!product) {
     return;
   }
-
-  const stockCount = await getStockCount(productId);
-
   row.productId = productId;
   row.productUnitId = product.unitId;
   row.productBarCode = product.barCode;
   row.productUnitName = product.unitName;
   row.productName = product.name;
-  row.stockCount = stockCount || 0;
-  row.productPrice = product.purchasePrice;
+  row.stockCount = (await getStockCount(productId)) || 0;
+  row.productPrice = product.purchasePrice || 0;
   row.count = row.count || 1;
-
-  handlePriceChange(row);
-}
-
-function handlePriceChange(row: any) {
-  if (row.productPrice && row.count) {
-    row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
-    row.taxPrice =
-      erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
-    row.totalPrice = row.totalProductPrice + row.taxPrice;
-  }
-  handleUpdateValue(row);
+  handleRowChange(row);
 }
 
-function handleUpdateValue(row: any) {
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index === -1) {
     tableData.value.push(row);
   } else {
@@ -179,85 +178,45 @@ function handleUpdateValue(row: any) {
   emit('update:items', [...tableData.value]);
 }
 
-const getSummaries = (): {
-  count: number;
-  productName: string;
-  taxPrice: number;
-  totalPrice: number;
-  totalProductPrice: number;
-} => {
-  return {
-    productName: '合计',
-    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
-    totalProductPrice: tableData.value.reduce(
-      (sum, item) => sum + (item.totalProductPrice || 0),
-      0,
-    ),
-    taxPrice: tableData.value.reduce(
-      (sum, item) => sum + (item.taxPrice || 0),
-      0,
-    ),
-    totalPrice: tableData.value.reduce(
-      (sum, item) => sum + (item.totalPrice || 0),
-      0,
-    ),
-  };
+/** 初始化行数据 */
+const initRow = (row: ErpPurchaseOrderApi.PurchaseOrderItem): void => {
+  if (row.productPrice && row.count) {
+    row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+    row.taxPrice =
+      erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
+    row.totalPrice = row.totalProductPrice + row.taxPrice;
+  }
 };
 
-const validate = async (): Promise<boolean> => {
-  try {
-    for (let i = 0; i < tableData.value.length; i++) {
-      const item = tableData.value[i];
-      if (item) {
-        if (!item.productId) {
-          throw new Error(`第 ${i + 1} 行：产品不能为空`);
-        }
-        if (!item.count || item.count <= 0) {
-          throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
-        }
-        if (!item.productPrice || item.productPrice <= 0) {
-          throw new Error(`第 ${i + 1} 行：产品单价不能为空`);
-        }
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (item) {
+      if (!item.productId) {
+        throw new Error(`第 ${i + 1} 行：产品不能为空`);
+      }
+      if (!item.count || item.count <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
+      }
+      if (!item.productPrice || item.productPrice <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品单价不能为空`);
       }
     }
-    return true;
-  } catch (error) {
-    console.error('验证失败:', error);
-    throw error;
   }
-};
-
-const getData = (): ErpPurchaseOrderApi.PurchaseOrderItem[] => tableData.value;
-const init = (
-  items: ErpPurchaseOrderApi.PurchaseOrderItem[] | undefined,
-): void => {
-  tableData.value =
-    items && items.length > 0
-      ? items.map((item) => {
-          const newItem = { ...item };
-          if (newItem.productPrice && newItem.count) {
-            newItem.totalProductPrice =
-              erpPriceMultiply(newItem.productPrice, newItem.count) ?? 0;
-            newItem.taxPrice =
-              erpPriceMultiply(
-                newItem.totalProductPrice,
-                (newItem.taxPercent || 0) / 100,
-              ) ?? 0;
-            newItem.totalPrice = newItem.totalProductPrice + newItem.taxPrice;
-          }
-          return newItem;
-        })
-      : [];
-  // TODO @XuZhiqiang: await 风格；
-  nextTick(() => {
-    gridApi.grid.reloadData(tableData.value);
-  });
-};
+}
 
 defineExpose({
   validate,
-  getData,
-  init,
+});
+
+/** 初始化 */
+onMounted(async () => {
+  productOptions.value = await getProductSimpleList();
+  // 目的：新增时，默认添加一行
+  if (tableData.value.length === 0) {
+    handleAdd();
+  }
 });
 </script>
 
@@ -265,40 +224,39 @@ defineExpose({
   <Grid class="w-full">
     <template #productId="{ row }">
       <Select
-        v-if="!disabled"
         v-model:value="row.productId"
         :options="productOptions"
         :field-names="{ label: 'name', value: 'id' }"
-        style="width: 100%"
+        class="w-full"
         placeholder="请选择产品"
         show-search
         @change="handleProductChange($event, row)"
       />
-      <span v-else>{{ row.productName || '-' }}</span>
     </template>
-
     <template #count="{ row }">
       <InputNumber
         v-if="!disabled"
         v-model:value="row.count"
         :min="0"
-        :precision="2"
-        @change="handlePriceChange(row)"
+        :precision="3"
+        @change="handleRowChange(row)"
       />
-      <span v-else>{{ row.count || '-' }}</span>
+      <span v-else>{{ erpCountInputFormatter(row.count) || '-' }}</span>
     </template>
-
     <template #productPrice="{ row }">
       <InputNumber
         v-if="!disabled"
         v-model:value="row.productPrice"
         :min="0"
         :precision="2"
-        @change="handlePriceChange(row)"
+        @change="handleRowChange(row)"
       />
-      <span v-else>{{ row.productPrice || '-' }}</span>
+      <span v-else>{{ erpPriceInputFormatter(row.productPrice) || '-' }}</span>
+    </template>
+    <template #remark="{ row }">
+      <Input v-if="!disabled" v-model:value="row.remark" class="w-full" />
+      <span v-else>{{ row.remark || '-' }}</span>
     </template>
-
     <template #taxPercent="{ row }">
       <InputNumber
         v-if="!disabled"
@@ -306,14 +264,25 @@ defineExpose({
         :min="0"
         :max="100"
         :precision="2"
-        @change="handlePriceChange(row)"
+        @change="handleRowChange(row)"
       />
       <span v-else>{{ row.taxPercent || '-' }}</span>
     </template>
-
-    <template #remark="{ row }">
-      <Input v-if="!disabled" v-model:value="row.remark" class="w-full" />
-      <span v-else>{{ row.remark || '-' }}</span>
+    <template #actions="{ row }">
+      <TableAction
+        v-if="!disabled"
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该产品吗？',
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
     </template>
 
     <template #bottom>
@@ -321,42 +290,28 @@ defineExpose({
         <div class="text-muted-foreground flex justify-between text-sm">
           <span class="text-foreground font-medium">合计：</span>
           <div class="flex space-x-4">
-            <span>数量：{{ getSummaries().count }}</span>
-            <span>金额：{{ getSummaries().totalProductPrice }}</span>
-            <span>税额：{{ getSummaries().taxPrice }}</span>
-            <span>税额合计：{{ getSummaries().totalPrice }}</span>
+            <span>数量：{{ erpCountInputFormatter(summaries.count) }}</span>
+            <span>
+              金额：{{ erpPriceInputFormatter(summaries.totalProductPrice) }}
+            </span>
+            <span>税额：{{ erpPriceInputFormatter(summaries.taxPrice) }}</span>
+            <span>
+              税额合计：{{ erpPriceInputFormatter(summaries.totalPrice) }}
+            </span>
           </div>
         </div>
       </div>
-
       <TableAction
         v-if="!disabled"
-        class="mt-4 flex justify-center"
+        class="mt-2 flex justify-center"
         :actions="[
           {
-            label: '添加产品',
+            label: '添加采购产品',
             type: 'default',
             onClick: handleAdd,
           },
         ]"
       />
     </template>
-
-    <template #actions="{ row }">
-      <TableAction
-        v-if="!disabled"
-        :actions="[
-          {
-            label: '删除',
-            type: 'link',
-            danger: true,
-            popConfirm: {
-              title: '确认删除该产品吗？',
-              confirm: handleDelete.bind(null, row),
-            },
-          },
-        ]"
-      />
-    </template>
   </Grid>
 </template>
diff --git a/apps/web-antd/src/views/erp/purchase/return/data.ts b/apps/web-antd/src/views/erp/purchase/return/data.ts
index 595b5187a886daa392d00b13448b135111aa4bde..d82a3e67cc281b68ab6b3891f90153ff872b2032 100644
--- a/apps/web-antd/src/views/erp/purchase/return/data.ts
+++ b/apps/web-antd/src/views/erp/purchase/return/data.ts
@@ -11,45 +11,39 @@ import { getProductSimpleList } from '#/api/erp/product/product';
 import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 表单的配置项 */
 export function useFormSchema(formType: string): VbenFormSchema[] {
   return [
     {
+      fieldName: 'id',
       component: 'Input',
-      componentProps: {
-        style: { display: 'none' },
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
       },
-      fieldName: 'id',
-      label: 'ID',
-      hideLabel: true,
-      formItemClass: 'hidden',
     },
     {
+      fieldName: 'no',
+      label: '退货单号',
       component: 'Input',
       componentProps: {
         placeholder: '系统自动生成',
         disabled: true,
       },
-      fieldName: 'no',
-      label: '退货单号',
     },
-
     {
-      component: 'ApiSelect',
+      fieldName: 'returnTime',
+      label: '退货时间',
+      component: 'DatePicker',
       componentProps: {
-        disabled: true,
-        placeholder: '请选择供应商',
-        allowClear: true,
-        showSearch: true,
-        api: getSupplierSimpleList,
-        fieldNames: {
-          label: 'name',
-          value: 'id',
-        },
+        disabled: formType === 'detail',
+        placeholder: '选择退货时间',
+        showTime: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       },
-      fieldName: 'supplierId',
-      label: '供应商',
       rules: 'required',
     },
     {
@@ -59,42 +53,43 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
       formItemClass: 'col-span-1',
       rules: 'required',
       componentProps: {
-        disabled: formType === 'detail',
         placeholder: '请选择关联订单',
+        disabled: formType === 'detail',
       },
     },
     {
-      component: 'DatePicker',
+      fieldName: 'supplierId',
+      label: '供应商',
+      component: 'ApiSelect',
       componentProps: {
-        disabled: formType === 'detail',
-        placeholder: '选择退货时间',
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-        style: { width: '100%' },
+        disabled: true,
+        placeholder: '请选择供应商',
+        allowClear: true,
+        showSearch: true,
+        api: getSupplierSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
       },
-      fieldName: 'returnTime',
-      label: '退货时间',
       rules: 'required',
     },
-
     {
+      fieldName: 'remark',
+      label: '备注',
       component: 'Textarea',
       componentProps: {
         placeholder: '请输入备注',
-        disabled: formType === 'detail',
         autoSize: { minRows: 1, maxRows: 1 },
-        class: 'w-full',
+        disabled: formType === 'detail',
       },
-      fieldName: 'remark',
-      label: '备注',
       formItemClass: 'col-span-2',
     },
-
     {
+      fieldName: 'fileUrl',
+      label: '附件',
       component: 'FileUpload',
       componentProps: {
-        disabled: formType === 'detail',
         maxNumber: 1,
         maxSize: 10,
         accept: [
@@ -108,73 +103,76 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
           'jpeg',
           'png',
         ],
-        showDescription: true,
+        showDescription: formType !== 'detail',
+        disabled: formType === 'detail',
       },
-      fieldName: 'fileUrl',
-      label: '附件',
       formItemClass: 'col-span-3',
     },
     {
-      fieldName: 'product',
-      label: '产品清单',
+      fieldName: 'items',
+      label: '退货产品清单',
       component: 'Input',
       formItemClass: 'col-span-3',
     },
     {
-      component: 'InputNumber',
       fieldName: 'discountPercent',
+      label: '优惠率(%)',
+      component: 'InputNumber',
       componentProps: {
-        placeholder: '优惠率',
+        placeholder: '请输入优惠率',
         min: 0,
         max: 100,
-        disabled: true,
         precision: 2,
-        style: { width: '100%' },
       },
-
-      label: '优惠率(%)',
+      rules: z.number().min(0).optional(),
     },
     {
+      fieldName: 'discountPrice',
+      label: '退款优惠',
       component: 'InputNumber',
       componentProps: {
-        placeholder: '付款优惠',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
-        style: { width: '100%' },
       },
-      fieldName: 'discountPrice',
-      label: '付款优惠',
     },
     {
+      fieldName: 'discountedPrice',
+      label: '优惠后金额',
       component: 'InputNumber',
       componentProps: {
         placeholder: '优惠后金额',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
-        style: { width: '100%' },
       },
-      fieldName: 'discountedPrice',
-      label: '优惠后金额',
+      dependencies: {
+        triggerFields: ['totalPrice', 'otherPrice'],
+        componentProps: (values) => {
+          const totalPrice = values.totalPrice || 0;
+          const otherPrice = values.otherPrice || 0;
+          values.discountedPrice = totalPrice - otherPrice;
+          return {};
+        },
+      },
     },
     {
+      fieldName: 'otherPrice',
+      label: '其他费用',
       component: 'InputNumber',
       componentProps: {
         disabled: formType === 'detail',
         placeholder: '请输入其他费用',
         precision: 2,
         formatter: erpPriceInputFormatter,
-        style: { width: '100%' },
       },
-      fieldName: 'otherPrice',
-      label: '其他费用',
     },
     {
+      fieldName: 'accountId',
+      label: '结算账户',
       component: 'ApiSelect',
       componentProps: {
         placeholder: '请选择结算账户',
-        disabled: true,
         allowClear: true,
         showSearch: true,
         api: getAccountSimpleList,
@@ -183,26 +181,25 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
           value: 'id',
         },
       },
-      fieldName: 'accountId',
-      label: '结算账户',
     },
     {
+      fieldName: 'totalPrice',
+      label: '应退金额',
       component: 'InputNumber',
       componentProps: {
         precision: 2,
-        style: { width: '100%' },
-        disabled: true,
         min: 0,
+        disabled: true,
       },
-      fieldName: 'totalPrice',
-      label: '应退金额',
       rules: z.number().min(0).optional(),
     },
   ];
 }
 
-/** 采购订单项表格列定义 */
-export function usePurchaseOrderItemTableColumns(): VxeTableGridOptions['columns'] {
+/** 表单的明细表格列 */
+export function useFormItemColumns(
+  formData?: any[],
+): VxeTableGridOptions['columns'] {
   return [
     { type: 'seq', title: '序号', minWidth: 50, fixed: 'left' },
     {
@@ -219,8 +216,9 @@ export function usePurchaseOrderItemTableColumns(): VxeTableGridOptions['columns
     },
     {
       field: 'stockCount',
-      title: '仓库库存',
+      title: '库存',
       minWidth: 80,
+      formatter: 'formatAmount3',
     },
     {
       field: 'productBarCode',
@@ -232,15 +230,27 @@ export function usePurchaseOrderItemTableColumns(): VxeTableGridOptions['columns
       title: '单位',
       minWidth: 80,
     },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      slots: { default: 'remark' },
+    },
     {
       field: 'inCount',
-      title: '已入库数量',
+      title: '已入库',
+      formatter: 'formatAmount3',
       minWidth: 120,
+      fixed: 'right',
+      visible: formData && formData[0]?.inCount !== undefined,
     },
     {
       field: 'returnCount',
       title: '已退货',
+      formatter: 'formatAmount3',
       minWidth: 120,
+      fixed: 'right',
+      visible: formData && formData[0]?.returnCount !== undefined,
     },
     {
       field: 'count',
@@ -267,7 +277,8 @@ export function usePurchaseOrderItemTableColumns(): VxeTableGridOptions['columns
       fixed: 'right',
       field: 'taxPercent',
       title: '税率(%)',
-      minWidth: 100,
+      minWidth: 105,
+      slots: { default: 'taxPercent' },
     },
     {
       fixed: 'right',
@@ -283,10 +294,16 @@ export function usePurchaseOrderItemTableColumns(): VxeTableGridOptions['columns
       minWidth: 120,
       formatter: 'formatAmount2',
     },
+    {
+      title: '操作',
+      width: 50,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
   ];
 }
 
-/** 采购退货列表的搜索表单 */
+/** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
     {
@@ -294,7 +311,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '退货单号',
       component: 'Input',
       componentProps: {
-        placeholder: '请输入入库单号',
+        placeholder: '请输入退货单号',
         allowClear: true,
       },
     },
@@ -318,10 +335,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '退货时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始时间', '结束时间'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
     {
@@ -350,7 +365,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
         api: getWarehouseSimpleList,
         labelField: 'name',
         valueField: 'id',
-        filterOption: false,
       },
     },
     {
@@ -387,18 +401,18 @@ export function useGridFormSchema(): VbenFormSchema[] {
           { label: '部分退款', value: 1 },
           { label: '全部退款', value: 2 },
         ],
-        placeholder: '请选择退货状态',
+        placeholder: '请选择退款状态',
         allowClear: true,
       },
     },
     {
       fieldName: 'status',
-      label: '状态',
+      label: '审批状态',
       component: 'Select',
       componentProps: {
-        placeholder: '请选择状态',
-        allowClear: true,
         options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
+        placeholder: '请选择审批状态',
+        allowClear: true,
       },
     },
     {
@@ -413,7 +427,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
   ];
 }
 
-/** 采购退货列表的字段 */
+/** 列表的字段 */
 export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
     {
@@ -429,7 +443,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       field: 'productNames',
-      title: '产品信息',
+      title: '退货产品信息',
       showOverflow: 'tooltip',
       minWidth: 120,
     },
@@ -442,7 +456,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       field: 'returnTime',
       title: '退货时间',
       width: 160,
-      formatter: 'formatDateTime',
+      formatter: 'formatDate',
     },
     {
       field: 'creatorName',
@@ -452,6 +466,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
@@ -467,16 +482,16 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       minWidth: 120,
     },
     {
-      field: 'noRefundPrice',
+      field: 'unRefundPrice',
       title: '未退金额',
-      minWidth: 120,
       formatter: ({ row }) => {
         return `${erpNumberFormatter(row.totalPrice - row.refundPrice, 2)}元`;
       },
+      minWidth: 120,
     },
     {
       field: 'status',
-      title: '状态',
+      title: '审批状态',
       minWidth: 120,
       cellRender: {
         name: 'CellDict',
@@ -485,13 +500,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       title: '操作',
-      minWidth: 250,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
-/** 采购订单列表的搜索表单 */
+/** 列表的搜索表单 */
 export function useOrderGridFormSchema(): VbenFormSchema[] {
   return [
     {
@@ -501,7 +516,6 @@ export function useOrderGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         placeholder: '请输入订单单号',
         allowClear: true,
-        disabled: true,
       },
     },
     {
@@ -524,16 +538,14 @@ export function useOrderGridFormSchema(): VbenFormSchema[] {
       label: '订单时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始时间', '结束时间'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
   ];
 }
 
-/** 采购订单列表的字段 */
+/** 列表的字段 */
 export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
   return [
     {
@@ -572,28 +584,31 @@ export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'inCount',
-      title: '入库数量',
+      title: '已入库数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'returnCount',
-      title: '退货数量',
+      title: '已退货数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalProductPrice',
       title: '金额合计',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '含税金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
   ];
diff --git a/apps/web-antd/src/views/erp/purchase/return/index.vue b/apps/web-antd/src/views/erp/purchase/return/index.vue
index d910755591f9ff3f6e67225ab8ef168f43449352..d45f4e1e08ecc4b1ea56e59ccb8891273e32ac4d 100644
--- a/apps/web-antd/src/views/erp/purchase/return/index.vue
+++ b/apps/web-antd/src/views/erp/purchase/return/index.vue
@@ -19,55 +19,55 @@ import {
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import PurchaseInForm from './modules/purchase-return-form.vue';
+import Form from './modules/form.vue';
 
-/** ERP 采购入库列表 */
-defineOptions({ name: 'ErpPurchaseIn' });
+/** ERP 采购退货列表 */
+defineOptions({ name: 'ErpPurchaseReturn' });
 
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: PurchaseInForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-// TODO @Xuzhiqiang：批量删除待实现
 const checkedIds = ref<number[]>([]);
-
-/** 详情 */
-function handleDetail(row: ErpPurchaseReturnApi.PurchaseReturn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ErpPurchaseReturnApi.PurchaseReturn[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
 }
 
-/** 新增 */
+/** 新增采购退货 */
 function handleCreate() {
   formModalApi.setData({ type: 'create' }).open();
 }
 
-/** 编辑 */
+/** 编辑采购退货 */
 function handleEdit(row: ErpPurchaseReturnApi.PurchaseReturn) {
   formModalApi.setData({ type: 'edit', id: row.id }).open();
 }
 
-/** 删除 */
+/** 查看详情 */
+function handleDetail(row: ErpPurchaseReturnApi.PurchaseReturn) {
+  formModalApi.setData({ type: 'detail', id: row.id }).open();
+}
+
+/** 删除采购退货 */
 async function handleDelete(ids: number[]) {
   const hideLoading = message.loading({
     content: $t('ui.actionMessage.deleting'),
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
     await deletePurchaseReturn(ids);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess'),
-      key: 'action_process_msg',
-    });
-    onRefresh();
-  } catch {
-    // 处理错误
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -81,23 +81,17 @@ async function handleUpdateStatus(
   const hideLoading = message.loading({
     content: `确定${status === 20 ? '审批' : '反审批'}该订单吗？`,
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
-    await updatePurchaseReturnStatus({ id: row.id!, status });
-    message.success({
-      content: `${status === 20 ? '审批' : '反审批'}成功`,
-      key: 'action_process_msg',
-    });
-    onRefresh();
-  } catch {
-    // 处理错误
+    await updatePurchaseReturnStatus(row.id!, status);
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`);
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
-/** 导出 */
+/** 导出表格 */
 async function handleExport() {
   const data = await exportPurchaseReturn(await gridApi.formApi.getValues());
   downloadFileFromBlobPart({ fileName: '采购退货.xls', source: data });
@@ -131,6 +125,10 @@ const [Grid, gridApi] = useVbenVxeGrid({
       search: true,
     },
   } as VxeTableGridOptions<ErpPurchaseReturnApi.PurchaseReturn>,
+  gridEvents: {
+    checkboxAll: handleRowCheckboxChange,
+    checkboxChange: handleRowCheckboxChange,
+  },
 });
 </script>
 
@@ -142,7 +140,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/erp/purchase/"
       />
     </template>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
 
     <Grid table-title="采购退货列表">
       <template #toolbar-tools>
@@ -171,14 +169,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               auth: ['erp:purchase-return:delete'],
               popConfirm: {
                 title: `是否删除所选中数据？`,
-                confirm: () => {
-                  const checkboxRecords = gridApi.grid.getCheckboxRecords();
-                  if (checkboxRecords.length === 0) {
-                    message.warning('请选择要删除的数据');
-                    return;
-                  }
-                  handleDelete(checkboxRecords.map((item) => item.id!));
-                },
+                confirm: handleDelete.bind(null, checkedIds),
               },
             },
           ]"
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/form.vue
similarity index 42%
rename from apps/web-antd/src/views/erp/purchase/return/modules/purchase-return-form.vue
rename to apps/web-antd/src/views/erp/purchase/return/modules/form.vue
index 1be6b67bf45fd5a03a3e4db528b072ff76fb4d4f..0c22f38de65c1c02d31e37ca8f4145be2fa67af4 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/form.vue
@@ -2,13 +2,15 @@
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 import type { ErpPurchaseReturnApi } from '#/api/erp/purchase/return';
 
-import { computed, nextTick, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
 
 import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
+import { getAccountSimpleList } from '#/api/erp/finance/account';
 import {
   createPurchaseReturn,
   getPurchaseReturn,
@@ -16,16 +18,16 @@ import {
 } from '#/api/erp/purchase/return';
 
 import { useFormSchema } from '../data';
-import PurchaseReturnItemForm from './purchase-return-item-form.vue';
-import SelectPurchaseOrderForm from './select-purchase-order-form.vue';
+import ItemForm from './item-form.vue';
+import PurchaseOrderSelect from './purchase-order-select.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<
   ErpPurchaseReturnApi.PurchaseReturn & {
     accountId?: number;
-    discountedPrice?: number;
     discountPercent?: number;
     fileUrl?: string;
+    order?: ErpPurchaseOrderApi.PurchaseOrder;
     orderId?: number;
     orderNo?: string;
     supplierId?: number;
@@ -42,17 +44,19 @@ const formData = ref<
   discountPrice: 0,
   totalPrice: 0,
   otherPrice: 0,
-  discountedPrice: 0,
   items: [],
 });
-const formType = ref('');
-const itemFormRef = ref();
-
-const getTitle = computed(() => {
-  if (formType.value === 'create') return '添加采购退货';
-  if (formType.value === 'update') return '编辑采购退货';
-  return '采购退货详情';
-});
+const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const itemFormRef = ref<InstanceType<typeof ItemForm>>();
+
+/* eslint-disable unicorn/no-nested-ternary */
+const getTitle = computed(() =>
+  formType.value === 'create'
+    ? $t('ui.actionTitle.create', ['采购退货'])
+    : formType.value === 'edit'
+      ? $t('ui.actionTitle.edit', ['采购退货'])
+      : '采购退货详情',
+);
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -66,31 +70,50 @@ const [Form, formApi] = useVbenForm({
   schema: useFormSchema(formType.value),
   showDefaultActions: false,
   handleValuesChange: (values, changedFields) => {
-    if (formData.value && changedFields.includes('otherPrice')) {
-      formData.value.otherPrice = values.otherPrice;
-      formData.value.totalPrice =
-        (formData.value.discountedPrice || 0) +
-        (formData.value.otherPrice || 0);
-
-      formApi.setValues(formData.value, false);
+    // 目的：同步到 item-form 组件，触发整体的价格计算
+    if (formData.value) {
+      if (changedFields.includes('otherPrice')) {
+        formData.value.otherPrice = values.otherPrice;
+      }
+      if (changedFields.includes('discountPercent')) {
+        formData.value.discountPercent = values.discountPercent;
+      }
     }
   },
 });
 
-// TODO @XuZhiqiang：注释风格 /** */
-// 更新采购退货项
-const handleUpdateItems = async (
+/** 更新采购退货项 */
+const handleUpdateItems = (
   items: ErpPurchaseReturnApi.PurchaseReturnItem[],
 ) => {
-  if (formData.value) {
-    const data =
-      (await formApi.getValues()) as ErpPurchaseReturnApi.PurchaseReturn;
-    formData.value = { ...data, items };
-    await formApi.setValues(formData.value, false);
-  }
+  formData.value.items = items;
+  formApi.setValues({
+    items,
+  });
 };
 
-// 选择采购订单
+/** 更新其他费用 */
+const handleUpdateOtherPrice = (otherPrice: number) => {
+  formApi.setValues({
+    otherPrice,
+  });
+};
+
+/** 更新优惠金额 */
+const handleUpdateDiscountPrice = (discountPrice: number) => {
+  formApi.setValues({
+    discountPrice,
+  });
+};
+
+/** 更新总金额 */
+const handleUpdateTotalPrice = (totalPrice: number) => {
+  formApi.setValues({
+    totalPrice,
+  });
+};
+
+/** 选择采购订单 */
 const handleUpdateOrder = (order: ErpPurchaseOrderApi.PurchaseOrder) => {
   formData.value = {
     ...formData.value,
@@ -102,7 +125,7 @@ const handleUpdateOrder = (order: ErpPurchaseOrderApi.PurchaseOrder) => {
     discountPercent: order.discountPercent!,
     fileUrl: order.fileUrl!,
   };
-  // 将订单项设置到入库单项
+  // 将订单项设置到退货单项
   order.items!.forEach((item: any) => {
     item.totalCount = item.count;
     item.count = item.inCount - item.returnCount;
@@ -112,45 +135,9 @@ const handleUpdateOrder = (order: ErpPurchaseOrderApi.PurchaseOrder) => {
   formData.value.items = order.items!.filter(
     (item) => item.count && item.count > 0,
   ) as ErpPurchaseReturnApi.PurchaseReturnItem[];
-
   formApi.setValues(formData.value, false);
 };
 
-watch(
-  () => formData.value.items!,
-  (newItems: ErpPurchaseReturnApi.PurchaseReturnItem[]) => {
-    if (newItems && newItems.length > 0) {
-      // 计算每个产品的总价、税额和总价
-      newItems.forEach((item) => {
-        item.totalProductPrice = (item.productPrice || 0) * (item.count || 0);
-        item.taxPrice =
-          (item.totalProductPrice || 0) * ((item.taxPercent || 0) / 100);
-        item.totalPrice = (item.totalProductPrice || 0) + (item.taxPrice || 0);
-      });
-      // 计算总价
-      formData.value.totalPrice = newItems.reduce((sum, item) => {
-        return sum + (item.totalProductPrice || 0) + (item.taxPrice || 0);
-      }, 0);
-    } else {
-      formData.value.totalPrice = 0;
-    }
-    // 优惠金额
-    formData.value.discountPrice =
-      ((formData.value.totalPrice || 0) *
-        (formData.value.discountPercent || 0)) /
-      100;
-    // 优惠后价格
-    formData.value.discountedPrice =
-      formData.value.totalPrice - formData.value.discountPrice;
-
-    // 计算最终价格(包含其他费用)
-    formData.value.totalPrice =
-      formData.value.discountedPrice + (formData.value.otherPrice || 0);
-    formApi.setValues(formData.value, false);
-  },
-  { immediate: true },
-);
-
 /** 创建或更新采购退货 */
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
@@ -158,41 +145,20 @@ const [Modal, modalApi] = useVbenModal({
     if (!valid) {
       return;
     }
-    await nextTick();
-
     const itemFormInstance = Array.isArray(itemFormRef.value)
       ? itemFormRef.value[0]
       : itemFormRef.value;
-    if (itemFormInstance && typeof itemFormInstance.validate === 'function') {
-      try {
-        const isValid = await itemFormInstance.validate();
-        if (!isValid) {
-          message.error('子表单验证失败');
-          return;
-        }
-      } catch (error: any) {
-        message.error(error.message || '子表单验证失败');
-        return;
-      }
-    } else {
-      message.error('子表单验证方法不存在');
-      return;
-    }
-
-    // 验证产品清单不能为空
-    if (!formData.value?.items || formData.value.items.length === 0) {
-      message.error('产品清单不能为空，请至少添加一个产品');
+    try {
+      itemFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
       return;
     }
 
     modalApi.lock();
     // 提交表单
-    const data: ErpPurchaseReturnApi.PurchaseReturn = await formApi.getValues();
-    data.items = formData.value?.items?.map((item) => ({
-      ...item,
-      // 解决新增采购退货报错
-      id: undefined,
-    }));
+    const data =
+      (await formApi.getValues()) as ErpPurchaseReturnApi.PurchaseReturn;
     try {
       await (formType.value === 'create'
         ? createPurchaseReturn(data)
@@ -200,110 +166,64 @@ const [Modal, modalApi] = useVbenModal({
       // 关闭并提示
       await modalApi.close();
       emit('success');
-      message.success(formType.value === 'create' ? '新增成功' : '更新成功');
+      message.success($t('ui.actionMessage.operationSuccess'));
     } finally {
       modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      formData.value = {
-        id: undefined,
-        no: undefined,
-        accountId: undefined,
-        returnTime: undefined,
-        remark: undefined,
-        fileUrl: undefined,
-        discountPercent: 0,
-        supplierId: undefined,
-        discountPrice: 0,
-        totalPrice: 0,
-        otherPrice: 0,
-        items: [],
-      };
-      formApi.setValues(formData.value, false);
+      formData.value = undefined;
       return;
     }
     // 加载数据
     const data = modalApi.getData<{ id?: number; type: string }>();
-    if (!data) {
-      return;
-    }
     formType.value = data.type;
+    formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
-
-    if (!data.id) {
-      // 初始化空的表单数据
-      formData.value = {
-        id: undefined,
-        no: undefined,
-        accountId: undefined,
-        returnTime: undefined,
-        remark: undefined,
-        fileUrl: undefined,
-        discountPercent: 0,
-        supplierId: undefined,
-        discountPrice: 0,
-        totalPrice: 0,
-        otherPrice: 0,
-        items: [],
-      } as unknown as ErpPurchaseReturnApi.PurchaseReturn;
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init([]);
+    if (!data || !data.id) {
+      // 新增时，默认选中账户
+      const accountList = await getAccountSimpleList();
+      const defaultAccount = accountList.find((item) => item.defaultStatus);
+      if (defaultAccount) {
+        await formApi.setValues({ accountId: defaultAccount.id });
       }
       return;
     }
-
     modalApi.lock();
     try {
       formData.value = await getPurchaseReturn(data.id);
-
       // 设置到 values
       await formApi.setValues(formData.value, false);
-      // 初始化子表单
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init(formData.value.items || []);
-      }
     } finally {
       modalApi.unlock();
     }
   },
 });
-
-defineExpose({ modalApi });
 </script>
 
 <template>
   <Modal
-    v-bind="$attrs"
     :title="getTitle"
-    class="w-2/3"
-    :closable="true"
-    :mask-closable="true"
+    class="w-3/4"
     :show-confirm-button="formType !== 'detail'"
   >
     <Form class="mx-3">
-      <template #product="slotProps">
-        <PurchaseReturnItemForm
-          v-bind="slotProps"
+      <template #items>
+        <ItemForm
           ref="itemFormRef"
-          class="w-full"
           :items="formData?.items ?? []"
           :disabled="formType === 'detail'"
+          :discount-percent="formData?.discountPercent ?? 0"
+          :other-price="formData?.otherPrice ?? 0"
           @update:items="handleUpdateItems"
+          @update:discount-price="handleUpdateDiscountPrice"
+          @update:other-price="handleUpdateOtherPrice"
+          @update:total-price="handleUpdateTotalPrice"
         />
       </template>
-      <template #orderNo="slotProps">
-        <SelectPurchaseOrderForm
-          v-bind="slotProps"
+      <template #orderNo>
+        <PurchaseOrderSelect
           :order-no="formData?.orderNo"
           @update:order="handleUpdateOrder"
         />
diff --git a/apps/web-antd/src/views/erp/purchase/return/modules/purchase-return-item-form.vue b/apps/web-antd/src/views/erp/purchase/return/modules/item-form.vue
similarity index 40%
rename from apps/web-antd/src/views/erp/purchase/return/modules/purchase-return-item-form.vue
rename to apps/web-antd/src/views/erp/purchase/return/modules/item-form.vue
index c3ec378ccf4b1ae9e876af8318fcdc31d21c22ec..818b2f1c7eed330092af055b02ec5ff66003dada 100644
--- a/apps/web-antd/src/views/erp/purchase/return/modules/purchase-return-item-form.vue
+++ b/apps/web-antd/src/views/erp/purchase/return/modules/item-form.vue
@@ -1,51 +1,78 @@
 <script lang="ts" setup>
 import type { ErpPurchaseReturnApi } from '#/api/erp/purchase/return';
 
-import { nextTick, onMounted, ref, watch } from 'vue';
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
-import { erpPriceMultiply } from '@vben/utils';
+import {
+  erpCountInputFormatter,
+  erpPriceInputFormatter,
+  erpPriceMultiply,
+} from '@vben/utils';
 
-import { InputNumber, Select } from 'ant-design-vue';
+import { Input, InputNumber, Select } from 'ant-design-vue';
 
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProductSimpleList } from '#/api/erp/product/product';
 import { getWarehouseStockCount } from '#/api/erp/stock/stock';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 
-import { usePurchaseOrderItemTableColumns } from '../data';
+import { useFormItemColumns } from '../data';
+
+interface Props {
+  items?: ErpPurchaseReturnApi.PurchaseReturnItem[];
+  disabled?: boolean;
+  discountPercent?: number;
+  otherPrice?: number;
+}
 
 const props = withDefaults(defineProps<Props>(), {
   items: () => [],
   disabled: false,
+  discountPercent: 0,
+  otherPrice: 0,
 });
 
-const emit = defineEmits(['update:items', 'update:totalPrice']);
+const emit = defineEmits([
+  'update:items',
+  'update:discount-price',
+  'update:other-price',
+  'update:total-price',
+]);
 
-interface Props {
-  items?: ErpPurchaseReturnApi.PurchaseReturnItem[];
-  disabled?: boolean;
-}
+const tableData = ref<ErpPurchaseReturnApi.PurchaseReturnItem[]>([]); // 表格数据
+const productOptions = ref<any[]>([]); // 产品下拉选项
+const warehouseOptions = ref<any[]>([]); // 仓库下拉选项
 
-const tableData = ref<ErpPurchaseReturnApi.PurchaseReturnItem[]>([]);
-const productOptions = ref<any[]>([]);
-const warehouseOptions = ref<any[]>([]);
+/** 获取表格合计数据 */
+const summaries = computed(() => {
+  return {
+    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
+    totalProductPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalProductPrice || 0),
+      0,
+    ),
+    taxPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.taxPrice || 0),
+      0,
+    ),
+    totalPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalPrice || 0),
+      0,
+    ),
+  };
+});
 
 /** 表格配置 */
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    editConfig: {
-      trigger: 'click',
-      mode: 'cell',
-    },
-    columns: usePurchaseOrderItemTableColumns(),
+    columns: useFormItemColumns(tableData.value),
     data: tableData.value,
-    border: true,
-    showOverflow: true,
+    minHeight: 250,
     autoResize: true,
-    minHeight: 150,
-    keepSource: true,
+    border: true,
     rowConfig: {
-      keyField: 'id',
+      keyField: 'seq',
+      isHover: true,
     },
     pagerConfig: {
       enabled: false,
@@ -63,46 +90,70 @@ watch(
     if (!items) {
       return;
     }
-    await nextTick();
+    items.forEach((item) => initRow(item));
     tableData.value = [...items];
-    await nextTick();
+    await nextTick(); // 特殊：保证 gridApi 已经初始化
     await gridApi.grid.reloadData(tableData.value);
+    // 更新表格列配置（目的：已入库、已退货动态列）
+    const columns = useFormItemColumns(tableData.value);
+    await gridApi.grid.reloadColumn(columns);
   },
   {
     immediate: true,
   },
 );
 
-/** 初始化 */
-onMounted(async () => {
-  productOptions.value = await getProductSimpleList();
-  warehouseOptions.value = await getWarehouseSimpleList();
-});
+/** 计算 discountPrice、otherPrice、totalPrice 价格 */
+watch(
+  () => [tableData.value, props.discountPercent, props.otherPrice],
+  () => {
+    if (!tableData.value || tableData.value.length === 0) {
+      return;
+    }
+    const totalPrice = tableData.value.reduce(
+      (prev, curr) => prev + (curr.totalPrice || 0),
+      0,
+    );
+    const discountPrice =
+      props.discountPercent === null
+        ? 0
+        : erpPriceMultiply(totalPrice, props.discountPercent / 100);
+    const discountedPrice = totalPrice - discountPrice!;
+    const finalTotalPrice = discountedPrice + (props.otherPrice || 0);
 
-function handlePriceChange(row: any) {
-  if (row.productPrice && row.count) {
-    row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
-    row.taxPrice =
-      erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
-    row.totalPrice = row.totalProductPrice + row.taxPrice;
+    // 通知父组件更新
+    emit('update:discount-price', discountPrice);
+    emit('update:other-price', props.otherPrice || 0);
+    emit('update:total-price', finalTotalPrice);
+  },
+  { deep: true },
+);
+
+/** 处理删除 */
+function handleDelete(row: ErpPurchaseReturnApi.PurchaseReturnItem) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index !== -1) {
+    tableData.value.splice(index, 1);
   }
-  handleUpdateValue(row);
+  // 通知父组件更新
+  emit('update:items', [...tableData.value]);
 }
 
+/** 处理仓库变更 */
 const handleWarehouseChange = async (
   row: ErpPurchaseReturnApi.PurchaseReturnItem,
 ) => {
-  const warehouseId = row.warehouseId;
   const stockCount = await getWarehouseStockCount({
     productId: row.productId!,
-    warehouseId: warehouseId!,
+    warehouseId: row.warehouseId!,
   });
   row.stockCount = stockCount || 0;
-  handleUpdateValue(row);
+  handleRowChange(row);
 };
 
-function handleUpdateValue(row: any) {
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index === -1) {
     tableData.value.push(row);
   } else {
@@ -111,90 +162,39 @@ function handleUpdateValue(row: any) {
   emit('update:items', [...tableData.value]);
 }
 
-const getSummaries = (): {
-  count: number;
-  productName: string;
-  taxPrice: number;
-  totalPrice: number;
-  totalProductPrice: number;
-} => {
-  const count = tableData.value.reduce(
-    (sum, item) => sum + (item.count || 0),
-    0,
-  );
-  const totalProductPrice = tableData.value.reduce(
-    (sum, item) => sum + (item.totalProductPrice || 0),
-    0,
-  );
-  const taxPrice = tableData.value.reduce(
-    (sum, item) => sum + (item.taxPrice || 0),
-    0,
-  );
-  const totalPrice = tableData.value.reduce(
-    (sum, item) => sum + (item.totalPrice || 0),
-    0,
-  );
-  return {
-    productName: '合计',
-    count,
-    totalProductPrice,
-    taxPrice,
-    totalPrice,
-  };
+/** 初始化行数据 */
+const initRow = (row: ErpPurchaseReturnApi.PurchaseReturnItem): void => {
+  if (row.productPrice && row.count) {
+    row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+    row.taxPrice =
+      erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
+    row.totalPrice = row.totalProductPrice + row.taxPrice;
+  }
 };
 
-const validate = async (): Promise<boolean> => {
-  try {
-    for (let i = 0; i < tableData.value.length; i++) {
-      const item = tableData.value[i];
-      if (item) {
-        if (!item.warehouseId) {
-          throw new Error(`第 ${i + 1} 行：仓库不能为空`);
-        }
-        if (!item.count || item.count <= 0) {
-          throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
-        }
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (item) {
+      if (!item.warehouseId) {
+        throw new Error(`第 ${i + 1} 行：仓库不能为空`);
+      }
+      if (!item.count || item.count <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
       }
     }
-    return true;
-  } catch (error) {
-    console.error('验证失败:', error);
-    throw error;
   }
-};
-
-const getData = (): ErpPurchaseReturnApi.PurchaseReturnItem[] =>
-  tableData.value;
-const init = (
-  items: ErpPurchaseReturnApi.PurchaseReturnItem[] | undefined,
-): void => {
-  tableData.value =
-    items && items.length > 0
-      ? items.map((item) => {
-          const newItem = { ...item };
-          if (newItem.productPrice && newItem.count) {
-            newItem.totalProductPrice =
-              erpPriceMultiply(newItem.productPrice, newItem.count) ?? 0;
-            newItem.taxPrice =
-              erpPriceMultiply(
-                newItem.totalProductPrice,
-                (newItem.taxPercent || 0) / 100,
-              ) ?? 0;
-            newItem.totalPrice = newItem.totalProductPrice + newItem.taxPrice;
-          }
-          return newItem;
-        })
-      : [];
-  // TODO @XuZhiqiang: await 风格；
-  nextTick(() => {
-    gridApi.grid.reloadData(tableData.value);
-  });
-};
+}
 
 defineExpose({
   validate,
-  getData,
-  init,
+});
+
+/** 初始化 */
+onMounted(async () => {
+  productOptions.value = await getProductSimpleList();
+  warehouseOptions.value = await getWarehouseSimpleList();
 });
 </script>
 
@@ -218,29 +218,60 @@ defineExpose({
         v-model:value="row.productId"
         :options="productOptions"
         :field-names="{ label: 'name', value: 'id' }"
-        style="width: 100%"
+        class="w-full"
         placeholder="请选择产品"
         show-search
       />
     </template>
-
     <template #count="{ row }">
       <InputNumber
         v-if="!disabled"
         v-model:value="row.count"
         :min="0"
         :precision="2"
-        @change="handlePriceChange(row)"
+        @change="handleRowChange(row)"
       />
-      <span v-else>{{ row.count || '-' }}</span>
+      <span v-else>{{ erpCountInputFormatter(row.count) || '-' }}</span>
     </template>
     <template #productPrice="{ row }">
       <InputNumber
-        disabled
+        v-if="!disabled"
         v-model:value="row.productPrice"
         :min="0"
         :precision="2"
-        @change="handlePriceChange(row)"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ erpPriceInputFormatter(row.productPrice) || '-' }}</span>
+    </template>
+    <template #remark="{ row }">
+      <Input v-if="!disabled" v-model:value="row.remark" class="w-full" />
+      <span v-else>{{ row.remark || '-' }}</span>
+    </template>
+    <template #taxPercent="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.taxPercent"
+        :min="0"
+        :max="100"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ row.taxPercent || '-' }}</span>
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        v-if="!disabled"
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该产品吗？',
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
       />
     </template>
 
@@ -249,10 +280,14 @@ defineExpose({
         <div class="text-muted-foreground flex justify-between text-sm">
           <span class="text-foreground font-medium">合计：</span>
           <div class="flex space-x-4">
-            <span>数量：{{ getSummaries().count }}</span>
-            <span>金额：{{ getSummaries().totalProductPrice }}</span>
-            <span>税额：{{ getSummaries().taxPrice }}</span>
-            <span>税额合计：{{ getSummaries().totalPrice }}</span>
+            <span>数量：{{ erpCountInputFormatter(summaries.count) }}</span>
+            <span>
+              金额：{{ erpPriceInputFormatter(summaries.totalProductPrice) }}
+            </span>
+            <span>税额：{{ erpPriceInputFormatter(summaries.taxPrice) }}</span>
+            <span>
+              税额合计：{{ erpPriceInputFormatter(summaries.totalPrice) }}
+            </span>
           </div>
         </div>
       </div>
diff --git a/apps/web-antd/src/views/erp/purchase/return/modules/select-purchase-order-grid.vue b/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-select.vue
similarity index 44%
rename from apps/web-antd/src/views/erp/purchase/return/modules/select-purchase-order-grid.vue
rename to apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-select.vue
index b22d652d99082179ca85f329ca892875469b7432..45b0ec65b72a26597e94c09069346e20f95fb1c9 100644
--- a/apps/web-antd/src/views/erp/purchase/return/modules/select-purchase-order-grid.vue
+++ b/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-select.vue
@@ -2,13 +2,36 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 
+import { ref } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, message, Modal } from 'ant-design-vue';
+
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getPurchaseOrderPage } from '#/api/erp/purchase/order';
 
 import { useOrderGridColumns, useOrderGridFormSchema } from '../data';
 
-const emit = defineEmits(['selectRow']);
+defineProps({
+  orderNo: {
+    type: String,
+    default: () => undefined,
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits<{
+  'update:order': [order: ErpPurchaseOrderApi.PurchaseOrder];
+}>();
+
+const order = ref<ErpPurchaseOrderApi.PurchaseOrder>(); // 选择的采购订单
+const open = ref<boolean>(false); // 选择采购订单弹窗是否打开
 
+/** 表格配置 */
 const [Grid] = useVbenVxeGrid({
   formOptions: {
     schema: useOrderGridFormSchema(),
@@ -44,12 +67,51 @@ const [Grid] = useVbenVxeGrid({
   } as VxeTableGridOptions<ErpPurchaseOrderApi.PurchaseOrder>,
   gridEvents: {
     radioChange: ({ row }: { row: ErpPurchaseOrderApi.PurchaseOrder }) => {
-      emit('selectRow', row);
+      handleSelectOrder(row);
     },
   },
 });
+
+/** 选择采购订单 */
+function handleSelectOrder(selectOrder: ErpPurchaseOrderApi.PurchaseOrder) {
+  order.value = selectOrder;
+}
+
+/** 确认选择采购订单 */
+const handleOk = () => {
+  if (!order.value) {
+    message.warning('请选择一个采购订单');
+    return;
+  }
+  emit('update:order', order.value);
+  open.value = false;
+};
 </script>
 
 <template>
-  <Grid class="max-h-[600px]" table-title="采购订单列表(仅展示可退货)" />
+  <Input
+    readonly
+    :value="orderNo"
+    :disabled="disabled"
+    @click="() => !disabled && (open = true)"
+  >
+    <template #addonAfter>
+      <div>
+        <IconifyIcon
+          class="h-full w-6 cursor-pointer"
+          icon="ant-design:setting-outlined"
+          :style="{ cursor: disabled ? 'not-allowed' : 'pointer' }"
+          @click="() => !disabled && (open = true)"
+        />
+      </div>
+    </template>
+  </Input>
+  <Modal
+    class="!w-[50vw]"
+    v-model:open="open"
+    title="选择关联订单"
+    @ok="handleOk"
+  >
+    <Grid class="max-h-[600px]" table-title="采购订单列表(仅展示可退货)" />
+  </Modal>
 </template>
diff --git a/apps/web-antd/src/views/erp/purchase/return/modules/select-purchase-order-form.vue b/apps/web-antd/src/views/erp/purchase/return/modules/select-purchase-order-form.vue
deleted file mode 100644
index 971c1ab17b99ba3a6933d112be6bbeb8c9fef595..0000000000000000000000000000000000000000
--- a/apps/web-antd/src/views/erp/purchase/return/modules/select-purchase-order-form.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<script lang="ts" setup>
-import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
-
-import { ref } from 'vue';
-
-import { IconifyIcon } from '@vben/icons';
-
-import { Input, message, Modal } from 'ant-design-vue';
-
-import SelectPurchaseOrderGrid from './select-purchase-order-grid.vue';
-
-const props = defineProps({
-  orderNo: {
-    type: String,
-    default: () => undefined,
-  },
-  disabled: {
-    type: Boolean,
-    default: false,
-  },
-});
-const emit = defineEmits<{
-  'update:order': [order: ErpPurchaseOrderApi.PurchaseOrder];
-}>();
-const order = ref<ErpPurchaseOrderApi.PurchaseOrder>();
-const open = ref<boolean>(false);
-
-const handleSelectOrder = (selectOrder: ErpPurchaseOrderApi.PurchaseOrder) => {
-  order.value = selectOrder;
-};
-
-const handleOk = () => {
-  if (!order.value) {
-    message.warning('请选择一个采购订单');
-    return;
-  }
-  emit('update:order', order.value);
-  open.value = false;
-};
-</script>
-
-<template>
-  <Input
-    v-bind="$attrs"
-    readonly
-    :value="orderNo"
-    :disabled="disabled"
-    @click="() => !disabled && (open = true)"
-  >
-    <template #addonAfter>
-      <div>
-        <IconifyIcon
-          class="h-full w-6 cursor-pointer"
-          icon="ant-design:setting-outlined"
-          :style="{ cursor: props.disabled ? 'not-allowed' : 'pointer' }"
-          @click="() => !props.disabled && (open = true)"
-        />
-      </div>
-    </template>
-  </Input>
-  <Modal
-    v-model:open="open"
-    title="选择关联订单"
-    class="!w-[50vw]"
-    :show-confirm-button="true"
-    @ok="handleOk"
-  >
-    <SelectPurchaseOrderGrid @select-row="handleSelectOrder" />
-  </Modal>
-</template>
diff --git a/apps/web-antd/src/views/erp/purchase/supplier/data.ts b/apps/web-antd/src/views/erp/purchase/supplier/data.ts
index 0c66fa8e0774b218503e461de9ed1fe7f92d4691..a5edc25ef1b1a89fe02bc7d3efeeef36d2a70df0 100644
--- a/apps/web-antd/src/views/erp/purchase/supplier/data.ts
+++ b/apps/web-antd/src/views/erp/purchase/supplier/data.ts
@@ -1,9 +1,11 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
+import { z } from '#/adapter/form';
+
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
@@ -19,10 +21,10 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '供应商名称',
       component: 'Input',
+      rules: 'required',
       componentProps: {
         placeholder: '请输入供应商名称',
       },
-      rules: 'required',
     },
     {
       fieldName: 'contact',
@@ -70,9 +72,10 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'RadioGroup',
       componentProps: {
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        buttonStyle: 'solid',
+        optionType: 'button',
       },
-      rules: 'required',
-      defaultValue: 0,
+      rules: z.number().default(CommonStatusEnum.ENABLE),
     },
     {
       fieldName: 'sort',
@@ -80,11 +83,8 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'InputNumber',
       componentProps: {
         placeholder: '请输入排序',
-        precision: 0,
-        class: 'w-full',
       },
       rules: 'required',
-      defaultValue: 0,
     },
     {
       fieldName: 'taxNo',
@@ -102,7 +102,6 @@ export function useFormSchema(): VbenFormSchema[] {
         placeholder: '请输入税率',
         min: 0,
         precision: 2,
-        class: 'w-full',
       },
     },
     {
@@ -206,7 +205,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'status',
       title: '状态',
-      width: 100,
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -215,7 +214,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'sort',
       title: '排序',
-      width: 80,
+      minWidth: 80,
     },
     {
       field: 'remark',
@@ -224,10 +223,9 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       showOverflow: 'tooltip',
     },
     {
-      field: 'actions',
       title: '操作',
+      width: 130,
       fixed: 'right',
-      width: 160,
       slots: { default: 'actions' },
     },
   ];
diff --git a/apps/web-antd/src/views/erp/purchase/supplier/index.vue b/apps/web-antd/src/views/erp/purchase/supplier/index.vue
index 90c07ba76a19c3660d36dbee944132d7114b7df3..64cb81aaff422d4d1232da5fdf2302e724b2dc96 100644
--- a/apps/web-antd/src/views/erp/purchase/supplier/index.vue
+++ b/apps/web-antd/src/views/erp/purchase/supplier/index.vue
@@ -22,18 +22,18 @@ import SupplierForm from './modules/form.vue';
 defineOptions({ name: 'ErpSupplier' });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 添加供应商 */
+/** 创建供应商 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData(null).open();
 }
 
 /** 编辑供应商 */
 function handleEdit(row: ErpSupplierApi.Supplier) {
-  formModalApi.setData({ type: 'update', id: row.id }).open();
+  formModalApi.setData(row).open();
 }
 
 /** 删除供应商 */
@@ -44,11 +44,9 @@ async function handleDelete(row: ErpSupplierApi.Supplier) {
   });
   try {
     await deleteSupplier(row.id!);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
-  } catch {
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
     hideLoading();
   }
 }
@@ -85,6 +83,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -103,7 +102,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
 
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="供应商列表">
       <template #toolbar-tools>
         <TableAction
@@ -130,14 +129,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
         <TableAction
           :actions="[
             {
-              label: '编辑',
+              label: $t('common.edit'),
               type: 'link',
               icon: ACTION_ICON.EDIT,
               auth: ['erp:supplier:update'],
               onClick: handleEdit.bind(null, row),
             },
             {
-              label: '删除',
+              label: $t('common.delete'),
               type: 'link',
               danger: true,
               icon: ACTION_ICON.DELETE,
diff --git a/apps/web-antd/src/views/erp/purchase/supplier/modules/form.vue b/apps/web-antd/src/views/erp/purchase/supplier/modules/form.vue
index 91775665fd5edbd1c4a7ea432290f18e9828a95b..652c938bbad736e4beb4e2a8b129c413c55c9427 100644
--- a/apps/web-antd/src/views/erp/purchase/supplier/modules/form.vue
+++ b/apps/web-antd/src/views/erp/purchase/supplier/modules/form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { ErpSupplierApi } from '#/api/erp/purchase/supplier';
 
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
@@ -18,9 +18,12 @@ import { $t } from '#/locales';
 import { useFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
-
-const formType = ref<'create' | 'update'>('create');
-const supplierId = ref<number>();
+const formData = ref<ErpSupplierApi.Supplier>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['供应商'])
+    : $t('ui.actionTitle.create', ['供应商']);
+});
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -45,39 +48,30 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as ErpSupplierApi.Supplier;
     try {
-      if (formType.value === 'create') {
-        await createSupplier(data);
-        message.success($t('ui.actionMessage.createSuccess'));
-      } else {
-        await updateSupplier(data);
-        message.success($t('ui.actionMessage.updateSuccess'));
-      }
+      await (formData.value?.id ? updateSupplier(data) : createSupplier(data));
       // 关闭并提示
       await modalApi.close();
       emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
     } finally {
       modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
+      formData.value = undefined;
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: 'create' | 'update' }>();
-    if (!data) {
+    const data = modalApi.getData<ErpSupplierApi.Supplier>();
+    if (!data || !data.id) {
       return;
     }
-    formType.value = data.type;
-    supplierId.value = data.id;
-
     modalApi.lock();
     try {
-      if (data.type === 'update' && data.id) {
-        // 编辑模式，加载数据
-        const supplierData = await getSupplier(data.id);
-        await formApi.setValues(supplierData);
-      }
+      formData.value = await getSupplier(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
@@ -90,10 +84,7 @@ defineExpose({
 </script>
 
 <template>
-  <Modal
-    :title="formType === 'create' ? '新增供应商' : '编辑供应商'"
-    class="w-3/5"
-  >
+  <Modal :title="getTitle" class="w-1/2">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/erp/sale/customer/data.ts b/apps/web-antd/src/views/erp/sale/customer/data.ts
index abba18024450ee9177ec613138e7c8b199408d17..b8327e0fbb1e28473bbb8fe17c5f266138b4c772 100644
--- a/apps/web-antd/src/views/erp/sale/customer/data.ts
+++ b/apps/web-antd/src/views/erp/sale/customer/data.ts
@@ -20,10 +20,10 @@ export function useFormSchema(): VbenFormSchema[] {
     {
       component: 'Input',
       fieldName: 'name',
-      label: '名称',
+      label: '客户名称',
       rules: 'required',
       componentProps: {
-        placeholder: '请输入名称',
+        placeholder: '请输入客户名称',
       },
     },
     {
@@ -84,10 +84,8 @@ export function useFormSchema(): VbenFormSchema[] {
       componentProps: {
         placeholder: '请输入排序',
         precision: 0,
-        class: 'w-full',
       },
       rules: 'required',
-      defaultValue: 0,
     },
     {
       fieldName: 'taxNo',
@@ -103,11 +101,9 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'InputNumber',
       componentProps: {
         placeholder: '请输入税率',
-        precision: 0,
-        class: 'w-full',
+        precision: 2,
       },
-      rules: z.number().min(0).max(100).default(0).optional(),
-      defaultValue: 0,
+      rules: z.number().min(0).max(100).optional(),
     },
     {
       fieldName: 'bankName',
@@ -139,30 +135,42 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'Textarea',
       componentProps: {
         placeholder: '请输入备注',
-        rows: 1,
+        rows: 3,
       },
+      formItemClass: 'col-span-2',
     },
   ];
 }
 
 /** 列表的搜索表单 */
-// TODO @XuZhiqiang：placeholder
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
     {
       fieldName: 'name',
-      label: '名称',
+      label: '客户名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入客户名称',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'mobile',
       label: '手机号码',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入手机号码',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'email',
       label: '邮箱',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入邮箱',
+        allowClear: true,
+      },
     },
   ];
 }
@@ -172,39 +180,53 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'name',
-      title: '名称',
+      title: '客户名称',
+      minWidth: 150,
     },
     {
       field: 'contact',
       title: '联系人',
+      minWidth: 120,
     },
     {
       field: 'mobile',
       title: '手机号码',
+      minWidth: 130,
     },
     {
       field: 'telephone',
       title: '联系电话',
+      minWidth: 130,
     },
     {
       field: 'email',
-      title: '邮箱',
-    },
-    {
-      field: 'taxNo',
-      title: '纳税人识别号',
+      title: '电子邮箱',
+      minWidth: 180,
     },
     {
       field: 'status',
       title: '状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
       },
     },
+    {
+      field: 'sort',
+      title: '排序',
+      minWidth: 80,
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      showOverflow: 'tooltip',
+    },
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
diff --git a/apps/web-antd/src/views/erp/sale/customer/index.vue b/apps/web-antd/src/views/erp/sale/customer/index.vue
index 1bc88f8667daac12f83dc31bf0e2bf6d867ca360..87b96ff9ee6b8f8a0d473e33a7695e9b78c7e96a 100644
--- a/apps/web-antd/src/views/erp/sale/customer/index.vue
+++ b/apps/web-antd/src/views/erp/sale/customer/index.vue
@@ -24,7 +24,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -52,10 +52,8 @@ async function handleDelete(row: ErpCustomerApi.Customer) {
   });
   try {
     await deleteCustomer(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -100,7 +98,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/erp/sale/"
       />
     </template>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="客户列表">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-antd/src/views/erp/sale/customer/modules/form.vue b/apps/web-antd/src/views/erp/sale/customer/modules/form.vue
index d8da07b2ba9901b9ec52748354c00f7e5629e34d..87c189f137d7a3deb0f405190b0300ffa4447c48 100644
--- a/apps/web-antd/src/views/erp/sale/customer/modules/form.vue
+++ b/apps/web-antd/src/views/erp/sale/customer/modules/form.vue
@@ -30,6 +30,7 @@ const [Form, formApi] = useVbenForm({
     componentProps: {
       class: 'w-full',
     },
+    labelWidth: 90,
   },
   wrapperClass: 'grid-cols-2',
   layout: 'horizontal',
@@ -79,7 +80,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal class="w-1/2" :title="getTitle">
     <Form class="mx-4" />
   </Modal>
 </template>
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 05aaaa9003828df9624211a41f9110898644f8c0..52f762458078e192f053e41a775b4d6ee5240112 100644
--- a/apps/web-antd/src/views/erp/sale/order/data.ts
+++ b/apps/web-antd/src/views/erp/sale/order/data.ts
@@ -10,44 +10,43 @@ import { getAccountSimpleList } from '#/api/erp/finance/account';
 import { getProductSimpleList } from '#/api/erp/product/product';
 import { getCustomerSimpleList } from '#/api/erp/sale/customer';
 import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 表单的配置项 */
-export function useFormSchema(): VbenFormSchema[] {
+export function useFormSchema(formType: string): VbenFormSchema[] {
   return [
     {
+      fieldName: 'id',
       component: 'Input',
-      componentProps: {
-        style: { display: 'none' },
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
       },
-      fieldName: 'id',
-      label: 'ID',
-      hideLabel: true,
-      formItemClass: 'hidden',
     },
-
     {
+      fieldName: 'no',
+      label: '订单单号',
       component: 'Input',
       componentProps: {
         placeholder: '系统自动生成',
         disabled: true,
       },
-      fieldName: 'no',
-      label: '订单单号',
     },
     {
+      fieldName: 'orderTime',
+      label: '订单时间',
       component: 'DatePicker',
       componentProps: {
         placeholder: '选择订单时间',
         showTime: true,
         format: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
-        style: { width: '100%' },
       },
-      fieldName: 'orderTime',
-      label: '订单时间',
       rules: 'required',
     },
     {
+      label: '客户',
+      fieldName: 'customerId',
       component: 'ApiSelect',
       componentProps: {
         placeholder: '请选择客户',
@@ -59,16 +58,14 @@ export function useFormSchema(): VbenFormSchema[] {
           value: 'id',
         },
       },
-      fieldName: 'customerId',
-      label: '客户',
       rules: 'required',
     },
     {
       fieldName: 'saleUserId',
-      label: '创建人',
+      label: '销售人员',
       component: 'ApiSelect',
       componentProps: {
-        placeholder: '请选择创建人',
+        placeholder: '请选择销售人员',
         allowClear: true,
         showSearch: true,
         api: getSimpleUserList,
@@ -79,15 +76,19 @@ export function useFormSchema(): VbenFormSchema[] {
       },
     },
     {
+      fieldName: 'remark',
+      label: '备注',
       component: 'Textarea',
       componentProps: {
         placeholder: '请输入备注',
         autoSize: { minRows: 1, maxRows: 1 },
+        disabled: formType === 'detail',
       },
-      fieldName: 'remark',
-      label: '备注',
+      formItemClass: 'col-span-2',
     },
     {
+      fieldName: 'fileUrl',
+      label: '附件',
       component: 'FileUpload',
       componentProps: {
         maxNumber: 1,
@@ -103,56 +104,54 @@ export function useFormSchema(): VbenFormSchema[] {
           'jpeg',
           'png',
         ],
-        showDescription: true,
+        showDescription: formType !== 'detail',
+        disabled: formType === 'detail',
       },
-      fieldName: 'fileUrl',
-      label: '附件',
       formItemClass: 'col-span-3',
     },
     {
-      fieldName: 'product',
-      label: '产品清单',
+      fieldName: 'items',
+      label: '销售产品清单',
       component: 'Input',
       formItemClass: 'col-span-3',
     },
     {
+      fieldName: 'discountPercent',
+      label: '优惠率(%)',
       component: 'InputNumber',
       componentProps: {
         placeholder: '请输入优惠率',
         min: 0,
         max: 100,
         precision: 2,
-        style: { width: '100%' },
       },
-      fieldName: 'discountPercent',
-      label: '优惠率(%)',
       rules: z.number().min(0).optional(),
     },
     {
+      fieldName: 'discountPrice',
+      label: '付款优惠',
       component: 'InputNumber',
       componentProps: {
         placeholder: '收款优惠',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
-        style: { width: '100%' },
       },
-      fieldName: 'discountPrice',
-      label: '付款优惠',
     },
     {
+      fieldName: 'totalPrice',
+      label: '优惠后金额',
       component: 'InputNumber',
       componentProps: {
         placeholder: '优惠后金额',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
-        style: { width: '100%' },
       },
-      fieldName: 'totalPrice',
-      label: '优惠后金额',
     },
     {
+      fieldName: 'accountId',
+      label: '结算账户',
       component: 'ApiSelect',
       componentProps: {
         placeholder: '请选择结算账户',
@@ -164,15 +163,12 @@ export function useFormSchema(): VbenFormSchema[] {
           value: 'id',
         },
       },
-      fieldName: 'accountId',
-      label: '结算账户',
     },
     {
       component: 'InputNumber',
       componentProps: {
         placeholder: '请输入收取订金',
         precision: 2,
-        style: { width: '100%' },
         min: 0,
       },
       fieldName: 'depositPrice',
@@ -182,8 +178,8 @@ export function useFormSchema(): VbenFormSchema[] {
   ];
 }
 
-/** 采购订单项表格列定义 */
-export function useSaleOrderItemTableColumns(): VxeTableGridOptions['columns'] {
+/** 表单的明细表格列 */
+export function useFormItemColumns(): VxeTableGridOptions['columns'] {
   return [
     { type: 'seq', title: '序号', minWidth: 50, fixed: 'left' },
     {
@@ -196,6 +192,7 @@ export function useSaleOrderItemTableColumns(): VxeTableGridOptions['columns'] {
       field: 'stockCount',
       title: '库存',
       minWidth: 80,
+      formatter: 'formatAmount3',
     },
     {
       field: 'productBarCode',
@@ -207,48 +204,54 @@ export function useSaleOrderItemTableColumns(): VxeTableGridOptions['columns'] {
       title: '单位',
       minWidth: 80,
     },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      slots: { default: 'remark' },
+    },
     {
       field: 'count',
       title: '数量',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'count' },
     },
     {
       field: 'productPrice',
       title: '产品单价',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'productPrice' },
     },
     {
       field: 'totalProductPrice',
       title: '金额',
       minWidth: 120,
+      fixed: 'right',
       formatter: 'formatAmount2',
     },
     {
       field: 'taxPercent',
       title: '税率(%)',
-      minWidth: 100,
+      minWidth: 105,
+      fixed: 'right',
       slots: { default: 'taxPercent' },
     },
     {
       field: 'taxPrice',
       title: '税额',
       minWidth: 120,
+      fixed: 'right',
       formatter: 'formatAmount2',
     },
     {
       field: 'totalPrice',
       title: '税额合计',
       minWidth: 120,
+      fixed: 'right',
       formatter: 'formatAmount2',
     },
-    {
-      field: 'remark',
-      title: '备注',
-      minWidth: 150,
-      slots: { default: 'remark' },
-    },
     {
       title: '操作',
       width: 50,
@@ -290,10 +293,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '订单时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始时间', '结束时间'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
     {
@@ -336,6 +337,15 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
       },
     },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入备注',
+        allowClear: true,
+      },
+    },
     {
       fieldName: 'outStatus',
       label: '出库状态',
@@ -406,34 +416,37 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'outCount',
       title: '出库数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'returnCount',
       title: '退货数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalProductPrice',
       title: '金额合计',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '含税金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'depositPrice',
       title: '收取订金',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
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 cafc50121a4cb1b286384fba8cf26cd37f596209..08051a6518d88ba0636ab7911b27408127fb3e6d 100644
--- a/apps/web-antd/src/views/erp/sale/order/index.vue
+++ b/apps/web-antd/src/views/erp/sale/order/index.vue
@@ -19,93 +19,82 @@ import {
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import SaleOrderForm from './modules/form.vue';
+import Form from './modules/form.vue';
 
 /** ERP 销售订单列表 */
 defineOptions({ name: 'ErpSaleOrder' });
 
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: SaleOrderForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-const checkedIds = ref<number[]>([]);
-function handleRowCheckboxChange({
-  records,
-}: {
-  records: ErpSaleOrderApi.SaleOrder[];
-}) {
-  checkedIds.value = records.map((item) => item.id!);
-}
-
-/** 详情 */
-function handleDetail(row: ErpSaleOrderApi.SaleOrder) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportSaleOrder(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '销售订单.xls', source: data });
 }
 
-/** 新增 */
+/** 新增销售订单 */
 function handleCreate() {
   formModalApi.setData({ type: 'create' }).open();
 }
 
-/** 编辑 */
+/** 编辑销售订单 */
 function handleEdit(row: ErpSaleOrderApi.SaleOrder) {
   formModalApi.setData({ type: 'edit', id: row.id }).open();
 }
 
-/** 删除 */
+/** 删除销售订单 */
 async function handleDelete(ids: number[]) {
   const hideLoading = message.loading({
     content: $t('ui.actionMessage.deleting'),
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
     await deleteSaleOrder(ids);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess'),
-      key: 'action_process_msg',
-    });
-    onRefresh();
-  } catch {
-    // 处理错误
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
 /** 审批/反审批操作 */
-function handleUpdateStatus(row: ErpSaleOrderApi.SaleOrder, status: number) {
+async function handleUpdateStatus(
+  row: ErpSaleOrderApi.SaleOrder,
+  status: number,
+) {
   const hideLoading = message.loading({
     content: `确定${status === 20 ? '审批' : '反审批'}该订单吗？`,
     duration: 0,
-    key: 'action_process_msg',
   });
-  updateSaleOrderStatus(row.id!, status)
-    .then(() => {
-      message.success({
-        content: `${status === 20 ? '审批' : '反审批'}成功`,
-        key: 'action_process_msg',
-      });
-      onRefresh();
-    })
-    .catch(() => {
-      // 处理错误
-    })
-    .finally(() => {
-      hideLoading();
-    });
+  try {
+    await updateSaleOrderStatus(row.id!, status);
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`);
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
 }
 
-/** 导出 */
-async function handleExport() {
-  const data = await exportSaleOrder(await gridApi.formApi.getValues());
-  downloadFileFromBlobPart({ fileName: '销售订单.xls', source: data });
+const checkedIds = ref<number[]>([]);
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ErpSaleOrderApi.SaleOrder[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+
+/** 查看详情 */
+function handleDetail(row: ErpSaleOrderApi.SaleOrder) {
+  formModalApi.setData({ type: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -151,8 +140,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/erp/sale/"
       />
     </template>
-    <FormModal @success="onRefresh" />
 
+    <FormModal @success="handleRefresh" />
     <Grid table-title="销售订单列表">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-antd/src/views/erp/sale/order/modules/form.vue b/apps/web-antd/src/views/erp/sale/order/modules/form.vue
index b45015da65a6fdd22cce410c85ab234fa60c3d3a..94ec1aeeb25b2b0a61c70dfd40a9ad5c6584ab37 100644
--- a/apps/web-antd/src/views/erp/sale/order/modules/form.vue
+++ b/apps/web-antd/src/views/erp/sale/order/modules/form.vue
@@ -1,32 +1,37 @@
 <script lang="ts" setup>
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 
-import { computed, nextTick, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
 import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
+import { getAccountSimpleList } from '#/api/erp/finance/account';
 import {
   createSaleOrder,
   getSaleOrder,
   updateSaleOrder,
 } from '#/api/erp/sale/order';
+import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
-import SaleOrderItemForm from './sale-order-item-form.vue';
+import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpSaleOrderApi.SaleOrder>();
-const formType = ref('');
-const itemFormRef = ref();
-
-const getTitle = computed(() => {
-  if (formType.value === 'create') return '添加销售订单';
-  if (formType.value === 'update') return '编辑销售订单';
-  return '销售订单详情';
-});
+const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const itemFormRef = ref<InstanceType<typeof ItemForm>>();
+
+/* eslint-disable unicorn/no-nested-ternary */
+const getTitle = computed(() =>
+  formType.value === 'create'
+    ? $t('ui.actionTitle.create', ['销售订单'])
+    : formType.value === 'edit'
+      ? $t('ui.actionTitle.edit', ['销售订单'])
+      : '销售订单详情',
+);
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -37,38 +42,37 @@ const [Form, formApi] = useVbenForm({
   },
   wrapperClass: 'grid-cols-3',
   layout: 'vertical',
-  schema: useFormSchema(),
+  schema: useFormSchema(formType.value),
   showDefaultActions: false,
   handleValuesChange: (values, changedFields) => {
+    // 目的：同步到 item-form 组件，触发整体的价格计算
     if (formData.value && changedFields.includes('discountPercent')) {
       formData.value.discountPercent = values.discountPercent;
     }
   },
 });
 
+/** 更新销售订单项 */
 const handleUpdateItems = (items: ErpSaleOrderApi.SaleOrderItem[]) => {
   formData.value = modalApi.getData<ErpSaleOrderApi.SaleOrder>();
-  if (formData.value) {
-    formData.value.items = items;
-  }
+  formData.value.items = items;
+  formApi.setValues({
+    items,
+  });
 };
 
+/** 更新优惠金额 */
 const handleUpdateDiscountPrice = (discountPrice: number) => {
-  if (formData.value) {
-    formData.value.discountPrice = discountPrice;
-    formApi.setValues({
-      discountPrice: formData.value.discountPrice,
-    });
-  }
+  formApi.setValues({
+    discountPrice,
+  });
 };
 
+/** 更新总金额 */
 const handleUpdateTotalPrice = (totalPrice: number) => {
-  if (formData.value) {
-    formData.value.totalPrice = totalPrice;
-    formApi.setValues({
-      totalPrice: formData.value.totalPrice,
-    });
-  }
+  formApi.setValues({
+    totalPrice,
+  });
 };
 
 /** 创建或更新销售订单 */
@@ -78,45 +82,19 @@ const [Modal, modalApi] = useVbenModal({
     if (!valid) {
       return;
     }
-    await nextTick();
-
     const itemFormInstance = Array.isArray(itemFormRef.value)
       ? itemFormRef.value[0]
       : itemFormRef.value;
-    if (itemFormInstance && typeof itemFormInstance.validate === 'function') {
-      try {
-        const isValid = await itemFormInstance.validate();
-        if (!isValid) {
-          message.error('子表单验证失败');
-          return;
-        }
-      } catch (error: any) {
-        message.error(error.message || '子表单验证失败');
-        return;
-      }
-    } else {
-      message.error('子表单验证方法不存在');
-      return;
-    }
-
-    // 验证产品清单不能为空
-    if (!formData.value?.items || formData.value.items.length === 0) {
-      message.error('产品清单不能为空，请至少添加一个产品');
+    try {
+      itemFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
       return;
     }
 
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as ErpSaleOrderApi.SaleOrder;
-    data.items = formData.value?.items?.map((item) => ({
-      ...item,
-      // 解决新增销售订单报错
-      id: undefined,
-    }));
-    // 将文件数组转换为字符串
-    if (data.fileUrl && Array.isArray(data.fileUrl)) {
-      data.fileUrl = data.fileUrl.length > 0 ? data.fileUrl[0] : '';
-    }
     try {
       await (formType.value === 'create'
         ? createSaleOrder(data)
@@ -124,7 +102,7 @@ const [Modal, modalApi] = useVbenModal({
       // 关闭并提示
       await modalApi.close();
       emit('success');
-      message.success(formType.value === 'create' ? '新增成功' : '更新成功');
+      message.success($t('ui.actionMessage.operationSuccess'));
     } finally {
       modalApi.unlock();
     }
@@ -136,61 +114,40 @@ const [Modal, modalApi] = useVbenModal({
     }
     // 加载数据
     const data = modalApi.getData<{ id?: number; type: string }>();
-    if (!data) {
-      return;
-    }
     formType.value = data.type;
-
-    if (!data.id) {
-      // 初始化空的表单数据
-      formData.value = { items: [] } as unknown as ErpSaleOrderApi.SaleOrder;
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init([]);
+    formApi.setDisabled(formType.value === 'detail');
+    formApi.updateSchema(useFormSchema(formType.value));
+    if (!data || !data.id) {
+      // 新增时，默认选中账户
+      const accountList = await getAccountSimpleList();
+      const defaultAccount = accountList.find((item) => item.defaultStatus);
+      if (defaultAccount) {
+        await formApi.setValues({ accountId: defaultAccount.id });
       }
       return;
     }
-
     modalApi.lock();
     try {
       formData.value = await getSaleOrder(data.id);
       // 设置到 values
       await formApi.setValues(formData.value);
-      // 初始化子表单
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init(formData.value.items || []);
-      }
     } finally {
       modalApi.unlock();
     }
   },
 });
-
-defineExpose({ modalApi });
 </script>
 
 <template>
   <Modal
-    v-bind="$attrs"
     :title="getTitle"
-    class="w-1/2"
-    :closable="true"
-    :mask-closable="true"
+    class="w-3/4"
     :show-confirm-button="formType !== 'detail'"
   >
     <Form class="mx-3">
-      <template #product="slotProps">
-        <SaleOrderItemForm
-          v-bind="slotProps"
+      <template #items>
+        <ItemForm
           ref="itemFormRef"
-          class="w-full"
           :items="formData?.items ?? []"
           :disabled="formType === 'detail'"
           :discount-percent="formData?.discountPercent ?? 0"
diff --git a/apps/web-antd/src/views/erp/sale/order/modules/sale-order-item-form.vue b/apps/web-antd/src/views/erp/sale/order/modules/item-form.vue
similarity index 60%
rename from apps/web-antd/src/views/erp/sale/order/modules/sale-order-item-form.vue
rename to apps/web-antd/src/views/erp/sale/order/modules/item-form.vue
index 1e504eba6ed19657299903e1590cddb2b99dc91f..1f28a74e2fa8507409c77e4163a6635a0ffa59df 100644
--- a/apps/web-antd/src/views/erp/sale/order/modules/sale-order-item-form.vue
+++ b/apps/web-antd/src/views/erp/sale/order/modules/item-form.vue
@@ -1,9 +1,14 @@
 <script lang="ts" setup>
+import type { ErpProductApi } from '#/api/erp/product/product';
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 
-import { nextTick, onMounted, ref, watch } from 'vue';
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
-import { erpPriceMultiply } from '@vben/utils';
+import {
+  erpCountInputFormatter,
+  erpPriceInputFormatter,
+  erpPriceMultiply,
+} from '@vben/utils';
 
 import { Input, InputNumber, Select } from 'ant-design-vue';
 
@@ -11,7 +16,13 @@ import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProductSimpleList } from '#/api/erp/product/product';
 import { getStockCount } from '#/api/erp/stock/stock';
 
-import { useSaleOrderItemTableColumns } from '../data';
+import { useFormItemColumns } from '../data';
+
+interface Props {
+  items?: ErpSaleOrderApi.SaleOrderItem[];
+  disabled?: boolean;
+  discountPercent?: number;
+}
 
 const props = withDefaults(defineProps<Props>(), {
   items: () => [],
@@ -25,31 +36,39 @@ const emit = defineEmits([
   'update:total-price',
 ]);
 
-interface Props {
-  items?: ErpSaleOrderApi.SaleOrderItem[];
-  disabled?: boolean;
-  discountPercent?: number;
-}
+const tableData = ref<ErpSaleOrderApi.SaleOrderItem[]>([]); // 表格数据
+const productOptions = ref<ErpProductApi.Product[]>([]); // 产品下拉选项
 
-const tableData = ref<ErpSaleOrderApi.SaleOrderItem[]>([]);
-const productOptions = ref<any[]>([]);
+/** 获取表格合计数据 */
+const summaries = computed(() => {
+  return {
+    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
+    totalProductPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalProductPrice || 0),
+      0,
+    ),
+    taxPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.taxPrice || 0),
+      0,
+    ),
+    totalPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalPrice || 0),
+      0,
+    ),
+  };
+});
 
 /** 表格配置 */
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    editConfig: {
-      trigger: 'click',
-      mode: 'cell',
-    },
-    columns: useSaleOrderItemTableColumns(),
+    columns: useFormItemColumns(),
     data: tableData.value,
-    border: true,
-    showOverflow: true,
-    autoResize: true,
     minHeight: 250,
-    keepSource: true,
+    autoResize: true,
+    border: true,
     rowConfig: {
-      keyField: 'id',
+      keyField: 'seq',
+      isHover: true,
     },
     pagerConfig: {
       enabled: false,
@@ -67,10 +86,10 @@ watch(
     if (!items) {
       return;
     }
-    await nextTick();
+    items.forEach((item) => initRow(item));
     tableData.value = [...items];
-    await nextTick();
-    gridApi.grid.reloadData(tableData.value);
+    await nextTick(); // 特殊：保证 gridApi 已经初始化
+    await gridApi.grid.reloadData(tableData.value);
   },
   {
     immediate: true,
@@ -93,81 +112,64 @@ watch(
         ? 0
         : erpPriceMultiply(totalPrice, props.discountPercent / 100);
     const finalTotalPrice = totalPrice - discountPrice!;
-
-    // 发送计算结果给父组件
+    // 通知父组件更新
     emit('update:discount-price', discountPrice);
     emit('update:total-price', finalTotalPrice);
   },
   { deep: true },
 );
 
-/** 初始化 */
-onMounted(async () => {
-  productOptions.value = await getProductSimpleList();
-});
-
+/** 处理新增 */
 function handleAdd() {
   const newRow = {
+    id: undefined,
     productId: undefined,
-    productName: '',
-    productUnitId: undefined,
-    productUnitName: '',
-    productBarCode: '',
+    productUnitName: undefined, // 产品单位
+    productBarCode: undefined, // 产品条码
+    productPrice: undefined,
+    stockCount: undefined,
     count: 1,
-    productPrice: 0,
-    totalProductPrice: 0,
+    totalProductPrice: undefined,
     taxPercent: 0,
-    taxPrice: 0,
-    totalPrice: 0,
-    stockCount: 0,
-    remark: '',
+    taxPrice: undefined,
+    totalPrice: undefined,
+    remark: undefined,
   };
   tableData.value.push(newRow);
-  gridApi.grid.insertAt(newRow, -1);
+  // 通知父组件更新
   emit('update:items', [...tableData.value]);
 }
 
+/** 处理删除 */
 function handleDelete(row: ErpSaleOrderApi.SaleOrderItem) {
-  gridApi.grid.remove(row);
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index !== -1) {
     tableData.value.splice(index, 1);
   }
+  // 通知父组件更新
   emit('update:items', [...tableData.value]);
 }
 
+/** 处理产品变更 */
 async function handleProductChange(productId: any, row: any) {
   const product = productOptions.value.find((p) => p.id === productId);
   if (!product) {
     return;
   }
-
-  const stockCount = await getStockCount(productId);
-
   row.productId = productId;
   row.productUnitId = product.unitId;
   row.productBarCode = product.barCode;
   row.productUnitName = product.unitName;
   row.productName = product.name;
-  row.stockCount = stockCount || 0;
+  row.stockCount = (await getStockCount(productId)) || 0;
   row.productPrice = product.salePrice || 0;
   row.count = row.count || 1;
-
-  handlePriceChange(row);
-}
-
-function handlePriceChange(row: any) {
-  if (row.productPrice && row.count) {
-    row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
-    row.taxPrice =
-      erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
-    row.totalPrice = row.totalProductPrice + row.taxPrice;
-  }
-  handleUpdateValue(row);
+  handleRowChange(row);
 }
 
-function handleUpdateValue(row: any) {
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index === -1) {
     tableData.value.push(row);
   } else {
@@ -176,83 +178,45 @@ function handleUpdateValue(row: any) {
   emit('update:items', [...tableData.value]);
 }
 
-const getSummaries = (): {
-  count: number;
-  productName: string;
-  taxPrice: number;
-  totalPrice: number;
-  totalProductPrice: number;
-} => {
-  return {
-    productName: '合计',
-    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
-    totalProductPrice: tableData.value.reduce(
-      (sum, item) => sum + (item.totalProductPrice || 0),
-      0,
-    ),
-    taxPrice: tableData.value.reduce(
-      (sum, item) => sum + (item.taxPrice || 0),
-      0,
-    ),
-    totalPrice: tableData.value.reduce(
-      (sum, item) => sum + (item.totalPrice || 0),
-      0,
-    ),
-  };
+/** 初始化行数据 */
+const initRow = (row: ErpSaleOrderApi.SaleOrderItem): void => {
+  if (row.productPrice && row.count) {
+    row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+    row.taxPrice =
+      erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
+    row.totalPrice = row.totalProductPrice + row.taxPrice;
+  }
 };
 
-const validate = async (): Promise<boolean> => {
-  try {
-    for (let i = 0; i < tableData.value.length; i++) {
-      const item = tableData.value[i];
-      if (item) {
-        if (!item.productId) {
-          throw new Error(`第 ${i + 1} 行：产品不能为空`);
-        }
-        if (!item.count || item.count <= 0) {
-          throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
-        }
-        if (!item.productPrice || item.productPrice <= 0) {
-          throw new Error(`第 ${i + 1} 行：产品单价不能为空`);
-        }
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (item) {
+      if (!item.productId) {
+        throw new Error(`第 ${i + 1} 行：产品不能为空`);
+      }
+      if (!item.count || item.count <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
+      }
+      if (!item.productPrice || item.productPrice <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品单价不能为空`);
       }
     }
-    return true;
-  } catch (error) {
-    console.error('验证失败:', error);
-    throw error;
   }
-};
-
-const getData = (): ErpSaleOrderApi.SaleOrderItem[] => tableData.value;
-const init = (items: ErpSaleOrderApi.SaleOrderItem[] | undefined): void => {
-  tableData.value =
-    items && items.length > 0
-      ? items.map((item) => {
-          const newItem = { ...item };
-          if (newItem.productPrice && newItem.count) {
-            newItem.totalProductPrice =
-              erpPriceMultiply(newItem.productPrice, newItem.count) ?? 0;
-            newItem.taxPrice =
-              erpPriceMultiply(
-                newItem.totalProductPrice,
-                (newItem.taxPercent || 0) / 100,
-              ) ?? 0;
-            newItem.totalPrice = newItem.totalProductPrice + newItem.taxPrice;
-          }
-          return newItem;
-        })
-      : [];
-  // TODO @XuZhiqiang：使用 await 风格哈；
-  nextTick(() => {
-    gridApi.grid.reloadData(tableData.value);
-  });
-};
+}
 
 defineExpose({
   validate,
-  getData,
-  init,
+});
+
+/** 初始化 */
+onMounted(async () => {
+  productOptions.value = await getProductSimpleList();
+  // 目的：新增时，默认添加一行
+  if (tableData.value.length === 0) {
+    handleAdd();
+  }
 });
 </script>
 
@@ -260,40 +224,39 @@ defineExpose({
   <Grid class="w-full">
     <template #productId="{ row }">
       <Select
-        v-if="!disabled"
         v-model:value="row.productId"
         :options="productOptions"
         :field-names="{ label: 'name', value: 'id' }"
-        style="width: 100%"
+        class="w-full"
         placeholder="请选择产品"
         show-search
         @change="handleProductChange($event, row)"
       />
-      <span v-else>{{ row.productName || '-' }}</span>
     </template>
-
     <template #count="{ row }">
       <InputNumber
         v-if="!disabled"
         v-model:value="row.count"
         :min="0"
-        :precision="2"
-        @change="handlePriceChange(row)"
+        :precision="3"
+        @change="handleRowChange(row)"
       />
-      <span v-else>{{ row.count || '-' }}</span>
+      <span v-else>{{ erpCountInputFormatter(row.count) || '-' }}</span>
     </template>
-
     <template #productPrice="{ row }">
       <InputNumber
         v-if="!disabled"
         v-model:value="row.productPrice"
         :min="0"
         :precision="2"
-        @change="handlePriceChange(row)"
+        @change="handleRowChange(row)"
       />
-      <span v-else>{{ row.productPrice || '-' }}</span>
+      <span v-else>{{ erpPriceInputFormatter(row.productPrice) || '-' }}</span>
+    </template>
+    <template #remark="{ row }">
+      <Input v-if="!disabled" v-model:value="row.remark" class="w-full" />
+      <span v-else>{{ row.remark || '-' }}</span>
     </template>
-
     <template #taxPercent="{ row }">
       <InputNumber
         v-if="!disabled"
@@ -301,14 +264,25 @@ defineExpose({
         :min="0"
         :max="100"
         :precision="2"
-        @change="handlePriceChange(row)"
+        @change="handleRowChange(row)"
       />
       <span v-else>{{ row.taxPercent || '-' }}</span>
     </template>
-
-    <template #remark="{ row }">
-      <Input v-if="!disabled" v-model:value="row.remark" class="w-full" />
-      <span v-else>{{ row.remark || '-' }}</span>
+    <template #actions="{ row }">
+      <TableAction
+        v-if="!disabled"
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该产品吗？',
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
     </template>
 
     <template #bottom>
@@ -316,42 +290,28 @@ defineExpose({
         <div class="text-muted-foreground flex justify-between text-sm">
           <span class="text-foreground font-medium">合计：</span>
           <div class="flex space-x-4">
-            <span>数量：{{ getSummaries().count }}</span>
-            <span>金额：{{ getSummaries().totalProductPrice }}</span>
-            <span>税额：{{ getSummaries().taxPrice }}</span>
-            <span>税额合计：{{ getSummaries().totalPrice }}</span>
+            <span>数量：{{ erpCountInputFormatter(summaries.count) }}</span>
+            <span>
+              金额：{{ erpPriceInputFormatter(summaries.totalProductPrice) }}
+            </span>
+            <span>税额：{{ erpPriceInputFormatter(summaries.taxPrice) }}</span>
+            <span>
+              税额合计：{{ erpPriceInputFormatter(summaries.totalPrice) }}
+            </span>
           </div>
         </div>
       </div>
-
       <TableAction
         v-if="!disabled"
-        class="mt-4 flex justify-center"
+        class="mt-2 flex justify-center"
         :actions="[
           {
-            label: '添加产品',
+            label: '添加销售产品',
             type: 'default',
             onClick: handleAdd,
           },
         ]"
       />
     </template>
-
-    <template #actions="{ row }">
-      <TableAction
-        v-if="!disabled"
-        :actions="[
-          {
-            label: '删除',
-            type: 'link',
-            danger: true,
-            popConfirm: {
-              title: '确认删除该产品吗？',
-              confirm: handleDelete.bind(null, row),
-            },
-          },
-        ]"
-      />
-    </template>
   </Grid>
 </template>
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 b345974a693792486e8eb13e3cab53878ff5b66f..95f2853fca9192e0780fe9553224432f78121c10 100644
--- a/apps/web-antd/src/views/erp/sale/out/data.ts
+++ b/apps/web-antd/src/views/erp/sale/out/data.ts
@@ -11,44 +11,39 @@ import { getProductSimpleList } from '#/api/erp/product/product';
 import { getCustomerSimpleList } from '#/api/erp/sale/customer';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 表单的配置项 */
 export function useFormSchema(formType: string): VbenFormSchema[] {
   return [
     {
+      fieldName: 'id',
       component: 'Input',
-      componentProps: {
-        style: { display: 'none' },
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
       },
-      fieldName: 'id',
-      label: 'ID',
-      hideLabel: true,
-      formItemClass: 'hidden',
     },
     {
+      fieldName: 'no',
+      label: '出库单号',
       component: 'Input',
       componentProps: {
         placeholder: '系统自动生成',
         disabled: true,
       },
-      fieldName: 'no',
-      label: '出库单号',
     },
     {
-      component: 'ApiSelect',
+      fieldName: 'outTime',
+      label: '出库时间',
+      component: 'DatePicker',
       componentProps: {
-        disabled: true,
-        placeholder: '请选择客户',
-        allowClear: true,
-        showSearch: true,
-        api: getCustomerSimpleList,
-        fieldNames: {
-          label: 'name',
-          value: 'id',
-        },
+        disabled: formType === 'detail',
+        placeholder: '选择出库时间',
+        showTime: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       },
-      fieldName: 'customerId',
-      label: '客户',
       rules: 'required',
     },
     {
@@ -63,35 +58,53 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
       },
     },
     {
-      component: 'DatePicker',
+      fieldName: 'customerId',
+      label: '客户',
+      component: 'ApiSelect',
       componentProps: {
-        disabled: formType === 'detail',
-        placeholder: '选择出库时间',
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-        style: { width: '100%' },
+        disabled: true,
+        placeholder: '请选择客户',
+        allowClear: true,
+        showSearch: true,
+        api: getCustomerSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
       },
-      fieldName: 'outTime',
-      label: '出库时间',
       rules: 'required',
     },
     {
+      fieldName: 'saleUserId',
+      label: '销售人员',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择销售人员',
+        allowClear: true,
+        showSearch: true,
+        api: getSimpleUserList,
+        fieldNames: {
+          label: 'nickname',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
       component: 'Textarea',
       componentProps: {
         placeholder: '请输入备注',
-        disabled: formType === 'detail',
         autoSize: { minRows: 1, maxRows: 1 },
-        class: 'w-full',
+        disabled: formType === 'detail',
       },
-      fieldName: 'remark',
       formItemClass: 'col-span-2',
-      label: '备注',
     },
     {
+      fieldName: 'fileUrl',
+      label: '附件',
       component: 'FileUpload',
       componentProps: {
-        disabled: formType === 'detail',
         maxNumber: 1,
         maxSize: 10,
         accept: [
@@ -105,69 +118,74 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
           'jpeg',
           'png',
         ],
-        showDescription: true,
+        showDescription: formType !== 'detail',
+        disabled: formType === 'detail',
       },
-      fieldName: 'fileUrl',
-      label: '附件',
       formItemClass: 'col-span-3',
     },
     {
-      fieldName: 'product',
-      label: '产品清单',
+      fieldName: 'items',
+      label: '出库产品清单',
       component: 'Input',
       formItemClass: 'col-span-3',
     },
     {
-      component: 'InputNumber',
       fieldName: 'discountPercent',
+      label: '优惠率(%)',
+      component: 'InputNumber',
       componentProps: {
-        placeholder: '优惠率',
+        placeholder: '请输入优惠率',
         min: 0,
         max: 100,
-        disabled: true,
         precision: 2,
-        style: { width: '100%' },
       },
-
-      label: '优惠率(%)',
+      rules: z.number().min(0).optional(),
     },
     {
+      fieldName: 'discountPrice',
+      label: '收款优惠',
       component: 'InputNumber',
       componentProps: {
         placeholder: '付款优惠',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
-        style: { width: '100%' },
       },
-      fieldName: 'discountPrice',
-      label: '付款优惠',
     },
     {
+      fieldName: 'discountedPrice',
+      label: '优惠后金额',
       component: 'InputNumber',
       componentProps: {
         placeholder: '优惠后金额',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
-        style: { width: '100%' },
       },
-      fieldName: 'discountedPrice',
-      label: '优惠后金额',
+      dependencies: {
+        triggerFields: ['totalPrice', 'otherPrice'],
+        componentProps: (values) => {
+          const totalPrice = values.totalPrice || 0;
+          const otherPrice = values.otherPrice || 0;
+          values.discountedPrice = totalPrice - otherPrice;
+          return {};
+        },
+      },
     },
     {
+      fieldName: 'otherPrice',
+      label: '其他费用',
       component: 'InputNumber',
       componentProps: {
         disabled: formType === 'detail',
         placeholder: '请输入其他费用',
         precision: 2,
         formatter: erpPriceInputFormatter,
-        style: { width: '100%' },
       },
-      fieldName: 'otherPrice',
-      label: '其他费用',
     },
     {
+      fieldName: 'accountId',
+      label: '结算账户',
       component: 'ApiSelect',
       componentProps: {
         placeholder: '请选择结算账户',
@@ -180,26 +198,25 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
           value: 'id',
         },
       },
-      fieldName: 'accountId',
-      label: '结算账户',
     },
     {
+      fieldName: 'totalPrice',
+      label: '应收金额',
       component: 'InputNumber',
       componentProps: {
         precision: 2,
-        style: { width: '100%' },
-        disabled: true,
         min: 0,
+        disabled: true,
       },
-      fieldName: 'totalPrice',
-      label: '应收金额',
       rules: z.number().min(0).optional(),
     },
   ];
 }
 
-/** 采购订单项表格列定义 */
-export function useSaleOutItemTableColumns(): VxeTableGridOptions['columns'] {
+/** 表单的明细表格列 */
+export function useFormItemColumns(
+  formData?: any[],
+): VxeTableGridOptions['columns'] {
   return [
     { type: 'seq', title: '序号', minWidth: 50, fixed: 'left' },
     {
@@ -216,8 +233,9 @@ export function useSaleOutItemTableColumns(): VxeTableGridOptions['columns'] {
     },
     {
       field: 'stockCount',
-      title: '仓库库存',
+      title: '库存',
       minWidth: 80,
+      formatter: 'formatAmount3',
     },
     {
       field: 'productBarCode',
@@ -229,15 +247,27 @@ export function useSaleOutItemTableColumns(): VxeTableGridOptions['columns'] {
       title: '单位',
       minWidth: 80,
     },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      slots: { default: 'remark' },
+    },
     {
       field: 'totalCount',
       title: '原数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
+      fixed: 'right',
+      visible: formData && formData[0]?.outCount !== undefined,
     },
     {
       field: 'outCount',
-      title: '已出库数量',
+      title: '已出库',
+      formatter: 'formatAmount3',
       minWidth: 120,
+      fixed: 'right',
+      visible: formData && formData[0]?.returnCount !== undefined,
     },
     {
       field: 'count',
@@ -264,7 +294,8 @@ export function useSaleOutItemTableColumns(): VxeTableGridOptions['columns'] {
       fixed: 'right',
       field: 'taxPercent',
       title: '税率(%)',
-      minWidth: 100,
+      minWidth: 105,
+      slots: { default: 'taxPercent' },
     },
     {
       fixed: 'right',
@@ -280,6 +311,12 @@ export function useSaleOutItemTableColumns(): VxeTableGridOptions['columns'] {
       minWidth: 120,
       formatter: 'formatAmount2',
     },
+    {
+      title: '操作',
+      width: 50,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
   ];
 }
 
@@ -315,10 +352,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '出库时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始时间', '结束时间'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
     {
@@ -347,7 +382,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
         api: getWarehouseSimpleList,
         labelField: 'name',
         valueField: 'id',
-        filterOption: false,
       },
     },
     {
@@ -390,12 +424,12 @@ export function useGridFormSchema(): VbenFormSchema[] {
     },
     {
       fieldName: 'status',
-      label: '状态',
+      label: '审批状态',
       component: 'Select',
       componentProps: {
-        placeholder: '请选择状态',
-        allowClear: true,
         options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
+        placeholder: '请选择审批状态',
+        allowClear: true,
       },
     },
     {
@@ -449,18 +483,19 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '应收金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'receiptPrice',
       title: '已收金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
@@ -473,7 +508,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       field: 'status',
-      title: '状态',
+      title: '审批状态',
       minWidth: 120,
       cellRender: {
         name: 'CellDict',
@@ -482,12 +517,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       title: '操作',
-      minWidth: 250,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
+
 /** 列表的搜索表单 */
 export function useOrderGridFormSchema(): VbenFormSchema[] {
   return [
@@ -498,7 +534,6 @@ export function useOrderGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         placeholder: '请输入订单单号',
         allowClear: true,
-        disabled: true,
       },
     },
     {
@@ -521,10 +556,8 @@ export function useOrderGridFormSchema(): VbenFormSchema[] {
       label: '订单时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始时间', '结束时间'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
   ];
@@ -569,23 +602,25 @@ export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'outCount',
       title: '出库数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalProductPrice',
       title: '金额合计',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '含税金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
   ];
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 f8a54dc98f2931a756ae2d68a0e1c4f4d914d92f..cb38ad9fece7d73e1f4a68fc11f5ff277b7887a0 100644
--- a/apps/web-antd/src/views/erp/sale/out/index.vue
+++ b/apps/web-antd/src/views/erp/sale/out/index.vue
@@ -19,94 +19,79 @@ import {
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import SaleOutForm from './modules/sale-out-form.vue';
+import Form from './modules/form.vue';
 
 /** ERP 销售出库列表 */
 defineOptions({ name: 'ErpSaleOut' });
 
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: SaleOutForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-// TODO @Xuzhiqiang：批量删除待实现
-const checkedIds = ref<number[]>([]);
-function handleRowCheckboxChange({
-  records,
-}: {
-  records: ErpSaleOutApi.SaleOut[];
-}) {
-  checkedIds.value = records.map((item) => item.id!);
-}
-
-/** 详情 */
-function handleDetail(row: ErpSaleOutApi.SaleOut) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportSaleOut(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '销售出库.xls', source: data });
 }
 
-/** 新增 */
+/** 新增销售出库 */
 function handleCreate() {
   formModalApi.setData({ type: 'create' }).open();
 }
 
-/** 编辑 */
+/** 编辑销售出库 */
 function handleEdit(row: ErpSaleOutApi.SaleOut) {
-  formModalApi.setData({ type: 'update', id: row.id }).open();
+  formModalApi.setData({ type: 'edit', id: row.id }).open();
 }
 
-/** 删除 */
+/** 删除销售出库 */
 async function handleDelete(ids: number[]) {
   const hideLoading = message.loading({
     content: $t('ui.actionMessage.deleting'),
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
     await deleteSaleOut(ids);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess'),
-      key: 'action_process_msg',
-    });
-    onRefresh();
-  } catch {
-    // 处理错误
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
 /** 审批/反审批操作 */
-function handleUpdateStatus(row: ErpSaleOutApi.SaleOut, status: number) {
+async function handleUpdateStatus(row: ErpSaleOutApi.SaleOut, status: number) {
   const hideLoading = message.loading({
     content: `确定${status === 20 ? '审批' : '反审批'}该订单吗？`,
     duration: 0,
-    key: 'action_process_msg',
   });
-  updateSaleOutStatus({ id: row.id!, status })
-    .then(() => {
-      message.success({
-        content: `${status === 20 ? '审批' : '反审批'}成功`,
-        key: 'action_process_msg',
-      });
-      onRefresh();
-    })
-    .catch(() => {
-      // 处理错误
-    })
-    .finally(() => {
-      hideLoading();
-    });
+  try {
+    await updateSaleOutStatus(row.id!, status);
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`);
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
 }
 
-/** 导出 */
-async function handleExport() {
-  const data = await exportSaleOut(await gridApi.formApi.getValues());
-  downloadFileFromBlobPart({ fileName: '销售出库.xls', source: data });
+const checkedIds = ref<number[]>([]);
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ErpSaleOutApi.SaleOut[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+
+/** 查看详情 */
+function handleDetail(row: ErpSaleOutApi.SaleOut) {
+  formModalApi.setData({ type: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -152,8 +137,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/erp/sale/"
       />
     </template>
-    <FormModal @success="onRefresh" />
 
+    <FormModal @success="handleRefresh" />
     <Grid table-title="销售出库列表">
       <template #toolbar-tools>
         <TableAction
@@ -180,11 +165,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
               icon: ACTION_ICON.DELETE,
               auth: ['erp:sale-out:delete'],
               popConfirm: {
-                disabled: isEmpty(checkedIds),
                 title: `是否删除所选中数据？`,
-                confirm: () => {
-                  handleDelete(checkedIds);
-                },
+                confirm: handleDelete.bind(null, checkedIds),
               },
             },
           ]"
@@ -229,7 +211,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               auth: ['erp:sale-out:delete'],
               popConfirm: {
                 title: $t('ui.actionMessage.deleteConfirm', [row.no]),
-                confirm: () => handleDelete([row.id!]),
+                confirm: handleDelete.bind(null, [row.id!]),
               },
             },
           ]"
diff --git a/apps/web-antd/src/views/erp/sale/out/modules/sale-out-form.vue b/apps/web-antd/src/views/erp/sale/out/modules/form.vue
similarity index 41%
rename from apps/web-antd/src/views/erp/sale/out/modules/sale-out-form.vue
rename to apps/web-antd/src/views/erp/sale/out/modules/form.vue
index 0ed8d14e6bef58a9d29301a40abbc64daa2dd538..7c30275a23d68680e74b9e16acef6e199c7ded22 100644
--- a/apps/web-antd/src/views/erp/sale/out/modules/sale-out-form.vue
+++ b/apps/web-antd/src/views/erp/sale/out/modules/form.vue
@@ -2,25 +2,26 @@
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 import type { ErpSaleOutApi } from '#/api/erp/sale/out';
 
-import { computed, nextTick, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
 
 import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
+import { getAccountSimpleList } from '#/api/erp/finance/account';
 import { createSaleOut, getSaleOut, updateSaleOut } from '#/api/erp/sale/out';
 
 import { useFormSchema } from '../data';
-import SaleOutItemForm from './sale-out-item-form.vue';
-import SelectSaleOrderForm from './select-sale-order-form.vue';
+import ItemForm from './item-form.vue';
+import SaleOrderSelect from './sale-order-select.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<
   ErpSaleOutApi.SaleOut & {
     accountId?: number;
     customerId?: number;
-    discountedPrice?: number;
     discountPercent?: number;
     fileUrl?: string;
     order?: ErpSaleOrderApi.SaleOrder;
@@ -39,17 +40,19 @@ const formData = ref<
   discountPrice: 0,
   totalPrice: 0,
   otherPrice: 0,
-  discountedPrice: 0,
   items: [],
 });
-const formType = ref('');
-const itemFormRef = ref();
-
-const getTitle = computed(() => {
-  if (formType.value === 'create') return '添加销售出库';
-  if (formType.value === 'update') return '编辑销售出库';
-  return '销售出库详情';
-});
+const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const itemFormRef = ref<InstanceType<typeof ItemForm>>();
+
+/* eslint-disable unicorn/no-nested-ternary */
+const getTitle = computed(() =>
+  formType.value === 'create'
+    ? $t('ui.actionTitle.create', ['销售出库'])
+    : formType.value === 'edit'
+      ? $t('ui.actionTitle.edit', ['销售出库'])
+      : '销售出库详情',
+);
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -63,27 +66,48 @@ const [Form, formApi] = useVbenForm({
   schema: useFormSchema(formType.value),
   showDefaultActions: false,
   handleValuesChange: (values, changedFields) => {
-    if (formData.value && changedFields.includes('otherPrice')) {
-      formData.value.otherPrice = values.otherPrice;
-      formData.value.totalPrice =
-        (formData.value.discountedPrice || 0) +
-        (formData.value.otherPrice || 0);
-
-      formApi.setValues(formData.value, false);
+    // 目的：同步到 item-form 组件，触发整体的价格计算
+    if (formData.value) {
+      if (changedFields.includes('otherPrice')) {
+        formData.value.otherPrice = values.otherPrice;
+      }
+      if (changedFields.includes('discountPercent')) {
+        formData.value.discountPercent = values.discountPercent;
+      }
     }
   },
 });
 
-// 更新销售出库项
-const handleUpdateItems = async (items: ErpSaleOutApi.SaleOutItem[]) => {
-  if (formData.value) {
-    const data = await formApi.getValues();
-    formData.value = { ...data, items };
-    await formApi.setValues(formData.value, false);
-  }
+/** 更新销售出库项 */
+const handleUpdateItems = (items: ErpSaleOutApi.SaleOutItem[]) => {
+  formData.value.items = items;
+  formApi.setValues({
+    items,
+  });
 };
 
-// 选择采购订单
+/** 更新其他费用 */
+const handleUpdateOtherPrice = (otherPrice: number) => {
+  formApi.setValues({
+    otherPrice,
+  });
+};
+
+/** 更新优惠金额 */
+const handleUpdateDiscountPrice = (discountPrice: number) => {
+  formApi.setValues({
+    discountPrice,
+  });
+};
+
+/** 更新总金额 */
+const handleUpdateTotalPrice = (totalPrice: number) => {
+  formApi.setValues({
+    totalPrice,
+  });
+};
+
+/** 选择销售订单 */
 const handleUpdateOrder = (order: ErpSaleOrderApi.SaleOrder) => {
   formData.value = {
     ...formData.value,
@@ -95,7 +119,7 @@ const handleUpdateOrder = (order: ErpSaleOrderApi.SaleOrder) => {
     discountPercent: order.discountPercent!,
     fileUrl: order.fileUrl!,
   };
-  // 将订单项设置到入库单项
+  // 将订单项设置到出库单项
   order.items!.forEach((item: any) => {
     item.totalCount = item.count;
     item.count = item.totalCount - item.outCount;
@@ -105,89 +129,29 @@ const handleUpdateOrder = (order: ErpSaleOrderApi.SaleOrder) => {
   formData.value.items = order.items!.filter(
     (item) => item.count && item.count > 0,
   ) as ErpSaleOutApi.SaleOutItem[];
-
   formApi.setValues(formData.value, false);
 };
 
-watch(
-  () => formData.value.items!,
-  (newItems: ErpSaleOutApi.SaleOutItem[]) => {
-    if (newItems && newItems.length > 0) {
-      // 计算每个产品的总价、税额和总价
-      newItems.forEach((item) => {
-        item.totalProductPrice = (item.productPrice || 0) * (item.count || 0);
-        item.taxPrice =
-          (item.totalProductPrice || 0) * ((item.taxPercent || 0) / 100);
-        item.totalPrice = (item.totalProductPrice || 0) + (item.taxPrice || 0);
-      });
-      // 计算总价
-      formData.value.totalPrice = newItems.reduce((sum, item) => {
-        return sum + (item.totalProductPrice || 0) + (item.taxPrice || 0);
-      }, 0);
-    } else {
-      formData.value.totalPrice = 0;
-    }
-    // 优惠金额
-    formData.value.discountPrice =
-      ((formData.value.totalPrice || 0) *
-        (formData.value.discountPercent || 0)) /
-      100;
-    // 优惠后价格
-    formData.value.discountedPrice =
-      formData.value.totalPrice - formData.value.discountPrice;
-
-    // 计算最终价格(包含其他费用)
-    formData.value.totalPrice =
-      formData.value.discountedPrice + (formData.value.otherPrice || 0);
-    formApi.setValues(formData.value, false);
-  },
-  { immediate: true },
-);
-
-/**
- * 创建或更新销售出库
- */
+/** 创建或更新销售出库 */
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
-    await nextTick();
-
     const itemFormInstance = Array.isArray(itemFormRef.value)
       ? itemFormRef.value[0]
       : itemFormRef.value;
-    if (itemFormInstance && typeof itemFormInstance.validate === 'function') {
-      try {
-        const isValid = await itemFormInstance.validate();
-        if (!isValid) {
-          message.error('子表单验证失败');
-          return;
-        }
-      } catch (error: any) {
-        message.error(error.message || '子表单验证失败');
-        return;
-      }
-    } else {
-      message.error('子表单验证方法不存在');
-      return;
-    }
-
-    // 验证产品清单不能为空
-    if (!formData.value?.items || formData.value.items.length === 0) {
-      message.error('产品清单不能为空，请至少添加一个产品');
+    try {
+      itemFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
       return;
     }
 
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as ErpSaleOutApi.SaleOut;
-    data.items = formData.value?.items?.map((item) => ({
-      ...item,
-      // 解决新增销售出库报错
-      id: undefined,
-    }));
     try {
       await (formType.value === 'create'
         ? createSaleOut(data)
@@ -195,110 +159,64 @@ const [Modal, modalApi] = useVbenModal({
       // 关闭并提示
       await modalApi.close();
       emit('success');
-      message.success(formType.value === 'create' ? '新增成功' : '更新成功');
+      message.success($t('ui.actionMessage.operationSuccess'));
     } finally {
       modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      formData.value = {
-        id: undefined,
-        no: undefined,
-        accountId: undefined,
-        outTime: undefined,
-        remark: undefined,
-        fileUrl: undefined,
-        discountPercent: 0,
-        customerId: undefined,
-        discountPrice: 0,
-        totalPrice: 0,
-        otherPrice: 0,
-        items: [],
-      };
-      await formApi.setValues(formData.value, false);
+      formData.value = undefined;
       return;
     }
     // 加载数据
     const data = modalApi.getData<{ id?: number; type: string }>();
-    if (!data) {
-      return;
-    }
     formType.value = data.type;
+    formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
-
-    if (!data.id) {
-      // 初始化空的表单数据
-      formData.value = {
-        id: undefined,
-        no: undefined,
-        accountId: undefined,
-        outTime: undefined,
-        remark: undefined,
-        fileUrl: undefined,
-        discountPercent: 0,
-        customerId: undefined,
-        discountPrice: 0,
-        totalPrice: 0,
-        otherPrice: 0,
-        items: [],
-      } as unknown as ErpSaleOutApi.SaleOut;
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init([]);
+    if (!data || !data.id) {
+      // 新增时，默认选中账户
+      const accountList = await getAccountSimpleList();
+      const defaultAccount = accountList.find((item) => item.defaultStatus);
+      if (defaultAccount) {
+        await formApi.setValues({ accountId: defaultAccount.id });
       }
       return;
     }
-
     modalApi.lock();
     try {
       formData.value = await getSaleOut(data.id);
-
       // 设置到 values
       await formApi.setValues(formData.value, false);
-      // 初始化子表单
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init(formData.value.items || []);
-      }
     } finally {
       modalApi.unlock();
     }
   },
 });
-
-defineExpose({ modalApi });
 </script>
 
 <template>
   <Modal
-    v-bind="$attrs"
     :title="getTitle"
-    class="w-2/3"
-    :closable="true"
-    :mask-closable="true"
+    class="w-3/4"
     :show-confirm-button="formType !== 'detail'"
   >
     <Form class="mx-3">
-      <template #product="slotProps">
-        <SaleOutItemForm
-          v-bind="slotProps"
+      <template #items>
+        <ItemForm
           ref="itemFormRef"
-          class="w-full"
           :items="formData?.items ?? []"
           :disabled="formType === 'detail'"
+          :discount-percent="formData?.discountPercent ?? 0"
+          :other-price="formData?.otherPrice ?? 0"
           @update:items="handleUpdateItems"
+          @update:discount-price="handleUpdateDiscountPrice"
+          @update:other-price="handleUpdateOtherPrice"
+          @update:total-price="handleUpdateTotalPrice"
         />
       </template>
-      <template #orderNo="slotProps">
-        <SelectSaleOrderForm
-          v-bind="slotProps"
+      <template #orderNo>
+        <SaleOrderSelect
           :order-no="formData?.orderNo"
           @update:order="handleUpdateOrder"
         />
diff --git a/apps/web-antd/src/views/erp/sale/out/modules/sale-out-item-form.vue b/apps/web-antd/src/views/erp/sale/out/modules/item-form.vue
similarity index 39%
rename from apps/web-antd/src/views/erp/sale/out/modules/sale-out-item-form.vue
rename to apps/web-antd/src/views/erp/sale/out/modules/item-form.vue
index d5cb6f7d11051cd3cff29b8187729497f06d9dcf..f7f3011b08f2cd26731690ec0844e8bf8ff1be5d 100644
--- a/apps/web-antd/src/views/erp/sale/out/modules/sale-out-item-form.vue
+++ b/apps/web-antd/src/views/erp/sale/out/modules/item-form.vue
@@ -1,51 +1,78 @@
 <script lang="ts" setup>
 import type { ErpSaleOutApi } from '#/api/erp/sale/out';
 
-import { nextTick, onMounted, ref, watch } from 'vue';
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
-import { erpPriceMultiply } from '@vben/utils';
+import {
+  erpCountInputFormatter,
+  erpPriceInputFormatter,
+  erpPriceMultiply,
+} from '@vben/utils';
 
-import { InputNumber, Select } from 'ant-design-vue';
+import { Input, InputNumber, Select } from 'ant-design-vue';
 
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProductSimpleList } from '#/api/erp/product/product';
 import { getWarehouseStockCount } from '#/api/erp/stock/stock';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 
-import { useSaleOutItemTableColumns } from '../data';
+import { useFormItemColumns } from '../data';
+
+interface Props {
+  items?: ErpSaleOutApi.SaleOutItem[];
+  disabled?: boolean;
+  discountPercent?: number;
+  otherPrice?: number;
+}
 
 const props = withDefaults(defineProps<Props>(), {
   items: () => [],
   disabled: false,
+  discountPercent: 0,
+  otherPrice: 0,
 });
 
-const emit = defineEmits(['update:items', 'update:totalPrice']);
+const emit = defineEmits([
+  'update:items',
+  'update:discount-price',
+  'update:other-price',
+  'update:total-price',
+]);
 
-interface Props {
-  items?: ErpSaleOutApi.SaleOutItem[];
-  disabled?: boolean;
-}
+const tableData = ref<ErpSaleOutApi.SaleOutItem[]>([]); // 表格数据
+const productOptions = ref<any[]>([]); // 产品下拉选项
+const warehouseOptions = ref<any[]>([]); // 仓库下拉选项
 
-const tableData = ref<ErpSaleOutApi.SaleOutItem[]>([]);
-const productOptions = ref<any[]>([]);
-const warehouseOptions = ref<any[]>([]);
+/** 获取表格合计数据 */
+const summaries = computed(() => {
+  return {
+    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
+    totalProductPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalProductPrice || 0),
+      0,
+    ),
+    taxPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.taxPrice || 0),
+      0,
+    ),
+    totalPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalPrice || 0),
+      0,
+    ),
+  };
+});
 
 /** 表格配置 */
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    editConfig: {
-      trigger: 'click',
-      mode: 'cell',
-    },
-    columns: useSaleOutItemTableColumns(),
+    columns: useFormItemColumns(),
     data: tableData.value,
-    border: true,
-    showOverflow: true,
-    autoResize: true,
     minHeight: 250,
-    keepSource: true,
+    autoResize: true,
+    border: true,
     rowConfig: {
-      keyField: 'id',
+      keyField: 'seq',
+      isHover: true,
     },
     pagerConfig: {
       enabled: false,
@@ -63,44 +90,68 @@ watch(
     if (!items) {
       return;
     }
-    await nextTick();
+    items.forEach((item) => initRow(item));
     tableData.value = [...items];
-    await nextTick();
-    gridApi.grid.reloadData(tableData.value);
+    await nextTick(); // 特殊：保证 gridApi 已经初始化
+    await gridApi.grid.reloadData(tableData.value);
+    // 更新表格列配置（目的：原数量、已出库动态列）
+    const columns = useFormItemColumns(tableData.value);
+    await gridApi.grid.reloadColumn(columns);
   },
   {
     immediate: true,
   },
 );
 
-/** 初始化 */
-onMounted(async () => {
-  productOptions.value = await getProductSimpleList();
-  warehouseOptions.value = await getWarehouseSimpleList();
-});
+/** 计算 discountPrice、otherPrice、totalPrice 价格 */
+watch(
+  () => [tableData.value, props.discountPercent, props.otherPrice],
+  () => {
+    if (!tableData.value || tableData.value.length === 0) {
+      return;
+    }
+    const totalPrice = tableData.value.reduce(
+      (prev, curr) => prev + (curr.totalPrice || 0),
+      0,
+    );
+    const discountPrice =
+      props.discountPercent === null
+        ? 0
+        : erpPriceMultiply(totalPrice, props.discountPercent / 100);
+    const discountedPrice = totalPrice - discountPrice!;
+    const finalTotalPrice = discountedPrice + (props.otherPrice || 0);
 
-function handlePriceChange(row: any) {
-  if (row.productPrice && row.count) {
-    row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
-    row.taxPrice =
-      erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
-    row.totalPrice = row.totalProductPrice + row.taxPrice;
+    // 通知父组件更新
+    emit('update:discount-price', discountPrice);
+    emit('update:other-price', props.otherPrice || 0);
+    emit('update:total-price', finalTotalPrice);
+  },
+  { deep: true },
+);
+
+/** 处理删除 */
+function handleDelete(row: ErpSaleOutApi.SaleOutItem) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index !== -1) {
+    tableData.value.splice(index, 1);
   }
-  handleUpdateValue(row);
+  // 通知父组件更新
+  emit('update:items', [...tableData.value]);
 }
 
+/** 处理仓库变更 */
 const handleWarehouseChange = async (row: ErpSaleOutApi.SaleOutItem) => {
-  const warehouseId = row.warehouseId;
   const stockCount = await getWarehouseStockCount({
     productId: row.productId!,
-    warehouseId: warehouseId!,
+    warehouseId: row.warehouseId!,
   });
   row.stockCount = stockCount || 0;
-  handleUpdateValue(row);
+  handleRowChange(row);
 };
 
-function handleUpdateValue(row: any) {
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index === -1) {
     tableData.value.push(row);
   } else {
@@ -109,87 +160,39 @@ function handleUpdateValue(row: any) {
   emit('update:items', [...tableData.value]);
 }
 
-const getSummaries = (): {
-  count: number;
-  productName: string;
-  taxPrice: number;
-  totalPrice: number;
-  totalProductPrice: number;
-} => {
-  const count = tableData.value.reduce(
-    (sum, item) => sum + (item.count || 0),
-    0,
-  );
-  const totalProductPrice = tableData.value.reduce(
-    (sum, item) => sum + (item.totalProductPrice || 0),
-    0,
-  );
-  const taxPrice = tableData.value.reduce(
-    (sum, item) => sum + (item.taxPrice || 0),
-    0,
-  );
-  const totalPrice = tableData.value.reduce(
-    (sum, item) => sum + (item.totalPrice || 0),
-    0,
-  );
-  return {
-    productName: '合计',
-    count,
-    totalProductPrice,
-    taxPrice,
-    totalPrice,
-  };
+/** 初始化行数据 */
+const initRow = (row: ErpSaleOutApi.SaleOutItem): void => {
+  if (row.productPrice && row.count) {
+    row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+    row.taxPrice =
+      erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
+    row.totalPrice = row.totalProductPrice + row.taxPrice;
+  }
 };
 
-const validate = async (): Promise<boolean> => {
-  try {
-    for (let i = 0; i < tableData.value.length; i++) {
-      const item = tableData.value[i];
-      if (item) {
-        if (!item.warehouseId) {
-          throw new Error(`第 ${i + 1} 行：仓库不能为空`);
-        }
-        if (!item.count || item.count <= 0) {
-          throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
-        }
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (item) {
+      if (!item.warehouseId) {
+        throw new Error(`第 ${i + 1} 行：仓库不能为空`);
+      }
+      if (!item.count || item.count <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
       }
     }
-    return true;
-  } catch (error) {
-    console.error('验证失败:', error);
-    throw error;
   }
-};
-
-const getData = (): ErpSaleOutApi.SaleOutItem[] => tableData.value;
-const init = (items: ErpSaleOutApi.SaleOutItem[] | undefined): void => {
-  tableData.value =
-    items && items.length > 0
-      ? items.map((item) => {
-          const newItem = { ...item };
-          if (newItem.productPrice && newItem.count) {
-            newItem.totalProductPrice =
-              erpPriceMultiply(newItem.productPrice, newItem.count) ?? 0;
-            newItem.taxPrice =
-              erpPriceMultiply(
-                newItem.totalProductPrice,
-                (newItem.taxPercent || 0) / 100,
-              ) ?? 0;
-            newItem.totalPrice = newItem.totalProductPrice + newItem.taxPrice;
-          }
-          return newItem;
-        })
-      : [];
-  // TODO @XuZhiqiang：使用 await 风格哈；
-  nextTick(() => {
-    gridApi.grid.reloadData(tableData.value);
-  });
-};
+}
 
 defineExpose({
   validate,
-  getData,
-  init,
+});
+
+/** 初始化 */
+onMounted(async () => {
+  productOptions.value = await getProductSimpleList();
+  warehouseOptions.value = await getWarehouseSimpleList();
 });
 </script>
 
@@ -213,29 +216,60 @@ defineExpose({
         v-model:value="row.productId"
         :options="productOptions"
         :field-names="{ label: 'name', value: 'id' }"
-        style="width: 100%"
+        class="w-full"
         placeholder="请选择产品"
         show-search
       />
     </template>
-
     <template #count="{ row }">
       <InputNumber
         v-if="!disabled"
         v-model:value="row.count"
         :min="0"
         :precision="2"
-        @change="handlePriceChange(row)"
+        @change="handleRowChange(row)"
       />
-      <span v-else>{{ row.count || '-' }}</span>
+      <span v-else>{{ erpCountInputFormatter(row.count) || '-' }}</span>
     </template>
     <template #productPrice="{ row }">
       <InputNumber
-        disabled
+        v-if="!disabled"
         v-model:value="row.productPrice"
         :min="0"
         :precision="2"
-        @change="handlePriceChange(row)"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ erpPriceInputFormatter(row.productPrice) || '-' }}</span>
+    </template>
+    <template #remark="{ row }">
+      <Input v-if="!disabled" v-model:value="row.remark" class="w-full" />
+      <span v-else>{{ row.remark || '-' }}</span>
+    </template>
+    <template #taxPercent="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.taxPercent"
+        :min="0"
+        :max="100"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ row.taxPercent || '-' }}</span>
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        v-if="!disabled"
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该产品吗？',
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
       />
     </template>
 
@@ -244,10 +278,14 @@ defineExpose({
         <div class="text-muted-foreground flex justify-between text-sm">
           <span class="text-foreground font-medium">合计：</span>
           <div class="flex space-x-4">
-            <span>数量：{{ getSummaries().count }}</span>
-            <span>金额：{{ getSummaries().totalProductPrice }}</span>
-            <span>税额：{{ getSummaries().taxPrice }}</span>
-            <span>税额合计：{{ getSummaries().totalPrice }}</span>
+            <span>数量：{{ erpCountInputFormatter(summaries.count) }}</span>
+            <span>
+              金额：{{ erpPriceInputFormatter(summaries.totalProductPrice) }}
+            </span>
+            <span>税额：{{ erpPriceInputFormatter(summaries.taxPrice) }}</span>
+            <span>
+              税额合计：{{ erpPriceInputFormatter(summaries.totalPrice) }}
+            </span>
           </div>
         </div>
       </div>
diff --git a/apps/web-antd/src/views/erp/sale/out/modules/select-sale-order-grid.vue b/apps/web-antd/src/views/erp/sale/out/modules/sale-order-select.vue
similarity index 44%
rename from apps/web-antd/src/views/erp/sale/out/modules/select-sale-order-grid.vue
rename to apps/web-antd/src/views/erp/sale/out/modules/sale-order-select.vue
index 46ed780f5d06320ec6c800373bcf3cb0a5bcff75..1a3c8b368077bb26a07eb68a2b36b4ec9665bfb4 100644
--- a/apps/web-antd/src/views/erp/sale/out/modules/select-sale-order-grid.vue
+++ b/apps/web-antd/src/views/erp/sale/out/modules/sale-order-select.vue
@@ -2,13 +2,36 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 
+import { ref } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, message, Modal } from 'ant-design-vue';
+
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getSaleOrderPage } from '#/api/erp/sale/order';
 
 import { useOrderGridColumns, useOrderGridFormSchema } from '../data';
 
-const emit = defineEmits(['selectRow']);
+defineProps({
+  orderNo: {
+    type: String,
+    default: () => undefined,
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits<{
+  'update:order': [order: ErpSaleOrderApi.SaleOrder];
+}>();
+
+const order = ref<ErpSaleOrderApi.SaleOrder>(); // 选择的采购订单
+const open = ref<boolean>(false); // 选择采购订单弹窗是否打开
 
+/** 表格配置 */
 const [Grid] = useVbenVxeGrid({
   formOptions: {
     schema: useOrderGridFormSchema(),
@@ -44,12 +67,51 @@ const [Grid] = useVbenVxeGrid({
   } as VxeTableGridOptions<ErpSaleOrderApi.SaleOrder>,
   gridEvents: {
     radioChange: ({ row }: { row: ErpSaleOrderApi.SaleOrder }) => {
-      emit('selectRow', row);
+      handleSelectOrder(row);
     },
   },
 });
+
+/** 选择销售订单 */
+function handleSelectOrder(selectOrder: ErpSaleOrderApi.SaleOrder) {
+  order.value = selectOrder;
+}
+
+/** 确认选择销售订单 */
+const handleOk = () => {
+  if (!order.value) {
+    message.warning('请选择一个销售订单');
+    return;
+  }
+  emit('update:order', order.value);
+  open.value = false;
+};
 </script>
 
 <template>
-  <Grid class="max-h-[600px]" table-title="销售订单列表(仅展示可出库)" />
+  <Input
+    readonly
+    :value="orderNo"
+    :disabled="disabled"
+    @click="() => !disabled && (open = true)"
+  >
+    <template #addonAfter>
+      <div>
+        <IconifyIcon
+          class="h-full w-6 cursor-pointer"
+          icon="ant-design:setting-outlined"
+          :style="{ cursor: disabled ? 'not-allowed' : 'pointer' }"
+          @click="() => !disabled && (open = true)"
+        />
+      </div>
+    </template>
+  </Input>
+  <Modal
+    class="!w-[50vw]"
+    v-model:open="open"
+    title="选择关联订单"
+    @ok="handleOk"
+  >
+    <Grid class="max-h-[600px]" table-title="销售订单列表(仅展示可出库)" />
+  </Modal>
 </template>
diff --git a/apps/web-antd/src/views/erp/sale/out/modules/select-sale-order-form.vue b/apps/web-antd/src/views/erp/sale/out/modules/select-sale-order-form.vue
deleted file mode 100644
index e77dae06a27bc9b8459e425ae99a40b1f00dc618..0000000000000000000000000000000000000000
--- a/apps/web-antd/src/views/erp/sale/out/modules/select-sale-order-form.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<script lang="ts" setup>
-import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
-
-import { ref } from 'vue';
-
-import { IconifyIcon } from '@vben/icons';
-
-import { Input, message, Modal } from 'ant-design-vue';
-
-import SelectSaleOrderGrid from './select-sale-order-grid.vue';
-
-defineProps({
-  orderNo: {
-    type: String,
-    default: () => undefined,
-  },
-  disabled: {
-    type: Boolean,
-    default: false,
-  },
-});
-const emit = defineEmits<{
-  'update:order': [order: ErpSaleOrderApi.SaleOrder];
-}>();
-const order = ref<ErpSaleOrderApi.SaleOrder>();
-const open = ref<boolean>(false);
-
-const handleSelectOrder = (selectOrder: ErpSaleOrderApi.SaleOrder) => {
-  order.value = selectOrder;
-};
-
-const handleOk = () => {
-  if (!order.value) {
-    message.warning('请选择一个采购订单');
-    return;
-  }
-  emit('update:order', order.value);
-  open.value = false;
-};
-</script>
-
-<template>
-  <Input
-    v-bind="$attrs"
-    readonly
-    :value="orderNo"
-    :disabled="disabled"
-    @click="() => !disabled && (open = true)"
-  >
-    <template #addonAfter>
-      <div>
-        <IconifyIcon
-          class="h-full w-6 cursor-pointer"
-          icon="ant-design:setting-outlined"
-          :style="{ cursor: disabled ? 'not-allowed' : 'pointer' }"
-          @click="() => !disabled && (open = true)"
-        />
-      </div>
-    </template>
-  </Input>
-  <Modal
-    v-model:open="open"
-    title="选择关联订单"
-    class="!w-[50vw]"
-    :show-confirm-button="true"
-    @ok="handleOk"
-  >
-    <SelectSaleOrderGrid @select-row="handleSelectOrder" />
-  </Modal>
-</template>
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 9dc66dfa72d735fdd09f9dc6fea13c9b95703342..f2c5b9dc35e75f63a822f17464cc92b4535f748a 100644
--- a/apps/web-antd/src/views/erp/sale/return/data.ts
+++ b/apps/web-antd/src/views/erp/sale/return/data.ts
@@ -11,44 +11,39 @@ import { getProductSimpleList } from '#/api/erp/product/product';
 import { getCustomerSimpleList } from '#/api/erp/sale/customer';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 表单的配置项 */
 export function useFormSchema(formType: string): VbenFormSchema[] {
   return [
     {
+      fieldName: 'id',
       component: 'Input',
-      componentProps: {
-        style: { display: 'none' },
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
       },
-      fieldName: 'id',
-      label: 'ID',
-      hideLabel: true,
-      formItemClass: 'hidden',
     },
     {
+      fieldName: 'no',
+      label: '退货单号',
       component: 'Input',
       componentProps: {
         placeholder: '系统自动生成',
         disabled: true,
       },
-      fieldName: 'no',
-      label: '退货单号',
     },
     {
-      component: 'ApiSelect',
+      fieldName: 'returnTime',
+      label: '退货时间',
+      component: 'DatePicker',
       componentProps: {
-        disabled: true,
-        placeholder: '请选择客户',
-        allowClear: true,
-        showSearch: true,
-        api: getCustomerSimpleList,
-        fieldNames: {
-          label: 'name',
-          value: 'id',
-        },
+        disabled: formType === 'detail',
+        placeholder: '选择退货时间',
+        showTime: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       },
-      fieldName: 'customerId',
-      label: '客户',
       rules: 'required',
     },
     {
@@ -63,35 +58,53 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
       },
     },
     {
-      component: 'DatePicker',
+      fieldName: 'customerId',
+      label: '客户',
+      component: 'ApiSelect',
       componentProps: {
-        disabled: formType === 'detail',
-        placeholder: '选择退货时间',
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-        style: { width: '100%' },
+        disabled: true,
+        placeholder: '请选择客户',
+        allowClear: true,
+        showSearch: true,
+        api: getCustomerSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
       },
-      fieldName: 'returnTime',
-      label: '退货时间',
       rules: 'required',
     },
     {
+      fieldName: 'saleUserId',
+      label: '销售人员',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择销售人员',
+        allowClear: true,
+        showSearch: true,
+        api: getSimpleUserList,
+        fieldNames: {
+          label: 'nickname',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
       component: 'Textarea',
       componentProps: {
         placeholder: '请输入备注',
-        disabled: formType === 'detail',
         autoSize: { minRows: 1, maxRows: 1 },
-        class: 'w-full',
+        disabled: formType === 'detail',
       },
-      fieldName: 'remark',
       formItemClass: 'col-span-2',
-      label: '备注',
     },
     {
+      fieldName: 'fileUrl',
+      label: '附件',
       component: 'FileUpload',
       componentProps: {
-        disabled: formType === 'detail',
         maxNumber: 1,
         maxSize: 10,
         accept: [
@@ -105,69 +118,73 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
           'jpeg',
           'png',
         ],
-        showDescription: true,
+        showDescription: formType !== 'detail',
+        disabled: formType === 'detail',
       },
-      fieldName: 'fileUrl',
-      label: '附件',
       formItemClass: 'col-span-3',
     },
     {
-      fieldName: 'product',
-      label: '产品清单',
+      fieldName: 'items',
+      label: '退货产品清单',
       component: 'Input',
       formItemClass: 'col-span-3',
     },
     {
-      component: 'InputNumber',
       fieldName: 'discountPercent',
+      label: '优惠率(%)',
+      component: 'InputNumber',
       componentProps: {
-        placeholder: '优惠率',
+        placeholder: '请输入优惠率',
         min: 0,
         max: 100,
-        disabled: true,
         precision: 2,
-        style: { width: '100%' },
       },
-
-      label: '优惠率(%)',
+      rules: z.number().min(0).optional(),
     },
     {
+      fieldName: 'discountPrice',
+      label: '退款优惠',
       component: 'InputNumber',
       componentProps: {
-        placeholder: '付款优惠',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
-        style: { width: '100%' },
       },
-      fieldName: 'discountPrice',
-      label: '付款优惠',
     },
     {
+      fieldName: 'discountedPrice',
+      label: '优惠后金额',
       component: 'InputNumber',
       componentProps: {
         placeholder: '优惠后金额',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
-        style: { width: '100%' },
       },
-      fieldName: 'discountedPrice',
-      label: '优惠后金额',
+      dependencies: {
+        triggerFields: ['totalPrice', 'otherPrice'],
+        componentProps: (values) => {
+          const totalPrice = values.totalPrice || 0;
+          const otherPrice = values.otherPrice || 0;
+          values.discountedPrice = totalPrice - otherPrice;
+          return {};
+        },
+      },
     },
     {
+      fieldName: 'otherPrice',
+      label: '其他费用',
       component: 'InputNumber',
       componentProps: {
         disabled: formType === 'detail',
         placeholder: '请输入其他费用',
         precision: 2,
         formatter: erpPriceInputFormatter,
-        style: { width: '100%' },
       },
-      fieldName: 'otherPrice',
-      label: '其他费用',
     },
     {
+      fieldName: 'accountId',
+      label: '结算账户',
       component: 'ApiSelect',
       componentProps: {
         placeholder: '请选择结算账户',
@@ -180,26 +197,25 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
           value: 'id',
         },
       },
-      fieldName: 'accountId',
-      label: '结算账户',
     },
     {
+      fieldName: 'totalPrice',
+      label: '应收金额',
       component: 'InputNumber',
       componentProps: {
         precision: 2,
-        style: { width: '100%' },
-        disabled: true,
         min: 0,
+        disabled: true,
       },
-      fieldName: 'totalPrice',
-      label: '应退金额',
       rules: z.number().min(0).optional(),
     },
   ];
 }
 
-/** 采购订单项表格列定义 */
-export function useSaleReturnItemTableColumns(): VxeTableGridOptions['columns'] {
+/** 表单的明细表格列 */
+export function useFormItemColumns(
+  formData?: any[],
+): VxeTableGridOptions['columns'] {
   return [
     { type: 'seq', title: '序号', minWidth: 50, fixed: 'left' },
     {
@@ -216,8 +232,9 @@ export function useSaleReturnItemTableColumns(): VxeTableGridOptions['columns']
     },
     {
       field: 'stockCount',
-      title: '仓库库存',
+      title: '库存',
       minWidth: 80,
+      formatter: 'formatAmount3',
     },
     {
       field: 'productBarCode',
@@ -229,15 +246,27 @@ export function useSaleReturnItemTableColumns(): VxeTableGridOptions['columns']
       title: '单位',
       minWidth: 80,
     },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      slots: { default: 'remark' },
+    },
     {
       field: 'totalCount',
-      title: '原数量',
+      title: '已出库',
+      formatter: 'formatAmount3',
       minWidth: 120,
+      fixed: 'right',
+      visible: formData && formData[0]?.outCount !== undefined,
     },
     {
       field: 'returnCount',
-      title: '已退货数量',
+      title: '已退货',
+      formatter: 'formatAmount3',
       minWidth: 120,
+      fixed: 'right',
+      visible: formData && formData[0]?.returnCount !== undefined,
     },
     {
       field: 'count',
@@ -264,7 +293,8 @@ export function useSaleReturnItemTableColumns(): VxeTableGridOptions['columns']
       fixed: 'right',
       field: 'taxPercent',
       title: '税率(%)',
-      minWidth: 100,
+      minWidth: 105,
+      slots: { default: 'taxPercent' },
     },
     {
       fixed: 'right',
@@ -280,6 +310,12 @@ export function useSaleReturnItemTableColumns(): VxeTableGridOptions['columns']
       minWidth: 120,
       formatter: 'formatAmount2',
     },
+    {
+      title: '操作',
+      width: 50,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
   ];
 }
 
@@ -315,10 +351,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '退货时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始时间', '结束时间'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
     {
@@ -347,7 +381,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
         api: getWarehouseSimpleList,
         labelField: 'name',
         valueField: 'id',
-        filterOption: false,
       },
     },
     {
@@ -376,26 +409,26 @@ export function useGridFormSchema(): VbenFormSchema[] {
     },
     {
       fieldName: 'refundStatus',
-      label: '退货状态',
+      label: '退款状态',
       component: 'Select',
       componentProps: {
         options: [
-          { label: '未退货', value: 0 },
-          { label: '部分退货', value: 1 },
-          { label: '全部退货', value: 2 },
+          { label: '未退款', value: 0 },
+          { label: '部分退款', value: 1 },
+          { label: '全部退款', value: 2 },
         ],
-        placeholder: '请选择退货状态',
+        placeholder: '请选择退款状态',
         allowClear: true,
       },
     },
     {
       fieldName: 'status',
-      label: '状态',
+      label: '审批状态',
       component: 'Select',
       componentProps: {
-        placeholder: '请选择状态',
-        allowClear: true,
         options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
+        placeholder: '请选择审批状态',
+        allowClear: true,
       },
     },
     {
@@ -426,7 +459,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       field: 'productNames',
-      title: '产品信息',
+      title: '退货产品信息',
       showOverflow: 'tooltip',
       minWidth: 120,
     },
@@ -449,18 +482,19 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
-      title: '应退金额',
-      formatter: 'formatNumber',
+      title: '应收金额',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'refundPrice',
       title: '已退金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
@@ -473,7 +507,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       field: 'status',
-      title: '状态',
+      title: '审批状态',
       minWidth: 120,
       cellRender: {
         name: 'CellDict',
@@ -482,12 +516,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       title: '操作',
-      minWidth: 250,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
+
 /** 列表的搜索表单 */
 export function useOrderGridFormSchema(): VbenFormSchema[] {
   return [
@@ -498,7 +533,6 @@ export function useOrderGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         placeholder: '请输入订单单号',
         allowClear: true,
-        disabled: true,
       },
     },
     {
@@ -521,10 +555,8 @@ export function useOrderGridFormSchema(): VbenFormSchema[] {
       label: '订单时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始时间', '结束时间'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
   ];
@@ -569,23 +601,25 @@ export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'returnCount',
       title: '已退货数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalProductPrice',
       title: '金额合计',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '含税金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
   ];
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 12b75d08cbca9247030d22b8cbb02b375b5af3c2..5c4c297d64afed4ce17ab090fd56adbe1b727fb6 100644
--- a/apps/web-antd/src/views/erp/sale/return/index.vue
+++ b/apps/web-antd/src/views/erp/sale/return/index.vue
@@ -19,94 +19,82 @@ import {
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import SaleReturnForm from './modules/sale-return-form.vue';
+import Form from './modules/form.vue';
 
 /** ERP 销售退货列表 */
 defineOptions({ name: 'ErpSaleReturn' });
 
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: SaleReturnForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-// TODO @Xuzhiqiang：批量删除待实现
-const checkedIds = ref<number[]>([]);
-function handleRowCheckboxChange({
-  records,
-}: {
-  records: ErpSaleReturnApi.SaleReturn[];
-}) {
-  checkedIds.value = records.map((item) => item.id!);
-}
-
-/** 详情 */
-function handleDetail(row: ErpSaleReturnApi.SaleReturn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportSaleReturn(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '销售退货.xls', source: data });
 }
 
-/** 新增 */
+/** 新增销售退货 */
 function handleCreate() {
   formModalApi.setData({ type: 'create' }).open();
 }
 
-/** 编辑 */
+/** 编辑销售退货 */
 function handleEdit(row: ErpSaleReturnApi.SaleReturn) {
-  formModalApi.setData({ type: 'update', id: row.id }).open();
+  formModalApi.setData({ type: 'edit', id: row.id }).open();
 }
 
-/** 删除 */
+/** 删除销售退货 */
 async function handleDelete(ids: number[]) {
   const hideLoading = message.loading({
     content: $t('ui.actionMessage.deleting'),
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
     await deleteSaleReturn(ids);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess'),
-      key: 'action_process_msg',
-    });
-    onRefresh();
-  } catch {
-    // 处理错误
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
 /** 审批/反审批操作 */
-function handleUpdateStatus(row: ErpSaleReturnApi.SaleReturn, status: number) {
+async function handleUpdateStatus(
+  row: ErpSaleReturnApi.SaleReturn,
+  status: number,
+) {
   const hideLoading = message.loading({
     content: `确定${status === 20 ? '审批' : '反审批'}该订单吗？`,
     duration: 0,
-    key: 'action_process_msg',
   });
-  updateSaleReturnStatus({ id: row.id!, status })
-    .then(() => {
-      message.success({
-        content: `${status === 20 ? '审批' : '反审批'}成功`,
-        key: 'action_process_msg',
-      });
-      onRefresh();
-    })
-    .catch(() => {
-      // 处理错误
-    })
-    .finally(() => {
-      hideLoading();
-    });
+  try {
+    await updateSaleReturnStatus(row.id!, status);
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`);
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
 }
 
-/** 导出 */
-async function handleExport() {
-  const data = await exportSaleReturn(await gridApi.formApi.getValues());
-  downloadFileFromBlobPart({ fileName: '销售退货.xls', source: data });
+const checkedIds = ref<number[]>([]);
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ErpSaleReturnApi.SaleReturn[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+
+/** 查看详情 */
+function handleDetail(row: ErpSaleReturnApi.SaleReturn) {
+  formModalApi.setData({ type: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -152,8 +140,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/erp/sale/"
       />
     </template>
-    <FormModal @success="onRefresh" />
 
+    <FormModal @success="handleRefresh" />
     <Grid table-title="销售退货列表">
       <template #toolbar-tools>
         <TableAction
@@ -180,11 +168,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
               icon: ACTION_ICON.DELETE,
               auth: ['erp:sale-return:delete'],
               popConfirm: {
-                disabled: isEmpty(checkedIds),
                 title: `是否删除所选中数据？`,
-                confirm: () => {
-                  handleDelete(checkedIds);
-                },
+                confirm: handleDelete.bind(null, checkedIds),
               },
             },
           ]"
@@ -229,7 +214,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               auth: ['erp:sale-return:delete'],
               popConfirm: {
                 title: $t('ui.actionMessage.deleteConfirm', [row.no]),
-                confirm: () => handleDelete([row.id!]),
+                confirm: handleDelete.bind(null, [row.id!]),
               },
             },
           ]"
diff --git a/apps/web-antd/src/views/erp/sale/return/modules/sale-return-form.vue b/apps/web-antd/src/views/erp/sale/return/modules/form.vue
similarity index 42%
rename from apps/web-antd/src/views/erp/sale/return/modules/sale-return-form.vue
rename to apps/web-antd/src/views/erp/sale/return/modules/form.vue
index c159fdb79c04cbc4aecd0d8e10fc7f0b8c5f43cb..3a9146a03aeca2b8b23df2878ea431356736ad69 100644
--- a/apps/web-antd/src/views/erp/sale/return/modules/sale-return-form.vue
+++ b/apps/web-antd/src/views/erp/sale/return/modules/form.vue
@@ -2,13 +2,15 @@
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 import type { ErpSaleReturnApi } from '#/api/erp/sale/return';
 
-import { computed, nextTick, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
 
 import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
+import { getAccountSimpleList } from '#/api/erp/finance/account';
 import {
   createSaleReturn,
   getSaleReturn,
@@ -16,15 +18,14 @@ import {
 } from '#/api/erp/sale/return';
 
 import { useFormSchema } from '../data';
-import SaleReturnItemForm from './sale-return-item-form.vue';
-import SelectSaleOrderForm from './select-sale-order-form.vue';
+import ItemForm from './item-form.vue';
+import SaleOrderSelect from './sale-order-select.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<
   ErpSaleReturnApi.SaleReturn & {
     accountId?: number;
     customerId?: number;
-    discountedPrice?: number;
     discountPercent?: number;
     fileUrl?: string;
     order?: ErpSaleOrderApi.SaleOrder;
@@ -43,17 +44,19 @@ const formData = ref<
   discountPrice: 0,
   totalPrice: 0,
   otherPrice: 0,
-  discountedPrice: 0,
   items: [],
 });
-const formType = ref('');
-const itemFormRef = ref();
-
-const getTitle = computed(() => {
-  if (formType.value === 'create') return '添加销售退货';
-  if (formType.value === 'update') return '编辑销售退货';
-  return '销售退货详情';
-});
+const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const itemFormRef = ref<InstanceType<typeof ItemForm>>();
+
+/* eslint-disable unicorn/no-nested-ternary */
+const getTitle = computed(() =>
+  formType.value === 'create'
+    ? $t('ui.actionTitle.create', ['销售退货'])
+    : formType.value === 'edit'
+      ? $t('ui.actionTitle.edit', ['销售退货'])
+      : '销售退货详情',
+);
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -67,27 +70,48 @@ const [Form, formApi] = useVbenForm({
   schema: useFormSchema(formType.value),
   showDefaultActions: false,
   handleValuesChange: (values, changedFields) => {
-    if (formData.value && changedFields.includes('otherPrice')) {
-      formData.value.otherPrice = values.otherPrice;
-      formData.value.totalPrice =
-        (formData.value.discountedPrice || 0) +
-        (formData.value.otherPrice || 0);
-
-      formApi.setValues(formData.value, false);
+    // 目的：同步到 item-form 组件，触发整体的价格计算
+    if (formData.value) {
+      if (changedFields.includes('otherPrice')) {
+        formData.value.otherPrice = values.otherPrice;
+      }
+      if (changedFields.includes('discountPercent')) {
+        formData.value.discountPercent = values.discountPercent;
+      }
     }
   },
 });
 
 /** 更新销售退货项 */
-const handleUpdateItems = async (items: ErpSaleReturnApi.SaleReturnItem[]) => {
-  if (formData.value) {
-    const data = await formApi.getValues();
-    formData.value = { ...data, items };
-    await formApi.setValues(formData.value, false);
-  }
+const handleUpdateItems = (items: ErpSaleReturnApi.SaleReturnItem[]) => {
+  formData.value.items = items;
+  formApi.setValues({
+    items,
+  });
 };
 
-/** 选择采购订单 */
+/** 更新其他费用 */
+const handleUpdateOtherPrice = (otherPrice: number) => {
+  formApi.setValues({
+    otherPrice,
+  });
+};
+
+/** 更新优惠金额 */
+const handleUpdateDiscountPrice = (discountPrice: number) => {
+  formApi.setValues({
+    discountPrice,
+  });
+};
+
+/** 更新总金额 */
+const handleUpdateTotalPrice = (totalPrice: number) => {
+  formApi.setValues({
+    totalPrice,
+  });
+};
+
+/** 选择销售订单 */
 const handleUpdateOrder = (order: ErpSaleOrderApi.SaleOrder) => {
   formData.value = {
     ...formData.value,
@@ -99,7 +123,7 @@ const handleUpdateOrder = (order: ErpSaleOrderApi.SaleOrder) => {
     discountPercent: order.discountPercent!,
     fileUrl: order.fileUrl!,
   };
-  // 将订单项设置到入库单项
+  // 将订单项设置到退货单项
   order.items!.forEach((item: any) => {
     item.totalCount = item.count;
     item.count = item.totalCount - item.returnCount;
@@ -109,89 +133,29 @@ const handleUpdateOrder = (order: ErpSaleOrderApi.SaleOrder) => {
   formData.value.items = order.items!.filter(
     (item) => item.count && item.count > 0,
   ) as ErpSaleReturnApi.SaleReturnItem[];
-
   formApi.setValues(formData.value, false);
 };
 
-watch(
-  () => formData.value.items!,
-  (newItems: ErpSaleReturnApi.SaleReturnItem[]) => {
-    if (newItems && newItems.length > 0) {
-      // 计算每个产品的总价、税额和总价
-      newItems.forEach((item) => {
-        item.totalProductPrice = (item.productPrice || 0) * (item.count || 0);
-        item.taxPrice =
-          (item.totalProductPrice || 0) * ((item.taxPercent || 0) / 100);
-        item.totalPrice = (item.totalProductPrice || 0) + (item.taxPrice || 0);
-      });
-      // 计算总价
-      formData.value.totalPrice = newItems.reduce((sum, item) => {
-        return sum + (item.totalProductPrice || 0) + (item.taxPrice || 0);
-      }, 0);
-    } else {
-      formData.value.totalPrice = 0;
-    }
-    // 优惠金额
-    formData.value.discountPrice =
-      ((formData.value.totalPrice || 0) *
-        (formData.value.discountPercent || 0)) /
-      100;
-    // 优惠后价格
-    formData.value.discountedPrice =
-      formData.value.totalPrice - formData.value.discountPrice;
-
-    // 计算最终价格(包含其他费用)
-    formData.value.totalPrice =
-      formData.value.discountedPrice + (formData.value.otherPrice || 0);
-    formApi.setValues(formData.value, false);
-  },
-  { immediate: true },
-);
-
-/**
- * 创建或更新销售退货
- */
+/** 创建或更新销售退货 */
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
-    await nextTick();
-
     const itemFormInstance = Array.isArray(itemFormRef.value)
       ? itemFormRef.value[0]
       : itemFormRef.value;
-    if (itemFormInstance && typeof itemFormInstance.validate === 'function') {
-      try {
-        const isValid = await itemFormInstance.validate();
-        if (!isValid) {
-          message.error('子表单验证失败');
-          return;
-        }
-      } catch (error: any) {
-        message.error(error.message || '子表单验证失败');
-        return;
-      }
-    } else {
-      message.error('子表单验证方法不存在');
-      return;
-    }
-
-    // 验证产品清单不能为空
-    if (!formData.value?.items || formData.value.items.length === 0) {
-      message.error('产品清单不能为空，请至少添加一个产品');
+    try {
+      itemFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
       return;
     }
 
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as ErpSaleReturnApi.SaleReturn;
-    data.items = formData.value?.items?.map((item) => ({
-      ...item,
-      // 解决新增销售退货报错
-      id: undefined,
-    }));
     try {
       await (formType.value === 'create'
         ? createSaleReturn(data)
@@ -199,110 +163,64 @@ const [Modal, modalApi] = useVbenModal({
       // 关闭并提示
       await modalApi.close();
       emit('success');
-      message.success(formType.value === 'create' ? '新增成功' : '更新成功');
+      message.success($t('ui.actionMessage.operationSuccess'));
     } finally {
       modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      formData.value = {
-        id: undefined,
-        no: undefined,
-        accountId: undefined,
-        returnTime: undefined,
-        remark: undefined,
-        fileUrl: undefined,
-        discountPercent: 0,
-        customerId: undefined,
-        discountPrice: 0,
-        totalPrice: 0,
-        otherPrice: 0,
-        items: [],
-      };
-      await formApi.setValues(formData.value, false);
+      formData.value = undefined;
       return;
     }
     // 加载数据
     const data = modalApi.getData<{ id?: number; type: string }>();
-    if (!data) {
-      return;
-    }
     formType.value = data.type;
+    formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
-
-    if (!data.id) {
-      // 初始化空的表单数据
-      formData.value = {
-        id: undefined,
-        no: undefined,
-        accountId: undefined,
-        returnTime: undefined,
-        remark: undefined,
-        fileUrl: undefined,
-        discountPercent: 0,
-        customerId: undefined,
-        discountPrice: 0,
-        totalPrice: 0,
-        otherPrice: 0,
-        items: [],
-      } as unknown as ErpSaleReturnApi.SaleReturn;
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init([]);
+    if (!data || !data.id) {
+      // 新增时，默认选中账户
+      const accountList = await getAccountSimpleList();
+      const defaultAccount = accountList.find((item) => item.defaultStatus);
+      if (defaultAccount) {
+        await formApi.setValues({ accountId: defaultAccount.id });
       }
       return;
     }
-
     modalApi.lock();
     try {
       formData.value = await getSaleReturn(data.id);
-
       // 设置到 values
       await formApi.setValues(formData.value, false);
-      // 初始化子表单
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init(formData.value.items || []);
-      }
     } finally {
       modalApi.unlock();
     }
   },
 });
-
-defineExpose({ modalApi });
 </script>
 
 <template>
   <Modal
-    v-bind="$attrs"
     :title="getTitle"
-    class="w-2/3"
-    :closable="true"
-    :mask-closable="true"
+    class="w-3/4"
     :show-confirm-button="formType !== 'detail'"
   >
     <Form class="mx-3">
-      <template #product="slotProps">
-        <SaleReturnItemForm
-          v-bind="slotProps"
+      <template #items>
+        <ItemForm
           ref="itemFormRef"
-          class="w-full"
           :items="formData?.items ?? []"
           :disabled="formType === 'detail'"
+          :discount-percent="formData?.discountPercent ?? 0"
+          :other-price="formData?.otherPrice ?? 0"
           @update:items="handleUpdateItems"
+          @update:discount-price="handleUpdateDiscountPrice"
+          @update:other-price="handleUpdateOtherPrice"
+          @update:total-price="handleUpdateTotalPrice"
         />
       </template>
-      <template #orderNo="slotProps">
-        <SelectSaleOrderForm
-          v-bind="slotProps"
+      <template #orderNo>
+        <SaleOrderSelect
           :order-no="formData?.orderNo"
           @update:order="handleUpdateOrder"
         />
diff --git a/apps/web-antd/src/views/erp/sale/return/modules/item-form.vue b/apps/web-antd/src/views/erp/sale/return/modules/item-form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..9259eb4320608de4fffb685d8b3b670135d1505c
--- /dev/null
+++ b/apps/web-antd/src/views/erp/sale/return/modules/item-form.vue
@@ -0,0 +1,294 @@
+<script lang="ts" setup>
+import type { ErpSaleReturnApi } from '#/api/erp/sale/return';
+
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
+
+import {
+  erpCountInputFormatter,
+  erpPriceInputFormatter,
+  erpPriceMultiply,
+} from '@vben/utils';
+
+import { Input, InputNumber, Select } from 'ant-design-vue';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getProductSimpleList } from '#/api/erp/product/product';
+import { getWarehouseStockCount } from '#/api/erp/stock/stock';
+import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
+
+import { useFormItemColumns } from '../data';
+
+interface Props {
+  items?: ErpSaleReturnApi.SaleReturnItem[];
+  disabled?: boolean;
+  discountPercent?: number;
+  otherPrice?: number;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  items: () => [],
+  disabled: false,
+  discountPercent: 0,
+  otherPrice: 0,
+});
+
+const emit = defineEmits([
+  'update:items',
+  'update:discount-price',
+  'update:other-price',
+  'update:total-price',
+]);
+
+const tableData = ref<ErpSaleReturnApi.SaleReturnItem[]>([]); // 表格数据
+const productOptions = ref<any[]>([]); // 产品下拉选项
+const warehouseOptions = ref<any[]>([]); // 仓库下拉选项
+
+/** 获取表格合计数据 */
+const summaries = computed(() => {
+  return {
+    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
+    totalProductPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalProductPrice || 0),
+      0,
+    ),
+    taxPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.taxPrice || 0),
+      0,
+    ),
+    totalPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalPrice || 0),
+      0,
+    ),
+  };
+});
+
+/** 表格配置 */
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useFormItemColumns(tableData.value),
+    data: tableData.value,
+    minHeight: 250,
+    autoResize: true,
+    border: true,
+    rowConfig: {
+      keyField: 'seq',
+      isHover: true,
+    },
+    pagerConfig: {
+      enabled: false,
+    },
+    toolbarConfig: {
+      enabled: false,
+    },
+  },
+});
+
+/** 监听外部传入的列数据 */
+watch(
+  () => props.items,
+  async (items) => {
+    if (!items) {
+      return;
+    }
+    items.forEach((item) => initRow(item));
+    tableData.value = [...items];
+    await nextTick(); // 特殊：保证 gridApi 已经初始化
+    await gridApi.grid.reloadData(tableData.value);
+    // 更新表格列配置（目的：已出库、已出库动态列）
+    const columns = useFormItemColumns(tableData.value);
+    await gridApi.grid.reloadColumn(columns);
+  },
+  {
+    immediate: true,
+  },
+);
+
+/** 计算 discountPrice、otherPrice、totalPrice 价格 */
+watch(
+  () => [tableData.value, props.discountPercent, props.otherPrice],
+  () => {
+    if (!tableData.value || tableData.value.length === 0) {
+      return;
+    }
+    const totalPrice = tableData.value.reduce(
+      (prev, curr) => prev + (curr.totalPrice || 0),
+      0,
+    );
+    const discountPrice =
+      props.discountPercent === null
+        ? 0
+        : erpPriceMultiply(totalPrice, props.discountPercent / 100);
+    const discountedPrice = totalPrice - discountPrice!;
+    const finalTotalPrice = discountedPrice + (props.otherPrice || 0);
+
+    // 通知父组件更新
+    emit('update:discount-price', discountPrice);
+    emit('update:other-price', props.otherPrice || 0);
+    emit('update:total-price', finalTotalPrice);
+  },
+  { deep: true },
+);
+
+/** 处理删除 */
+function handleDelete(row: ErpSaleReturnApi.SaleReturnItem) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index !== -1) {
+    tableData.value.splice(index, 1);
+  }
+  // 通知父组件更新
+  emit('update:items', [...tableData.value]);
+}
+
+/** 处理仓库变更 */
+const handleWarehouseChange = async (row: ErpSaleReturnApi.SaleReturnItem) => {
+  const stockCount = await getWarehouseStockCount({
+    productId: row.productId!,
+    warehouseId: row.warehouseId!,
+  });
+  row.stockCount = stockCount || 0;
+  handleRowChange(row);
+};
+
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index === -1) {
+    tableData.value.push(row);
+  } else {
+    tableData.value[index] = row;
+  }
+  emit('update:items', [...tableData.value]);
+}
+
+/** 初始化行数据 */
+const initRow = (row: ErpSaleReturnApi.SaleReturnItem): void => {
+  if (row.productPrice && row.count) {
+    row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+    row.taxPrice =
+      erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
+    row.totalPrice = row.totalProductPrice + row.taxPrice;
+  }
+};
+
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (item) {
+      if (!item.warehouseId) {
+        throw new Error(`第 ${i + 1} 行：仓库不能为空`);
+      }
+      if (!item.count || item.count <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
+      }
+    }
+  }
+}
+
+defineExpose({
+  validate,
+});
+
+/** 初始化 */
+onMounted(async () => {
+  productOptions.value = await getProductSimpleList();
+  warehouseOptions.value = await getWarehouseSimpleList();
+});
+</script>
+
+<template>
+  <Grid class="w-full">
+    <template #warehouseId="{ row }">
+      <Select
+        v-model:value="row.warehouseId"
+        :options="warehouseOptions"
+        :field-names="{ label: 'name', value: 'id' }"
+        placeholder="请选择仓库"
+        :disabled="disabled"
+        show-search
+        class="w-full"
+        @change="handleWarehouseChange(row)"
+      />
+    </template>
+    <template #productId="{ row }">
+      <Select
+        disabled
+        v-model:value="row.productId"
+        :options="productOptions"
+        :field-names="{ label: 'name', value: 'id' }"
+        class="w-full"
+        placeholder="请选择产品"
+        show-search
+      />
+    </template>
+    <template #count="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.count"
+        :min="0"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ erpCountInputFormatter(row.count) || '-' }}</span>
+    </template>
+    <template #productPrice="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.productPrice"
+        :min="0"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ erpPriceInputFormatter(row.productPrice) || '-' }}</span>
+    </template>
+    <template #remark="{ row }">
+      <Input v-if="!disabled" v-model:value="row.remark" class="w-full" />
+      <span v-else>{{ row.remark || '-' }}</span>
+    </template>
+    <template #taxPercent="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.taxPercent"
+        :min="0"
+        :max="100"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ row.taxPercent || '-' }}</span>
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        v-if="!disabled"
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该产品吗？',
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+
+    <template #bottom>
+      <div class="border-border bg-muted mt-2 rounded border p-2">
+        <div class="text-muted-foreground flex justify-between text-sm">
+          <span class="text-foreground font-medium">合计：</span>
+          <div class="flex space-x-4">
+            <span>数量：{{ erpCountInputFormatter(summaries.count) }}</span>
+            <span>
+              金额：{{ erpPriceInputFormatter(summaries.totalProductPrice) }}
+            </span>
+            <span>税额：{{ erpPriceInputFormatter(summaries.taxPrice) }}</span>
+            <span>
+              税额合计：{{ erpPriceInputFormatter(summaries.totalPrice) }}
+            </span>
+          </div>
+        </div>
+      </div>
+    </template>
+  </Grid>
+</template>
diff --git a/apps/web-antd/src/views/erp/sale/return/modules/select-sale-order-grid.vue b/apps/web-antd/src/views/erp/sale/return/modules/sale-order-select.vue
similarity index 43%
rename from apps/web-antd/src/views/erp/sale/return/modules/select-sale-order-grid.vue
rename to apps/web-antd/src/views/erp/sale/return/modules/sale-order-select.vue
index 0acfbc5ebbe8f7511f3a60648b7e76f4bb7cbe89..4d44aeee1b2cf59ed8fb5b17a326621241bd00d2 100644
--- a/apps/web-antd/src/views/erp/sale/return/modules/select-sale-order-grid.vue
+++ b/apps/web-antd/src/views/erp/sale/return/modules/sale-order-select.vue
@@ -2,13 +2,36 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 
+import { ref } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { Input, message, Modal } from 'ant-design-vue';
+
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getSaleOrderPage } from '#/api/erp/sale/order';
 
 import { useOrderGridColumns, useOrderGridFormSchema } from '../data';
 
-const emit = defineEmits(['selectRow']);
+defineProps({
+  orderNo: {
+    type: String,
+    default: () => undefined,
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits<{
+  'update:order': [order: ErpSaleOrderApi.SaleOrder];
+}>();
+
+const order = ref<ErpSaleOrderApi.SaleOrder>(); // 选择的销售订单
+const open = ref<boolean>(false); // 选择销售订单弹窗是否打开
 
+/** 表格配置 */
 const [Grid] = useVbenVxeGrid({
   formOptions: {
     schema: useOrderGridFormSchema(),
@@ -44,12 +67,51 @@ const [Grid] = useVbenVxeGrid({
   } as VxeTableGridOptions<ErpSaleOrderApi.SaleOrder>,
   gridEvents: {
     radioChange: ({ row }: { row: ErpSaleOrderApi.SaleOrder }) => {
-      emit('selectRow', row);
+      handleSelectOrder(row);
     },
   },
 });
+
+/** 选择销售订单 */
+function handleSelectOrder(selectOrder: ErpSaleOrderApi.SaleOrder) {
+  order.value = selectOrder;
+}
+
+/** 确认选择销售订单 */
+const handleOk = () => {
+  if (!order.value) {
+    message.warning('请选择一个销售订单');
+    return;
+  }
+  emit('update:order', order.value);
+  open.value = false;
+};
 </script>
 
 <template>
-  <Grid class="max-h-[600px]" table-title="销售订单列表(仅展示可退货)" />
-</template>
+  <Input
+    readonly
+    :value="orderNo"
+    :disabled="disabled"
+    @click="() => !disabled && (open = true)"
+  >
+    <template #addonAfter>
+      <div>
+        <IconifyIcon
+          class="h-full w-6 cursor-pointer"
+          icon="ant-design:setting-outlined"
+          :style="{ cursor: disabled ? 'not-allowed' : 'pointer' }"
+          @click="() => !disabled && (open = true)"
+        />
+      </div>
+    </template>
+  </Input>
+  <Modal
+    class="!w-[50vw]"
+    v-model:open="open"
+    title="选择关联订单"
+    @ok="handleOk"
+  >
+    <Grid class="max-h-[600px]" table-title="销售订单列表(仅展示可退货)" />
+  </Modal>
+</template>
\ No newline at end of file
diff --git a/apps/web-antd/src/views/erp/sale/return/modules/sale-return-item-form.vue b/apps/web-antd/src/views/erp/sale/return/modules/sale-return-item-form.vue
deleted file mode 100644
index 64b0c43f8a222bf8e79e8930d8742fc6d71ee13d..0000000000000000000000000000000000000000
--- a/apps/web-antd/src/views/erp/sale/return/modules/sale-return-item-form.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-<script lang="ts" setup>
-import type { ErpSaleOutApi } from '#/api/erp/sale/out';
-
-import { nextTick, onMounted, ref, watch } from 'vue';
-
-import { erpPriceMultiply } from '@vben/utils';
-
-import { InputNumber, Select } from 'ant-design-vue';
-
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { getProductSimpleList } from '#/api/erp/product/product';
-import { getWarehouseStockCount } from '#/api/erp/stock/stock';
-import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
-
-import { useSaleReturnItemTableColumns } from '../data';
-
-const props = withDefaults(defineProps<Props>(), {
-  items: () => [],
-  disabled: false,
-});
-
-const emit = defineEmits(['update:items', 'update:totalPrice']);
-
-interface Props {
-  items?: ErpSaleOutApi.SaleOutItem[];
-  disabled?: boolean;
-}
-
-const tableData = ref<ErpSaleOutApi.SaleOutItem[]>([]);
-const productOptions = ref<any[]>([]);
-const warehouseOptions = ref<any[]>([]);
-
-/** 表格配置 */
-const [Grid, gridApi] = useVbenVxeGrid({
-  gridOptions: {
-    editConfig: {
-      trigger: 'click',
-      mode: 'cell',
-    },
-    columns: useSaleReturnItemTableColumns(),
-    data: tableData.value,
-    border: true,
-    showOverflow: true,
-    autoResize: true,
-    minHeight: 250,
-    keepSource: true,
-    rowConfig: {
-      keyField: 'id',
-    },
-    pagerConfig: {
-      enabled: false,
-    },
-    toolbarConfig: {
-      enabled: false,
-    },
-  },
-});
-
-/** 监听外部传入的列数据 */
-watch(
-  () => props.items,
-  async (items) => {
-    if (!items) {
-      return;
-    }
-    await nextTick();
-    tableData.value = [...items];
-    await nextTick();
-    gridApi.grid.reloadData(tableData.value);
-  },
-  {
-    immediate: true,
-  },
-);
-
-/** 初始化 */
-onMounted(async () => {
-  productOptions.value = await getProductSimpleList();
-  warehouseOptions.value = await getWarehouseSimpleList();
-});
-
-function handlePriceChange(row: any) {
-  if (row.productPrice && row.count) {
-    row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
-    row.taxPrice =
-      erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
-    row.totalPrice = row.totalProductPrice + row.taxPrice;
-  }
-  handleUpdateValue(row);
-}
-
-const handleWarehouseChange = async (row: ErpSaleOutApi.SaleOutItem) => {
-  const warehouseId = row.warehouseId;
-  const stockCount = await getWarehouseStockCount({
-    productId: row.productId!,
-    warehouseId: warehouseId!,
-  });
-  row.stockCount = stockCount || 0;
-  handleUpdateValue(row);
-};
-
-function handleUpdateValue(row: any) {
-  const index = tableData.value.findIndex((item) => item.id === row.id);
-  if (index === -1) {
-    tableData.value.push(row);
-  } else {
-    tableData.value[index] = row;
-  }
-  emit('update:items', [...tableData.value]);
-}
-
-const getSummaries = (): {
-  count: number;
-  productName: string;
-  taxPrice: number;
-  totalPrice: number;
-  totalProductPrice: number;
-} => {
-  const count = tableData.value.reduce(
-    (sum, item) => sum + (item.count || 0),
-    0,
-  );
-  const totalProductPrice = tableData.value.reduce(
-    (sum, item) => sum + (item.totalProductPrice || 0),
-    0,
-  );
-  const taxPrice = tableData.value.reduce(
-    (sum, item) => sum + (item.taxPrice || 0),
-    0,
-  );
-  const totalPrice = tableData.value.reduce(
-    (sum, item) => sum + (item.totalPrice || 0),
-    0,
-  );
-  return {
-    productName: '合计',
-    count,
-    totalProductPrice,
-    taxPrice,
-    totalPrice,
-  };
-};
-
-const validate = async (): Promise<boolean> => {
-  try {
-    for (let i = 0; i < tableData.value.length; i++) {
-      const item = tableData.value[i];
-      if (item) {
-        if (!item.warehouseId) {
-          throw new Error(`第 ${i + 1} 行：仓库不能为空`);
-        }
-        if (!item.count || item.count <= 0) {
-          throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
-        }
-      }
-    }
-    return true;
-  } catch (error) {
-    console.error('验证失败:', error);
-    throw error;
-  }
-};
-
-const getData = (): ErpSaleOutApi.SaleOutItem[] => tableData.value;
-const init = (items: ErpSaleOutApi.SaleOutItem[] | undefined): void => {
-  tableData.value =
-    items && items.length > 0
-      ? items.map((item) => {
-          const newItem = { ...item };
-          if (newItem.productPrice && newItem.count) {
-            newItem.totalProductPrice =
-              erpPriceMultiply(newItem.productPrice, newItem.count) ?? 0;
-            newItem.taxPrice =
-              erpPriceMultiply(
-                newItem.totalProductPrice,
-                (newItem.taxPercent || 0) / 100,
-              ) ?? 0;
-            newItem.totalPrice = newItem.totalProductPrice + newItem.taxPrice;
-          }
-          return newItem;
-        })
-      : [];
-  // TODO @XuZhiqiang：使用 await 风格哈；
-  nextTick(() => {
-    gridApi.grid.reloadData(tableData.value);
-  });
-};
-
-defineExpose({
-  validate,
-  getData,
-  init,
-});
-</script>
-
-<template>
-  <Grid class="w-full">
-    <template #warehouseId="{ row }">
-      <Select
-        v-model:value="row.warehouseId"
-        :options="warehouseOptions"
-        :field-names="{ label: 'name', value: 'id' }"
-        placeholder="请选择仓库"
-        :disabled="disabled"
-        show-search
-        class="w-full"
-        @change="handleWarehouseChange(row)"
-      />
-    </template>
-    <template #productId="{ row }">
-      <Select
-        disabled
-        v-model:value="row.productId"
-        :options="productOptions"
-        :field-names="{ label: 'name', value: 'id' }"
-        style="width: 100%"
-        placeholder="请选择产品"
-        show-search
-      />
-    </template>
-
-    <template #count="{ row }">
-      <InputNumber
-        v-if="!disabled"
-        v-model:value="row.count"
-        :min="0"
-        :precision="2"
-        @change="handlePriceChange(row)"
-      />
-      <span v-else>{{ row.count || '-' }}</span>
-    </template>
-    <template #productPrice="{ row }">
-      <InputNumber
-        disabled
-        v-model:value="row.productPrice"
-        :min="0"
-        :precision="2"
-        @change="handlePriceChange(row)"
-      />
-    </template>
-
-    <template #bottom>
-      <div class="border-border bg-muted mt-2 rounded border p-2">
-        <div class="text-muted-foreground flex justify-between text-sm">
-          <span class="text-foreground font-medium">合计：</span>
-          <div class="flex space-x-4">
-            <span>数量：{{ getSummaries().count }}</span>
-            <span>金额：{{ getSummaries().totalProductPrice }}</span>
-            <span>税额：{{ getSummaries().taxPrice }}</span>
-            <span>税额合计：{{ getSummaries().totalPrice }}</span>
-          </div>
-        </div>
-      </div>
-    </template>
-  </Grid>
-</template>
diff --git a/apps/web-antd/src/views/erp/sale/return/modules/select-sale-order-form.vue b/apps/web-antd/src/views/erp/sale/return/modules/select-sale-order-form.vue
deleted file mode 100644
index e77dae06a27bc9b8459e425ae99a40b1f00dc618..0000000000000000000000000000000000000000
--- a/apps/web-antd/src/views/erp/sale/return/modules/select-sale-order-form.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<script lang="ts" setup>
-import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
-
-import { ref } from 'vue';
-
-import { IconifyIcon } from '@vben/icons';
-
-import { Input, message, Modal } from 'ant-design-vue';
-
-import SelectSaleOrderGrid from './select-sale-order-grid.vue';
-
-defineProps({
-  orderNo: {
-    type: String,
-    default: () => undefined,
-  },
-  disabled: {
-    type: Boolean,
-    default: false,
-  },
-});
-const emit = defineEmits<{
-  'update:order': [order: ErpSaleOrderApi.SaleOrder];
-}>();
-const order = ref<ErpSaleOrderApi.SaleOrder>();
-const open = ref<boolean>(false);
-
-const handleSelectOrder = (selectOrder: ErpSaleOrderApi.SaleOrder) => {
-  order.value = selectOrder;
-};
-
-const handleOk = () => {
-  if (!order.value) {
-    message.warning('请选择一个采购订单');
-    return;
-  }
-  emit('update:order', order.value);
-  open.value = false;
-};
-</script>
-
-<template>
-  <Input
-    v-bind="$attrs"
-    readonly
-    :value="orderNo"
-    :disabled="disabled"
-    @click="() => !disabled && (open = true)"
-  >
-    <template #addonAfter>
-      <div>
-        <IconifyIcon
-          class="h-full w-6 cursor-pointer"
-          icon="ant-design:setting-outlined"
-          :style="{ cursor: disabled ? 'not-allowed' : 'pointer' }"
-          @click="() => !disabled && (open = true)"
-        />
-      </div>
-    </template>
-  </Input>
-  <Modal
-    v-model:open="open"
-    title="选择关联订单"
-    class="!w-[50vw]"
-    :show-confirm-button="true"
-    @ok="handleOk"
-  >
-    <SelectSaleOrderGrid @select-row="handleSelectOrder" />
-  </Modal>
-</template>
diff --git a/apps/web-antd/src/views/erp/stock/check/data.ts b/apps/web-antd/src/views/erp/stock/check/data.ts
index d8ee04d7331ba1b728b1ee35e894c1733c030d93..8a60c2ab2d82b26d9f9279bc02f4f3ec706a59c2 100644
--- a/apps/web-antd/src/views/erp/stock/check/data.ts
+++ b/apps/web-antd/src/views/erp/stock/check/data.ts
@@ -4,62 +4,58 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import { createRequiredValidation } from '#/adapter/vxe-table';
 import { getProductSimpleList } from '#/api/erp/product/product';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 表单的配置项 */
 export function useFormSchema(formType: string): VbenFormSchema[] {
   return [
     {
+      fieldName: 'id',
       component: 'Input',
-      componentProps: {
-        style: { display: 'none' },
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
       },
-      fieldName: 'id',
-      label: 'ID',
-      hideLabel: true,
-      formItemClass: 'hidden',
     },
     {
+      fieldName: 'no',
+      label: '盘点单号',
       component: 'Input',
       componentProps: {
         placeholder: '系统自动生成',
         disabled: true,
       },
-      fieldName: 'no',
-      label: '盘点单号',
     },
     {
+      fieldName: 'checkTime',
+      label: '盘点时间',
       component: 'DatePicker',
       componentProps: {
         placeholder: '选择盘点时间',
         showTime: true,
         format: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
-        style: { width: '100%' },
       },
-      disabled: formType === 'detail',
-      fieldName: 'checkTime',
-      label: '盘点时间',
       rules: 'required',
     },
     {
+      fieldName: 'remark',
+      label: '备注',
       component: 'Textarea',
       componentProps: {
         placeholder: '请输入备注',
-        autoSize: { minRows: 2, maxRows: 4 },
-        class: 'w-full',
+        autoSize: { minRows: 1, maxRows: 1 },
+        disabled: formType === 'detail',
       },
-      disabled: formType === 'detail',
-      fieldName: 'remark',
-      label: '备注',
-      formItemClass: 'col-span-3',
+      formItemClass: 'col-span-2',
     },
     {
+      fieldName: 'fileUrl',
+      label: '附件',
       component: 'FileUpload',
-      disabled: formType === 'detail',
       componentProps: {
         maxNumber: 1,
         maxSize: 10,
@@ -74,15 +70,13 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
           'jpeg',
           'png',
         ],
-        showDescription: true,
+        showDescription: formType !== 'detail',
+        disabled: formType === 'detail',
       },
-      fieldName: 'fileUrl',
-      label: '附件',
       formItemClass: 'col-span-3',
     },
     {
-      fieldName: 'product',
-      disabled: formType === 'detail',
+      fieldName: 'items',
       label: '产品清单',
       component: 'Input',
       formItemClass: 'col-span-3',
@@ -90,10 +84,8 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
   ];
 }
 
-/** 库存盘点清单表格列定义 */
-export function useStockCheckItemTableColumns(
-  isValidating?: any,
-): VxeTableGridOptions['columns'] {
+/** 表单的明细表格列 */
+export function useFormItemColumns(): VxeTableGridOptions['columns'] {
   return [
     { type: 'seq', title: '序号', minWidth: 50, fixed: 'left' },
     {
@@ -101,19 +93,18 @@ export function useStockCheckItemTableColumns(
       title: '仓库名称',
       minWidth: 150,
       slots: { default: 'warehouseId' },
-      className: createRequiredValidation(isValidating, 'warehouseId'),
     },
     {
       field: 'productId',
       title: '产品名称',
       minWidth: 200,
       slots: { default: 'productId' },
-      className: createRequiredValidation(isValidating, 'productId'),
     },
     {
       field: 'stockCount',
       title: '账面库存',
-      minWidth: 100,
+      minWidth: 80,
+      formatter: 'formatAmount3',
     },
     {
       field: 'productBarCode',
@@ -125,38 +116,41 @@ export function useStockCheckItemTableColumns(
       title: '单位',
       minWidth: 80,
     },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      slots: { default: 'remark' },
+    },
     {
       field: 'actualCount',
       title: '实际库存',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'actualCount' },
-      className: createRequiredValidation(isValidating, 'actualCount'),
+      formatter: 'formatAmount3',
     },
     {
       field: 'count',
       title: '盈亏数量',
       minWidth: 120,
-      slots: { default: 'count' },
-      className: createRequiredValidation(isValidating, 'count'),
+      fixed: 'right',
+      formatter: 'formatAmount3',
     },
     {
       field: 'productPrice',
       title: '产品单价',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'productPrice' },
     },
     {
       field: 'totalPrice',
-      title: '合计金额',
+      title: '金额',
       minWidth: 120,
+      fixed: 'right',
       formatter: 'formatAmount2',
     },
-    {
-      field: 'remark',
-      title: '备注',
-      minWidth: 150,
-      slots: { default: 'remark' },
-    },
     {
       title: '操作',
       width: 50,
@@ -187,9 +181,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
         showSearch: true,
         api: getProductSimpleList,
-        labelField: 'name',
-        valueField: 'id',
-        filterOption: false,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
       },
     },
     {
@@ -197,10 +192,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '盘点时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始日期', '结束日期'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
     {
@@ -212,9 +205,25 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
         showSearch: true,
         api: getWarehouseSimpleList,
-        labelField: 'name',
-        valueField: 'id',
-        filterOption: false,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'creator',
+      label: '创建人',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择创建人',
+        allowClear: true,
+        showSearch: true,
+        api: getSimpleUserList,
+        fieldNames: {
+          label: 'nickname',
+          value: 'id',
+        },
       },
     },
     {
@@ -222,9 +231,9 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '状态',
       component: 'Select',
       componentProps: {
+        options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
         placeholder: '请选择状态',
         allowClear: true,
-        options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
       },
     },
     {
@@ -236,20 +245,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
       },
     },
-    {
-      fieldName: 'creator',
-      label: '创建人',
-      component: 'ApiSelect',
-      componentProps: {
-        placeholder: '请选择创建人',
-        allowClear: true,
-        showSearch: true,
-        api: getSimpleUserList,
-        labelField: 'nickname',
-        valueField: 'id',
-        filterOption: false,
-      },
-    },
   ];
 }
 
@@ -264,42 +259,42 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'no',
       title: '盘点单号',
-      minWidth: 180,
+      width: 200,
+      fixed: 'left',
     },
     {
       field: 'productNames',
       title: '产品信息',
-      minWidth: 200,
       showOverflow: 'tooltip',
+      minWidth: 120,
     },
     {
       field: 'checkTime',
-      title: '出库时间',
-      minWidth: 180,
-      cellRender: {
-        name: 'CellDateTime',
-      },
+      title: '盘点时间',
+      width: 160,
+      formatter: 'formatDate',
     },
     {
       field: 'creatorName',
       title: '创建人',
-      minWidth: 100,
+      minWidth: 120,
     },
     {
       field: 'totalCount',
-      title: '数量',
-      minWidth: 100,
+      title: '总数量',
+      formatter: 'formatAmount3',
+      minWidth: 120,
     },
     {
       field: 'totalPrice',
-      title: '金额',
-      minWidth: 100,
+      title: '总金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
     },
     {
       field: 'status',
       title: '状态',
-      minWidth: 90,
-      fixed: 'right',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
@@ -307,7 +302,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       title: '操作',
-      width: 300,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
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 941f8eba87e0f890eac88d1116e86440e3e56931..c41d683324822bdbf6ac9363e6148eb827b2ea20 100644
--- a/apps/web-antd/src/views/erp/stock/check/index.vue
+++ b/apps/web-antd/src/views/erp/stock/check/index.vue
@@ -2,8 +2,10 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ErpStockCheckApi } from '#/api/erp/stock/check';
 
+import { ref } from 'vue';
+
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
-import { downloadFileFromBlobPart } from '@vben/utils';
+import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
@@ -17,71 +19,84 @@ import {
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import StockInForm from './modules/form.vue';
+import Form from './modules/form.vue';
 
-/** 库存盘点管理 */
+/** ERP 库存盘点单列表 */
 defineOptions({ name: 'ErpStockCheck' });
 
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: StockInForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 导出库存盘点单 */
+/** 导出表格 */
 async function handleExport() {
   const data = await exportStockCheck(await gridApi.formApi.getValues());
   downloadFileFromBlobPart({ fileName: '库存盘点单.xls', source: data });
 }
 
-/** 新增/编辑/详情 */
-function openForm(type: string, id?: number) {
-  formModalApi.setData({ type, id }).open();
+/** 新增库存盘点单 */
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+/** 编辑库存盘点单 */
+function handleEdit(row: ErpStockCheckApi.StockCheck) {
+  formModalApi.setData({ type: 'edit', id: row.id }).open();
 }
 
-/** 删除 */
-async function handleDelete(ids: any[]) {
+/** 删除库存盘点单 */
+async function handleDelete(ids: number[]) {
   const hideLoading = message.loading({
-    content: '删除中...',
+    content: $t('ui.actionMessage.deleting'),
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
     await deleteStockCheck(ids);
-    message.success({
-      content: '删除成功',
-      key: 'action_process_msg',
-    });
-    onRefresh();
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
-/** 审核/反审核 */
-async function handleUpdateStatus(id: any, status: number) {
-  const statusText = status === 20 ? '审核' : '反审核';
+/** 审批/反审批操作 */
+async function handleUpdateStatus(
+  row: ErpStockCheckApi.StockCheck,
+  status: number,
+) {
   const hideLoading = message.loading({
-    content: `${statusText}中...`,
+    content: `确定${status === 20 ? '审批' : '反审批'}该盘点单吗？`,
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
-    await updateStockCheckStatus({ id, status });
-    message.success({
-      content: `${statusText}成功`,
-      key: 'action_process_msg',
-    });
-    onRefresh();
+    await updateStockCheckStatus(row.id!, status);
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`);
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
+const checkedIds = ref<number[]>([]);
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ErpStockCheckApi.StockCheck[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+
+/** 查看详情 */
+function handleDetail(row: ErpStockCheckApi.StockCheck) {
+  formModalApi.setData({ type: 'detail', id: row.id }).open();
+}
+
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
@@ -103,15 +118,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
       search: true,
     },
-    checkboxConfig: {
-      reserve: true,
-    },
   } as VxeTableGridOptions<ErpStockCheckApi.StockCheck>,
+  gridEvents: {
+    checkboxAll: handleRowCheckboxChange,
+    checkboxChange: handleRowCheckboxChange,
+  },
 });
 </script>
 
@@ -123,97 +140,86 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/erp/stock-move-check/"
       />
     </template>
+
+    <FormModal @success="handleRefresh" />
     <Grid table-title="库存盘点单列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
             {
-              label: $t('ui.actionTitle.create', ['库存盘点']),
+              label: $t('ui.actionTitle.create', ['库存盘点单']),
               type: 'primary',
               icon: ACTION_ICON.ADD,
               auth: ['erp:stock-check:create'],
-              onClick: () => openForm('create'),
+              onClick: handleCreate,
             },
             {
               label: $t('ui.actionTitle.export'),
-              type: 'default',
+              type: 'primary',
               icon: ACTION_ICON.DOWNLOAD,
               auth: ['erp:stock-check:export'],
               onClick: handleExport,
             },
             {
               label: '批量删除',
-              type: 'default',
+              type: 'primary',
               danger: true,
+              disabled: isEmpty(checkedIds),
               icon: ACTION_ICON.DELETE,
               auth: ['erp:stock-check:delete'],
               popConfirm: {
-                title: '是否删除所选中数据？',
-                confirm: () => {
-                  const checkboxRecords = gridApi.grid.getCheckboxRecords();
-                  if (checkboxRecords.length === 0) {
-                    message.warning('请选择要删除的数据');
-                    return;
-                  }
-                  handleDelete(checkboxRecords.map((item) => item.id));
-                },
+                title: `是否删除所选中数据？`,
+                confirm: handleDelete.bind(null, checkedIds),
               },
             },
           ]"
         />
       </template>
-
       <template #actions="{ row }">
         <TableAction
           :actions="[
             {
-              label: '详情',
+              label: $t('common.detail'),
+              type: 'link',
               icon: ACTION_ICON.VIEW,
               auth: ['erp:stock-check:query'],
-              onClick: () => openForm('detail', row.id),
+              onClick: handleDetail.bind(null, row),
             },
             {
-              label: '编辑',
-              auth: ['erp:stock-check:update'],
+              label: $t('common.edit'),
+              type: 'link',
               icon: ACTION_ICON.EDIT,
-              disabled: row.status !== 10,
-              onClick: () => openForm('update', row.id),
-            },
-            {
-              label: '审核',
               auth: ['erp:stock-check:update'],
-              ifShow: row.status === 10,
-              popConfirm: {
-                title: '确认要审核该盘点单吗？',
-                confirm: () => handleUpdateStatus(row.id, 20),
-              },
+              ifShow: () => row.status !== 20,
+              onClick: handleEdit.bind(null, row),
             },
             {
-              label: '反审核',
-              danger: true,
-              auth: ['erp:stock-check:update'],
-              ifShow: row.status === 20,
+              label: row.status === 10 ? '审批' : '反审批',
+              type: 'link',
+              auth: ['erp:stock-check:update-status'],
               popConfirm: {
-                title: '确认要反审核该盘点单吗？',
-                confirm: () => handleUpdateStatus(row.id, 10),
+                title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`,
+                confirm: handleUpdateStatus.bind(
+                  null,
+                  row,
+                  row.status === 10 ? 20 : 10,
+                ),
               },
             },
             {
-              label: '删除',
+              label: $t('common.delete'),
+              type: 'link',
               danger: true,
+              color: 'error',
               auth: ['erp:stock-check:delete'],
-              disabled: row.status !== 10,
               popConfirm: {
-                title: '确认要删除该盘点单吗？',
-                confirm: () => handleDelete([row.id]),
+                title: $t('ui.actionMessage.deleteConfirm', [row.no]),
+                confirm: handleDelete.bind(null, [row.id!]),
               },
             },
           ]"
         />
       </template>
     </Grid>
-
-    <!-- 表单弹窗 -->
-    <FormModal @success="onRefresh" />
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/erp/stock/check/modules/form.vue b/apps/web-antd/src/views/erp/stock/check/modules/form.vue
index 7999e00383330397b78e26eba3a8f1d704774d99..96eb0c969d630230d09fb69ef724e24f30b81ffd 100644
--- a/apps/web-antd/src/views/erp/stock/check/modules/form.vue
+++ b/apps/web-antd/src/views/erp/stock/check/modules/form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { ErpStockCheckApi } from '#/api/erp/stock/check';
 
-import { computed, nextTick, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
@@ -12,22 +12,25 @@ import {
   createStockCheck,
   getStockCheck,
   updateStockCheck,
-  updateStockCheckStatus,
 } from '#/api/erp/stock/check';
+import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
-import StockInItemForm from './stock-check-item-form.vue';
+import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockCheckApi.StockCheck>();
-const formType = ref('');
-const itemFormRef = ref();
-
-const getTitle = computed(() => {
-  if (formType.value === 'create') return '添加库存盘点单';
-  if (formType.value === 'update') return '编辑库存盘点单';
-  return '库存盘点单详情';
-});
+const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const itemFormRef = ref<InstanceType<typeof ItemForm>>();
+
+/* eslint-disable unicorn/no-nested-ternary */
+const getTitle = computed(() =>
+  formType.value === 'create'
+    ? $t('ui.actionTitle.create', ['库存盘点单'])
+    : formType.value === 'edit'
+      ? $t('ui.actionTitle.edit', ['库存盘点单'])
+      : '库存盘点单详情',
+);
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -42,11 +45,13 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
+/** 更新盘点单项 */
 const handleUpdateItems = (items: ErpStockCheckApi.StockCheckItem[]) => {
   formData.value = modalApi.getData<ErpStockCheckApi.StockCheck>();
-  if (formData.value) {
-    formData.value.items = items;
-  }
+  formData.value.items = items;
+  formApi.setValues({
+    items,
+  });
 };
 
 /** 创建或更新库存盘点单 */
@@ -56,44 +61,19 @@ const [Modal, modalApi] = useVbenModal({
     if (!valid) {
       return;
     }
-    await nextTick();
-
     const itemFormInstance = Array.isArray(itemFormRef.value)
       ? itemFormRef.value[0]
       : itemFormRef.value;
-    if (itemFormInstance && typeof itemFormInstance.validate === 'function') {
-      try {
-        const isValid = await itemFormInstance.validate();
-        if (!isValid) {
-          message.error('产品清单验证失败，请检查必填项');
-          return;
-        }
-      } catch (error: any) {
-        message.error(error.message || '产品清单验证失败');
-        return;
-      }
-    } else {
-      message.error('产品清单验证方法不存在');
-      return;
-    }
-
-    // 验证产品清单不能为空
-    if (!formData.value?.items || formData.value.items.length === 0) {
-      message.error('产品清单不能为空，请至少添加一个产品');
+    try {
+      itemFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
       return;
     }
 
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as ErpStockCheckApi.StockCheck;
-    data.items = formData.value?.items?.map((item) => ({
-      ...item,
-      id: undefined,
-    }));
-    // 将文件数组转换为字符串
-    if (data.fileUrl && Array.isArray(data.fileUrl)) {
-      data.fileUrl = data.fileUrl.length > 0 ? data.fileUrl[0] : '';
-    }
     try {
       await (formType.value === 'create'
         ? createStockCheck(data)
@@ -101,7 +81,7 @@ const [Modal, modalApi] = useVbenModal({
       // 关闭并提示
       await modalApi.close();
       emit('success');
-      message.success(formType.value === 'create' ? '新增成功' : '更新成功');
+      message.success($t('ui.actionMessage.operationSuccess'));
     } finally {
       modalApi.unlock();
     }
@@ -113,77 +93,34 @@ const [Modal, modalApi] = useVbenModal({
     }
     // 加载数据
     const data = modalApi.getData<{ id?: number; type: string }>();
-    if (!data) {
-      return;
-    }
     formType.value = data.type;
+    formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
-    if (!data.id) {
-      // 初始化空的表单数据
-      formData.value = { items: [] } as unknown as ErpStockCheckApi.StockCheck;
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init([]);
-      }
-      // 如果是新增，自动添加一行
-      if (formType.value === 'create' && itemFormInstance) {
-        itemFormInstance.handleAdd();
-      }
+    if (!data || !data.id) {
       return;
     }
-
     modalApi.lock();
     try {
       formData.value = await getStockCheck(data.id);
       // 设置到 values
       await formApi.setValues(formData.value);
-      // 初始化子表单
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init(formData.value.items || []);
-      }
     } finally {
       modalApi.unlock();
     }
   },
 });
-
-/** 审核/反审核 */
-async function handleUpdateStatus(id: number, status: number) {
-  try {
-    await updateStockCheckStatus({ id, status });
-    message.success(status === 20 ? '审核成功' : '反审核成功');
-    emit('success');
-    await modalApi.close();
-  } catch (error: any) {
-    message.error(error.message || '操作失败');
-  }
-}
-
-defineExpose({ modalApi, handleUpdateStatus });
 </script>
 
 <template>
   <Modal
-    v-bind="$attrs"
     :title="getTitle"
-    class="w-4/5"
-    :closable="true"
-    :mask-closable="true"
+    class="w-3/4"
     :show-confirm-button="formType !== 'detail'"
   >
     <Form class="mx-3">
-      <template #product="slotProps">
-        <StockInItemForm
-          v-bind="slotProps"
+      <template #items>
+        <ItemForm
           ref="itemFormRef"
-          class="w-full"
           :items="formData?.items ?? []"
           :disabled="formType === 'detail'"
           @update:items="handleUpdateItems"
diff --git a/apps/web-antd/src/views/erp/stock/check/modules/stock-check-item-form.vue b/apps/web-antd/src/views/erp/stock/check/modules/item-form.vue
similarity index 31%
rename from apps/web-antd/src/views/erp/stock/check/modules/stock-check-item-form.vue
rename to apps/web-antd/src/views/erp/stock/check/modules/item-form.vue
index 90af5f7aa21c9d2dd358fc3f3c030bf19217dc4b..54d6e55f968de3bad3ece3775505325dfeba95e7 100644
--- a/apps/web-antd/src/views/erp/stock/check/modules/stock-check-item-form.vue
+++ b/apps/web-antd/src/views/erp/stock/check/modules/item-form.vue
@@ -1,10 +1,14 @@
 <script lang="ts" setup>
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ErpProductApi } from '#/api/erp/product/product';
 import type { ErpStockCheckApi } from '#/api/erp/stock/check';
 
-import { nextTick, onMounted, ref, watch } from 'vue';
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
-import { erpPriceMultiply } from '@vben/utils';
+import {
+  erpCountInputFormatter,
+  erpPriceInputFormatter,
+  erpPriceMultiply,
+} from '@vben/utils';
 
 import { Input, InputNumber, Select } from 'ant-design-vue';
 
@@ -13,7 +17,12 @@ import { getProductSimpleList } from '#/api/erp/product/product';
 import { getStockCount } from '#/api/erp/stock/stock';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 
-import { useStockCheckItemTableColumns } from '../data';
+import { useFormItemColumns } from '../data';
+
+interface Props {
+  items?: ErpStockCheckApi.StockCheckItem[];
+  disabled?: boolean;
+}
 
 const props = withDefaults(defineProps<Props>(), {
   items: () => [],
@@ -22,32 +31,32 @@ const props = withDefaults(defineProps<Props>(), {
 
 const emit = defineEmits(['update:items']);
 
-interface Props {
-  items?: ErpStockCheckApi.StockCheckItem[];
-  disabled?: boolean;
-}
+const tableData = ref<ErpStockCheckApi.StockCheckItem[]>([]); // 表格数据
+const productOptions = ref<ErpProductApi.Product[]>([]); // 产品下拉选项
+const warehouseOptions = ref<any[]>([]); // 仓库下拉选项
 
-const tableData = ref<ErpStockCheckApi.StockCheckItem[]>([]);
-const productOptions = ref<any[]>([]);
-const warehouseOptions = ref<any[]>([]);
-const isValidating = ref(false);
+/** 获取表格合计数据 */
+const summaries = computed(() => {
+  return {
+    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
+    totalPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalPrice || 0),
+      0,
+    ),
+  };
+});
 
 /** 表格配置 */
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    editConfig: {
-      trigger: 'click',
-      mode: 'cell',
-    },
-    columns: useStockCheckItemTableColumns(isValidating),
+    columns: useFormItemColumns(),
     data: tableData.value,
-    border: true,
-    showOverflow: true,
-    autoResize: true,
     minHeight: 250,
-    keepSource: true,
+    autoResize: true,
+    border: true,
     rowConfig: {
-      keyField: 'id',
+      keyField: 'seq',
+      isHover: true,
     },
     pagerConfig: {
       enabled: false,
@@ -55,30 +64,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
     toolbarConfig: {
       enabled: false,
     },
-    showFooter: true,
-    footerCellClassName: 'stock-in-footer-cell',
-    footerMethod: ({
-      columns,
-    }: {
-      columns: VxeTableGridOptions['columns'];
-    }) => {
-      const footers: any[][] = [];
-      const sums = getSummaries();
-      const footerData: any[] = [];
-      columns!.forEach((column, columnIndex: number) => {
-        if (columnIndex === 0) {
-          footerData.push('合计');
-        } else if (column.field === 'count') {
-          footerData.push(sums.count);
-        } else if (column.field === 'totalPrice') {
-          footerData.push(sums.totalPrice);
-        } else {
-          footerData.push('');
-        }
-      });
-      footers.push(footerData);
-      return footers;
-    },
   },
 });
 
@@ -89,9 +74,9 @@ watch(
     if (!items) {
       return;
     }
-    await nextTick();
+    items.forEach((item) => initRow(item));
     tableData.value = [...items];
-    await nextTick();
+    await nextTick(); // 特殊：保证 gridApi 已经初始化
     await gridApi.grid.reloadData(tableData.value);
   },
   {
@@ -99,276 +84,225 @@ watch(
   },
 );
 
-/** 初始化 */
-onMounted(async () => {
-  productOptions.value = await getProductSimpleList();
-  warehouseOptions.value = await getWarehouseSimpleList();
-});
-
+/** 处理新增 */
 function handleAdd() {
   const newRow = {
+    id: undefined,
     warehouseId: undefined,
     productId: undefined,
-    productName: '',
-    productUnitId: undefined,
-    productUnitName: '',
-    productBarCode: '',
-    count: 1,
-    productPrice: 0,
-    totalPrice: 0,
-    stockCount: 0,
-    remark: '',
+    productUnitName: undefined, // 产品单位
+    productBarCode: undefined, // 产品条码
+    productPrice: undefined,
+    stockCount: undefined,
+    actualCount: undefined,
+    count: undefined,
+    totalPrice: undefined,
+    remark: undefined,
   };
   tableData.value.push(newRow);
-  gridApi.grid.insertAt(newRow, -1);
+  // 通知父组件更新
   emit('update:items', [...tableData.value]);
-  // 触发表格重新渲染以更新 cellClassName
-  // TODO @XuZhiqiang：使用 await 风格哈；
-  nextTick(() => {
-    gridApi.grid.refreshColumn();
-  });
 }
 
+/** 处理删除 */
 function handleDelete(row: ErpStockCheckApi.StockCheckItem) {
-  gridApi.grid.remove(row);
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index !== -1) {
     tableData.value.splice(index, 1);
   }
+  // 通知父组件更新
   emit('update:items', [...tableData.value]);
 }
 
+/** 处理仓库变更 */
 async function handleWarehouseChange(warehouseId: any, row: any) {
   const warehouse = warehouseOptions.value.find((w) => w.id === warehouseId);
   if (!warehouse) {
     return;
   }
-
   row.warehouseId = warehouseId;
 
   // 如果已选择产品，重新获取库存
   if (row.productId) {
-    const stockCount = await getStockCount(row.productId, warehouseId);
-    row.stockCount = stockCount || 0;
+    row.stockCount = (await getStockCount(row.productId, warehouseId)) || 0;
   }
 
-  handleUpdateValue(row);
+  handleRowChange(row);
 }
 
+/** 处理产品变更 */
 async function handleProductChange(productId: any, row: any) {
   const product = productOptions.value.find((p) => p.id === productId);
   if (!product) {
     return;
   }
-
-  // 获取库存数量
-  const stockCount = row.warehouseId
-    ? await getStockCount(productId, row.warehouseId)
-    : await getStockCount(productId);
-
   row.productId = productId;
   row.productUnitId = product.unitId;
   row.productBarCode = product.barCode;
   row.productUnitName = product.unitName;
   row.productName = product.name;
-  row.stockCount = stockCount || 0;
-  row.actualCount = stockCount || 0;
+  row.stockCount = row.warehouseId
+    ? (await getStockCount(productId, row.warehouseId)) || 0
+    : (await getStockCount(productId)) || 0;
+  row.actualCount = row.stockCount || 0;
   row.productPrice = product.purchasePrice || 0;
-  row.count = 0;
-
-  handlePriceChange(row);
+  row.count = row.actualCount - row.stockCount || 0;
+  handleRowChange(row);
 }
 
-function handlePriceChange(row: any) {
-  if (row.productPrice && row.actualCount) {
+/** 处理实际库存变更 */
+function handleActualCountChange(actualCount: any, row: any) {
+  row.actualCount = actualCount;
+  if (row.stockCount !== undefined && row.actualCount !== undefined) {
     row.count = row.actualCount - row.stockCount;
-    row.totalPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+    if (row.productPrice && row.count) {
+      row.totalPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+    }
   }
-  handleUpdateValue(row);
+  handleRowChange(row);
 }
 
-function handleUpdateValue(row: any) {
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index === -1) {
     tableData.value.push(row);
   } else {
     tableData.value[index] = row;
   }
   emit('update:items', [...tableData.value]);
-  // 触发表格重新渲染以更新cellClassName
-  nextTick(() => {
-    gridApi.grid.refreshColumn();
-  });
 }
 
-const getSummaries = (): {
-  count: number;
-  totalPrice: number;
-} => {
-  return {
-    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
-    totalPrice: tableData.value.reduce(
-      (sum, item) => sum + (item.totalPrice || 0),
-      0,
-    ),
-  };
+/** 初始化行数据 */
+const initRow = (row: ErpStockCheckApi.StockCheckItem): void => {
+  if (row.productPrice && row.count) {
+    row.totalPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+  }
 };
 
-/** 验证表单 */
-function validate(): Promise<boolean> {
-  return new Promise((resolve) => {
-    isValidating.value = true;
-
-    // 触发表格重新渲染以显示验证错误
-    nextTick(() => {
-      gridApi.grid.refreshColumn();
-    });
-
-    // 验证是否有产品清单
-    if (!tableData.value || tableData.value.length === 0) {
-      resolve(false);
-      return;
-    }
-
-    // 验证每一行的必填字段
-    for (const item of tableData.value) {
-      if (!item.warehouseId || !item.productId || !item.actualCount) {
-        resolve(false);
-        return;
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (item) {
+      if (!item.warehouseId) {
+        throw new Error(`第 ${i + 1} 行：仓库不能为空`);
+      }
+      if (!item.productId) {
+        throw new Error(`第 ${i + 1} 行：产品不能为空`);
+      }
+      if (!item.actualCount || item.actualCount <= 0) {
+        throw new Error(`第 ${i + 1} 行：实际库存不能为空`);
       }
     }
-
-    // 验证通过，清除验证状态
-    isValidating.value = false;
-    nextTick(() => {
-      gridApi.grid.refreshColumn();
-    });
-
-    resolve(true);
-  });
-}
-
-/** 初始化表格数据 */
-function init(items: ErpStockCheckApi.StockCheckItem[]) {
-  tableData.value = items || [];
-  gridApi.grid.reloadData(tableData.value);
+  }
 }
 
 defineExpose({
   validate,
-  init,
-  handleAdd,
+});
+
+/** 初始化 */
+onMounted(async () => {
+  productOptions.value = await getProductSimpleList();
+  warehouseOptions.value = await getWarehouseSimpleList();
+  // 目的：新增时，默认添加一行
+  if (tableData.value.length === 0) {
+    handleAdd();
+  }
 });
 </script>
 
 <template>
-  <div class="w-full">
-    <div class="mb-4 flex justify-between">
-      <span class="text-lg font-medium"></span>
-    </div>
-
-    <Grid>
-      <template #warehouseId="{ row }">
-        <Select
-          v-model:value="row.warehouseId"
-          :options="warehouseOptions"
-          :field-names="{ label: 'name', value: 'id' }"
-          placeholder="请选择仓库"
-          :disabled="disabled"
-          show-search
-          @change="(value) => handleWarehouseChange(value, row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #productId="{ row }">
-        <Select
-          v-model:value="row.productId"
-          :options="productOptions"
-          :field-names="{ label: 'name', value: 'id' }"
-          placeholder="请选择产品"
-          :disabled="disabled"
-          show-search
-          @change="(value) => handleProductChange(value, row)"
-          class="w-full"
-        />
-      </template>
-      <template #actualCount="{ row }">
-        <InputNumber
-          v-model:value="row.actualCount"
-          :disabled="disabled"
-          :min="0.001"
-          :precision="2"
-          @change="() => handlePriceChange(row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #count="{ row }">
-        <InputNumber
-          v-model:value="row.count"
-          :disabled="true"
-          :min="0.001"
-          :precision="2"
-          class="w-full"
-        />
-      </template>
-
-      <template #productPrice="{ row }">
-        <InputNumber
-          v-model:value="row.productPrice"
-          :disabled="disabled"
-          :min="0.01"
-          :precision="2"
-          @change="() => handlePriceChange(row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #remark="{ row }">
-        <Input
-          v-model:value="row.remark"
-          :disabled="disabled"
-          placeholder="请输入备注"
-        />
-      </template>
-
-      <template #actions="{ row }">
-        <TableAction
-          v-if="!disabled"
-          :actions="[
-            {
-              label: '删除',
-              type: 'link',
-              danger: true,
-              popConfirm: {
-                title: '确认删除该产品吗？',
-                confirm: handleDelete.bind(null, row),
-              },
+  <Grid class="w-full">
+    <template #warehouseId="{ row }">
+      <Select
+        v-model:value="row.warehouseId"
+        :options="warehouseOptions"
+        :field-names="{ label: 'name', value: 'id' }"
+        class="w-full"
+        placeholder="请选择仓库"
+        show-search
+        :disabled="disabled"
+        @change="handleWarehouseChange($event, row)"
+      />
+    </template>
+    <template #productId="{ row }">
+      <Select
+        v-model:value="row.productId"
+        :options="productOptions"
+        :field-names="{ label: 'name', value: 'id' }"
+        class="w-full"
+        placeholder="请选择产品"
+        show-search
+        :disabled="disabled"
+        @change="handleProductChange($event, row)"
+      />
+    </template>
+    <template #actualCount="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.actualCount"
+        :min="0"
+        :precision="3"
+        @change="handleActualCountChange($event, row)"
+      />
+      <span v-else>{{ erpCountInputFormatter(row.actualCount) || '-' }}</span>
+    </template>
+    <template #productPrice="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.productPrice"
+        :min="0"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ erpPriceInputFormatter(row.productPrice) || '-' }}</span>
+    </template>
+    <template #remark="{ row }">
+      <Input v-if="!disabled" v-model:value="row.remark" class="w-full" />
+      <span v-else>{{ row.remark || '-' }}</span>
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        v-if="!disabled"
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该产品吗？',
+              confirm: handleDelete.bind(null, row),
             },
-          ]"
-        />
-      </template>
-
-      <template #bottom>
-        <TableAction
-          v-if="!disabled"
-          class="mt-4 flex justify-center"
-          :actions="[
-            {
-              label: '添加产品',
-              type: 'default',
-              onClick: handleAdd,
-            },
-          ]"
-        />
-      </template>
-    </Grid>
-  </div>
-</template>
-
-<style scoped>
-:deep(.vxe-table .vxe-footer--column.stock-in-footer-cell .vxe-cell) {
-  background-color: #f5f5f5 !important;
-}
-</style>
+          },
+        ]"
+      />
+    </template>
+
+    <template #bottom>
+      <div class="border-border bg-muted mt-2 rounded border p-2">
+        <div class="text-muted-foreground flex justify-between text-sm">
+          <span class="text-foreground font-medium">合计：</span>
+          <div class="flex space-x-4">
+            <span>数量：{{ erpCountInputFormatter(summaries.count) }}</span>
+            <span>
+              金额：{{ erpPriceInputFormatter(summaries.totalPrice) }}
+            </span>
+          </div>
+        </div>
+      </div>
+      <TableAction
+        v-if="!disabled"
+        class="mt-2 flex justify-center"
+        :actions="[
+          {
+            label: '添加盘点产品',
+            type: 'default',
+            onClick: handleAdd,
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+</template>
\ No newline at end of file
diff --git a/apps/web-antd/src/views/erp/stock/in/data.ts b/apps/web-antd/src/views/erp/stock/in/data.ts
index 4048bf68c04a054503004123245a78b341bafa4d..5414474c4921984060cd77e87110f5e52a22a14e 100644
--- a/apps/web-antd/src/views/erp/stock/in/data.ts
+++ b/apps/web-antd/src/views/erp/stock/in/data.ts
@@ -4,33 +4,47 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import { createRequiredValidation } from '#/adapter/vxe-table';
+import { getProductSimpleList } from '#/api/erp/product/product';
 import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
+import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 表单的配置项 */
-export function useFormSchema(): VbenFormSchema[] {
+export function useFormSchema(formType: string): VbenFormSchema[] {
   return [
     {
+      fieldName: 'id',
       component: 'Input',
-      componentProps: {
-        style: { display: 'none' },
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
       },
-      fieldName: 'id',
-      label: 'ID',
-      hideLabel: true,
-      formItemClass: 'hidden',
     },
     {
+      fieldName: 'no',
+      label: '入库单号',
       component: 'Input',
       componentProps: {
         placeholder: '系统自动生成',
         disabled: true,
       },
-      fieldName: 'no',
-      label: '入库单号',
     },
     {
+      fieldName: 'inTime',
+      label: '入库时间',
+      component: 'DatePicker',
+      componentProps: {
+        placeholder: '选择入库时间',
+        showTime: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      label: '供应商',
+      fieldName: 'supplierId',
       component: 'ApiSelect',
       componentProps: {
         placeholder: '请选择供应商',
@@ -42,34 +56,22 @@ export function useFormSchema(): VbenFormSchema[] {
           value: 'id',
         },
       },
-      fieldName: 'supplierId',
-      label: '供应商',
-    },
-    {
-      component: 'DatePicker',
-      componentProps: {
-        placeholder: '选择入库时间',
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-        style: { width: '100%' },
-      },
-      fieldName: 'inTime',
-      label: '入库时间',
       rules: 'required',
     },
     {
+      fieldName: 'remark',
+      label: '备注',
       component: 'Textarea',
       componentProps: {
         placeholder: '请输入备注',
-        autoSize: { minRows: 2, maxRows: 4 },
-        class: 'w-full',
+        autoSize: { minRows: 1, maxRows: 1 },
+        disabled: formType === 'detail',
       },
-      fieldName: 'remark',
-      label: '备注',
-      formItemClass: 'col-span-3',
+      formItemClass: 'col-span-2',
     },
     {
+      fieldName: 'fileUrl',
+      label: '附件',
       component: 'FileUpload',
       componentProps: {
         maxNumber: 1,
@@ -85,25 +87,22 @@ export function useFormSchema(): VbenFormSchema[] {
           'jpeg',
           'png',
         ],
-        showDescription: true,
+        showDescription: formType !== 'detail',
+        disabled: formType === 'detail',
       },
-      fieldName: 'fileUrl',
-      label: '附件',
       formItemClass: 'col-span-3',
     },
     {
-      fieldName: 'product',
-      label: '产品清单',
+      fieldName: 'items',
+      label: '入库产品清单',
       component: 'Input',
       formItemClass: 'col-span-3',
     },
   ];
 }
 
-/** 入库产品清单表格列定义 */
-export function useStockInItemTableColumns(
-  isValidating?: any,
-): VxeTableGridOptions['columns'] {
+/** 表单的明细表格列 */
+export function useFormItemColumns(): VxeTableGridOptions['columns'] {
   return [
     { type: 'seq', title: '序号', minWidth: 50, fixed: 'left' },
     {
@@ -111,19 +110,18 @@ export function useStockInItemTableColumns(
       title: '仓库名称',
       minWidth: 150,
       slots: { default: 'warehouseId' },
-      className: createRequiredValidation(isValidating, 'warehouseId'),
     },
     {
       field: 'productId',
       title: '产品名称',
       minWidth: 200,
       slots: { default: 'productId' },
-      className: createRequiredValidation(isValidating, 'productId'),
     },
     {
       field: 'stockCount',
       title: '库存',
-      minWidth: 100,
+      minWidth: 80,
+      formatter: 'formatAmount3',
     },
     {
       field: 'productBarCode',
@@ -135,31 +133,33 @@ export function useStockInItemTableColumns(
       title: '单位',
       minWidth: 80,
     },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      slots: { default: 'remark' },
+    },
     {
       field: 'count',
       title: '数量',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'count' },
-      className: createRequiredValidation(isValidating, 'count'),
     },
     {
       field: 'productPrice',
       title: '产品单价',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'productPrice' },
     },
     {
       field: 'totalPrice',
       title: '金额',
       minWidth: 120,
+      fixed: 'right',
       formatter: 'formatAmount2',
     },
-    {
-      field: 'remark',
-      title: '备注',
-      minWidth: 150,
-      slots: { default: 'remark' },
-    },
     {
       title: '操作',
       width: 50,
@@ -182,17 +182,18 @@ export function useGridFormSchema(): VbenFormSchema[] {
       },
     },
     {
-      fieldName: 'supplierId',
-      label: '供应商',
+      fieldName: 'productId',
+      label: '产品',
       component: 'ApiSelect',
       componentProps: {
-        placeholder: '请选择供应商',
+        placeholder: '请选择产品',
         allowClear: true,
         showSearch: true,
-        api: getSupplierSimpleList,
-        labelField: 'name',
-        valueField: 'id',
-        filterOption: false,
+        api: getProductSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
       },
     },
     {
@@ -200,29 +201,38 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '入库时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始日期', '结束日期'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
     {
-      fieldName: 'status',
-      label: '状态',
-      component: 'Select',
+      fieldName: 'supplierId',
+      label: '供应商',
+      component: 'ApiSelect',
       componentProps: {
-        placeholder: '请选择状态',
+        placeholder: '请选择供应商',
         allowClear: true,
-        options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
+        showSearch: true,
+        api: getSupplierSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
       },
     },
     {
-      fieldName: 'remark',
-      label: '备注',
-      component: 'Input',
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: 'ApiSelect',
       componentProps: {
-        placeholder: '请输入备注',
+        placeholder: '请选择仓库',
         allowClear: true,
+        showSearch: true,
+        api: getWarehouseSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
       },
     },
     {
@@ -234,9 +244,29 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
         showSearch: true,
         api: getSimpleUserList,
-        labelField: 'nickname',
-        valueField: 'id',
-        filterOption: false,
+        fieldNames: {
+          label: 'nickname',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
+        placeholder: '请选择状态',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入备注',
+        allowClear: true,
       },
     },
   ];
@@ -253,13 +283,14 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'no',
       title: '入库单号',
-      minWidth: 180,
+      width: 200,
+      fixed: 'left',
     },
     {
       field: 'productNames',
       title: '产品信息',
-      minWidth: 200,
       showOverflow: 'tooltip',
+      minWidth: 120,
     },
     {
       field: 'supplierName',
@@ -269,21 +300,30 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'inTime',
       title: '入库时间',
-      minWidth: 180,
-      cellRender: {
-        name: 'CellDateTime',
-      },
+      width: 160,
+      formatter: 'formatDate',
     },
     {
       field: 'creatorName',
       title: '创建人',
-      minWidth: 100,
+      minWidth: 120,
+    },
+    {
+      field: 'totalCount',
+      title: '总数量',
+      formatter: 'formatAmount3',
+      minWidth: 120,
+    },
+    {
+      field: 'totalPrice',
+      title: '总金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
     },
     {
       field: 'status',
       title: '状态',
-      minWidth: 90,
-      fixed: 'right',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
@@ -291,7 +331,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       title: '操作',
-      width: 300,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
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 55891fa957f955cf73939570012d7f1d8848a17e..4d6910f71fa9ee6a708aa40093b46e10d0725969 100644
--- a/apps/web-antd/src/views/erp/stock/in/index.vue
+++ b/apps/web-antd/src/views/erp/stock/in/index.vue
@@ -2,8 +2,10 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ErpStockInApi } from '#/api/erp/stock/in';
 
+import { ref } from 'vue';
+
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
-import { downloadFileFromBlobPart } from '@vben/utils';
+import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
@@ -17,71 +19,81 @@ import {
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import StockInForm from './modules/form.vue';
+import Form from './modules/form.vue';
 
-/** 其它入库单管理 */
+/** ERP 其它入库单列表 */
 defineOptions({ name: 'ErpStockIn' });
 
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: StockInForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 导出入库单 */
+/** 导出表格 */
 async function handleExport() {
   const data = await exportStockIn(await gridApi.formApi.getValues());
   downloadFileFromBlobPart({ fileName: '其它入库单.xls', source: data });
 }
 
-/** 新增/编辑/详情 */
-function openForm(type: string, id?: number) {
-  formModalApi.setData({ type, id }).open();
+/** 新增其它入库单 */
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+/** 编辑其它入库单 */
+function handleEdit(row: ErpStockInApi.StockIn) {
+  formModalApi.setData({ type: 'edit', id: row.id }).open();
 }
 
-/** 删除 */
-async function handleDelete(ids: any[]) {
+/** 删除其它入库单 */
+async function handleDelete(ids: number[]) {
   const hideLoading = message.loading({
-    content: '删除中...',
+    content: $t('ui.actionMessage.deleting'),
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
     await deleteStockIn(ids);
-    message.success({
-      content: '删除成功',
-      key: 'action_process_msg',
-    });
-    onRefresh();
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
-/** 审核/反审核 */
-async function handleUpdateStatus(id: any, status: number) {
-  const statusText = status === 20 ? '审核' : '反审核';
+/** 审批/反审批操作 */
+async function handleUpdateStatus(row: ErpStockInApi.StockIn, status: number) {
   const hideLoading = message.loading({
-    content: `${statusText}中...`,
+    content: `确定${status === 20 ? '审批' : '反审批'}该入库单吗？`,
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
-    await updateStockInStatus({ id, status });
-    message.success({
-      content: `${statusText}成功`,
-      key: 'action_process_msg',
-    });
-    onRefresh();
+    await updateStockInStatus(row.id!, status);
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`);
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
+const checkedIds = ref<number[]>([]);
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ErpStockInApi.StockIn[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+
+/** 查看详情 */
+function handleDetail(row: ErpStockInApi.StockIn) {
+  formModalApi.setData({ type: 'detail', id: row.id }).open();
+}
+
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
@@ -103,15 +115,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
       search: true,
     },
-    checkboxConfig: {
-      reserve: true,
-    },
   } as VxeTableGridOptions<ErpStockInApi.StockIn>,
+  gridEvents: {
+    checkboxAll: handleRowCheckboxChange,
+    checkboxChange: handleRowCheckboxChange,
+  },
 });
 </script>
 
@@ -124,97 +138,85 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
 
+    <FormModal @success="handleRefresh" />
     <Grid table-title="其它入库单列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
             {
-              label: $t('ui.actionTitle.create', ['其它入库']),
+              label: $t('ui.actionTitle.create', ['其它入库单']),
               type: 'primary',
               icon: ACTION_ICON.ADD,
               auth: ['erp:stock-in:create'],
-              onClick: () => openForm('create'),
+              onClick: handleCreate,
             },
             {
               label: $t('ui.actionTitle.export'),
-              type: 'default',
+              type: 'primary',
               icon: ACTION_ICON.DOWNLOAD,
               auth: ['erp:stock-in:export'],
               onClick: handleExport,
             },
             {
               label: '批量删除',
-              type: 'default',
+              type: 'primary',
               danger: true,
+              disabled: isEmpty(checkedIds),
               icon: ACTION_ICON.DELETE,
               auth: ['erp:stock-in:delete'],
               popConfirm: {
-                title: '是否删除所选中数据？',
-                confirm: () => {
-                  const checkboxRecords = gridApi.grid.getCheckboxRecords();
-                  if (checkboxRecords.length === 0) {
-                    message.warning('请选择要删除的数据');
-                    return;
-                  }
-                  handleDelete(checkboxRecords.map((item) => item.id));
-                },
+                title: `是否删除所选中数据？`,
+                confirm: handleDelete.bind(null, checkedIds),
               },
             },
           ]"
         />
       </template>
-
       <template #actions="{ row }">
         <TableAction
           :actions="[
             {
-              label: '详情',
+              label: $t('common.detail'),
+              type: 'link',
               icon: ACTION_ICON.VIEW,
               auth: ['erp:stock-in:query'],
-              onClick: () => openForm('detail', row.id),
+              onClick: handleDetail.bind(null, row),
             },
             {
-              label: '编辑',
-              auth: ['erp:stock-in:update'],
+              label: $t('common.edit'),
+              type: 'link',
               icon: ACTION_ICON.EDIT,
-              disabled: row.status !== 10,
-              onClick: () => openForm('update', row.id),
-            },
-            {
-              label: '审核',
               auth: ['erp:stock-in:update'],
-              ifShow: row.status === 10,
-              popConfirm: {
-                title: '确认要审核该入库单吗？',
-                confirm: () => handleUpdateStatus(row.id, 20),
-              },
+              ifShow: () => row.status !== 20,
+              onClick: handleEdit.bind(null, row),
             },
             {
-              label: '反审核',
-              danger: true,
-              auth: ['erp:stock-in:update'],
-              ifShow: row.status === 20,
+              label: row.status === 10 ? '审批' : '反审批',
+              type: 'link',
+              auth: ['erp:stock-in:update-status'],
               popConfirm: {
-                title: '确认要反审核该入库单吗？',
-                confirm: () => handleUpdateStatus(row.id, 10),
+                title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`,
+                confirm: handleUpdateStatus.bind(
+                  null,
+                  row,
+                  row.status === 10 ? 20 : 10,
+                ),
               },
             },
             {
-              label: '删除',
+              label: $t('common.delete'),
+              type: 'link',
               danger: true,
+              color: 'error',
               auth: ['erp:stock-in:delete'],
-              disabled: row.status !== 10,
               popConfirm: {
-                title: '确认要删除该入库单吗？',
-                confirm: () => handleDelete([row.id]),
+                title: $t('ui.actionMessage.deleteConfirm', [row.no]),
+                confirm: handleDelete.bind(null, [row.id!]),
               },
             },
           ]"
         />
       </template>
     </Grid>
-
-    <!-- 表单弹窗 -->
-    <FormModal @success="onRefresh" />
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/erp/stock/in/modules/form.vue b/apps/web-antd/src/views/erp/stock/in/modules/form.vue
index a18f6c1ce918f224226c71db2733f62fa9fd0896..ee9984ce8e8677446fdbc7a498012e10677d14dc 100644
--- a/apps/web-antd/src/views/erp/stock/in/modules/form.vue
+++ b/apps/web-antd/src/views/erp/stock/in/modules/form.vue
@@ -1,33 +1,32 @@
 <script lang="ts" setup>
 import type { ErpStockInApi } from '#/api/erp/stock/in';
 
-import { computed, nextTick, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
 import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
-import {
-  createStockIn,
-  getStockIn,
-  updateStockIn,
-  updateStockInStatus,
-} from '#/api/erp/stock/in';
+import { createStockIn, getStockIn, updateStockIn } from '#/api/erp/stock/in';
+import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
-import StockInItemForm from './StockInItemForm.vue';
+import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockInApi.StockIn>();
-const formType = ref('');
-const itemFormRef = ref();
-
-const getTitle = computed(() => {
-  if (formType.value === 'create') return '添加其它入库单';
-  if (formType.value === 'update') return '编辑其它入库单';
-  return '其它入库单详情';
-});
+const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const itemFormRef = ref<InstanceType<typeof ItemForm>>();
+
+/* eslint-disable unicorn/no-nested-ternary */
+const getTitle = computed(() =>
+  formType.value === 'create'
+    ? $t('ui.actionTitle.create', ['其它入库单'])
+    : formType.value === 'edit'
+      ? $t('ui.actionTitle.edit', ['其它入库单'])
+      : '其它入库单详情',
+);
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -38,64 +37,39 @@ const [Form, formApi] = useVbenForm({
   },
   wrapperClass: 'grid-cols-3',
   layout: 'vertical',
-  schema: useFormSchema(),
+  schema: useFormSchema(formType.value),
   showDefaultActions: false,
 });
 
+/** 更新入库单项 */
 const handleUpdateItems = (items: ErpStockInApi.StockInItem[]) => {
   formData.value = modalApi.getData<ErpStockInApi.StockIn>();
-  if (formData.value) {
-    formData.value.items = items;
-  }
+  formData.value.items = items;
+  formApi.setValues({
+    items,
+  });
 };
 
-/**
- * 创建或更新其它入库单
- */
+/** 创建或更新其它入库单 */
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
-    await nextTick();
-
     const itemFormInstance = Array.isArray(itemFormRef.value)
       ? itemFormRef.value[0]
       : itemFormRef.value;
-    if (itemFormInstance && typeof itemFormInstance.validate === 'function') {
-      try {
-        const isValid = await itemFormInstance.validate();
-        if (!isValid) {
-          message.error('产品清单验证失败，请检查必填项');
-          return;
-        }
-      } catch (error) {
-        message.error(error.message || '产品清单验证失败');
-        return;
-      }
-    } else {
-      message.error('产品清单验证方法不存在');
-      return;
-    }
-
-    // 验证产品清单不能为空
-    if (!formData.value?.items || formData.value.items.length === 0) {
-      message.error('产品清单不能为空，请至少添加一个产品');
+    try {
+      itemFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
       return;
     }
 
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as ErpStockInApi.StockIn;
-    data.items = formData.value?.items?.map((item) => ({
-      ...item,
-      id: undefined,
-    }));
-    // 将文件数组转换为字符串
-    if (data.fileUrl && Array.isArray(data.fileUrl)) {
-      data.fileUrl = data.fileUrl.length > 0 ? data.fileUrl[0] : '';
-    }
     try {
       await (formType.value === 'create'
         ? createStockIn(data)
@@ -103,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({
       // 关闭并提示
       await modalApi.close();
       emit('success');
-      message.success(formType.value === 'create' ? '新增成功' : '更新成功');
+      message.success($t('ui.actionMessage.operationSuccess'));
     } finally {
       modalApi.unlock();
     }
@@ -115,86 +89,34 @@ const [Modal, modalApi] = useVbenModal({
     }
     // 加载数据
     const data = modalApi.getData<{ id?: number; type: string }>();
-    if (!data) {
-      return;
-    }
     formType.value = data.type;
-
-    if (!data.id) {
-      // 初始化空的表单数据
-      formData.value = { items: [] } as ErpStockInApi.StockIn;
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init([]);
-      }
-      // 如果是新增，自动添加一行
-      if (formType.value === 'create' && itemFormInstance) {
-        itemFormInstance.handleAdd();
-      }
+    formApi.setDisabled(formType.value === 'detail');
+    formApi.updateSchema(useFormSchema(formType.value));
+    if (!data || !data.id) {
       return;
     }
-
     modalApi.lock();
     try {
       formData.value = await getStockIn(data.id);
-      // 将字符串形式的文件URL转换为数组形式以适配FileUpload组件
-      if (
-        formData.value.fileUrl &&
-        typeof formData.value.fileUrl === 'string'
-      ) {
-        formData.value.fileUrl = formData.value.fileUrl
-          ? [formData.value.fileUrl]
-          : [];
-      }
       // 设置到 values
       await formApi.setValues(formData.value);
-      // 初始化子表单
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init(formData.value.items || []);
-      }
     } finally {
       modalApi.unlock();
     }
   },
 });
-
-/** 审核/反审核 */
-async function handleUpdateStatus(id: number, status: number) {
-  try {
-    await updateStockInStatus({ id, status });
-    message.success(status === 20 ? '审核成功' : '反审核成功');
-    emit('success');
-    await modalApi.close();
-  } catch (error) {
-    message.error(error.message || '操作失败');
-  }
-}
-
-defineExpose({ modalApi, handleUpdateStatus });
 </script>
 
 <template>
   <Modal
-    v-bind="$attrs"
     :title="getTitle"
-    class="w-4/5"
-    :closable="true"
-    :mask-closable="true"
+    class="w-3/4"
     :show-confirm-button="formType !== 'detail'"
   >
     <Form class="mx-3">
-      <template #product="slotProps">
-        <StockInItemForm
-          v-bind="slotProps"
+      <template #items>
+        <ItemForm
           ref="itemFormRef"
-          class="w-full"
           :items="formData?.items ?? []"
           :disabled="formType === 'detail'"
           @update:items="handleUpdateItems"
diff --git a/apps/web-antd/src/views/erp/stock/in/modules/StockInItemForm.vue b/apps/web-antd/src/views/erp/stock/in/modules/item-form.vue
similarity index 32%
rename from apps/web-antd/src/views/erp/stock/in/modules/StockInItemForm.vue
rename to apps/web-antd/src/views/erp/stock/in/modules/item-form.vue
index d96e57ea0e893a1806674dca0b40d08c4292a3d0..469c02686cd871308dffdfc3b68cdaa0acd0ec98 100644
--- a/apps/web-antd/src/views/erp/stock/in/modules/StockInItemForm.vue
+++ b/apps/web-antd/src/views/erp/stock/in/modules/item-form.vue
@@ -1,10 +1,14 @@
 <script lang="ts" setup>
-// TODO @nehc：这里的组件名
+import type { ErpProductApi } from '#/api/erp/product/product';
 import type { ErpStockInApi } from '#/api/erp/stock/in';
 
-import { nextTick, onMounted, ref, watch } from 'vue';
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
-import { erpPriceMultiply } from '@vben/utils';
+import {
+  erpCountInputFormatter,
+  erpPriceInputFormatter,
+  erpPriceMultiply,
+} from '@vben/utils';
 
 import { Input, InputNumber, Select } from 'ant-design-vue';
 
@@ -13,7 +17,12 @@ import { getProductSimpleList } from '#/api/erp/product/product';
 import { getStockCount } from '#/api/erp/stock/stock';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 
-import { useStockInItemTableColumns } from '../data';
+import { useFormItemColumns } from '../data';
+
+interface Props {
+  items?: ErpStockInApi.StockInItem[];
+  disabled?: boolean;
+}
 
 const props = withDefaults(defineProps<Props>(), {
   items: () => [],
@@ -22,32 +31,32 @@ const props = withDefaults(defineProps<Props>(), {
 
 const emit = defineEmits(['update:items']);
 
-interface Props {
-  items?: ErpStockInApi.StockInItem[];
-  disabled?: boolean;
-}
+const tableData = ref<ErpStockInApi.StockInItem[]>([]); // 表格数据
+const productOptions = ref<ErpProductApi.Product[]>([]); // 产品下拉选项
+const warehouseOptions = ref<any[]>([]); // 仓库下拉选项
 
-const tableData = ref<ErpStockInApi.StockInItem[]>([]);
-const productOptions = ref<any[]>([]);
-const warehouseOptions = ref<any[]>([]);
-const isValidating = ref(false);
+/** 获取表格合计数据 */
+const summaries = computed(() => {
+  return {
+    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
+    totalPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalPrice || 0),
+      0,
+    ),
+  };
+});
 
 /** 表格配置 */
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    editConfig: {
-      trigger: 'click',
-      mode: 'cell',
-    },
-    columns: useStockInItemTableColumns(isValidating),
+    columns: useFormItemColumns(),
     data: tableData.value,
-    border: true,
-    showOverflow: true,
-    autoResize: true,
     minHeight: 250,
-    keepSource: true,
+    autoResize: true,
+    border: true,
     rowConfig: {
-      keyField: 'id',
+      keyField: 'seq',
+      isHover: true,
     },
     pagerConfig: {
       enabled: false,
@@ -55,26 +64,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
     toolbarConfig: {
       enabled: false,
     },
-    showFooter: true,
-    footerCellClassName: 'stock-in-footer-cell',
-    footerMethod: ({ columns }) => {
-      const footers: any[][] = [];
-      const sums = getSummaries();
-      const footerData: any[] = [];
-      columns.forEach((column, columnIndex) => {
-        if (columnIndex === 0) {
-          footerData.push('合计');
-        } else if (column.field === 'count') {
-          footerData.push(sums.count);
-        } else if (column.field === 'totalPrice') {
-          footerData.push(sums.totalPrice);
-        } else {
-          footerData.push('');
-        }
-      });
-      footers.push(footerData);
-      return footers;
-    },
   },
 });
 
@@ -85,279 +74,224 @@ watch(
     if (!items) {
       return;
     }
-    await nextTick();
+    items.forEach((item) => initRow(item));
     tableData.value = [...items];
-    await nextTick();
-    gridApi.grid.reloadData(tableData.value);
+    await nextTick(); // 特殊：保证 gridApi 已经初始化
+    await gridApi.grid.reloadData(tableData.value);
   },
   {
     immediate: true,
   },
 );
 
-/** 初始化 */
-onMounted(async () => {
-  productOptions.value = await getProductSimpleList();
-  warehouseOptions.value = await getWarehouseSimpleList();
-});
-
+/** 处理新增 */
 function handleAdd() {
   const newRow = {
-    warehouseId: null,
-    productId: null,
-    productName: '',
-    productUnitId: null,
-    productUnitName: '',
-    productBarCode: '',
+    id: undefined,
+    warehouseId: undefined,
+    productId: undefined,
+    productUnitName: undefined, // 产品单位
+    productBarCode: undefined, // 产品条码
+    productPrice: undefined,
+    stockCount: undefined,
     count: 1,
-    productPrice: 0,
-    totalPrice: 0,
-    stockCount: 0,
-    remark: '',
+    totalPrice: undefined,
+    remark: undefined,
   };
   tableData.value.push(newRow);
-  gridApi.grid.insertAt(newRow, -1);
+  // 通知父组件更新
   emit('update:items', [...tableData.value]);
-  // 触发表格重新渲染以更新cellClassName
-  nextTick(() => {
-    gridApi.grid.refreshColumn();
-  });
 }
 
+/** 处理删除 */
 function handleDelete(row: ErpStockInApi.StockInItem) {
-  gridApi.grid.remove(row);
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index !== -1) {
     tableData.value.splice(index, 1);
   }
+  // 通知父组件更新
   emit('update:items', [...tableData.value]);
 }
 
+/** 处理仓库变更 */
 async function handleWarehouseChange(warehouseId: any, row: any) {
   const warehouse = warehouseOptions.value.find((w) => w.id === warehouseId);
   if (!warehouse) {
     return;
   }
-
   row.warehouseId = warehouseId;
 
   // 如果已选择产品，重新获取库存
   if (row.productId) {
-    const stockCount = await getStockCount(row.productId, warehouseId);
-    row.stockCount = stockCount || 0;
+    row.stockCount = (await getStockCount(row.productId, warehouseId)) || 0;
   }
 
-  handleUpdateValue(row);
+  handleRowChange(row);
 }
 
+/** 处理产品变更 */
 async function handleProductChange(productId: any, row: any) {
   const product = productOptions.value.find((p) => p.id === productId);
   if (!product) {
     return;
   }
-
-  // 获取库存数量
-  const stockCount = row.warehouseId
-    ? await getStockCount(productId, row.warehouseId)
-    : await getStockCount(productId);
-
   row.productId = productId;
   row.productUnitId = product.unitId;
   row.productBarCode = product.barCode;
   row.productUnitName = product.unitName;
   row.productName = product.name;
-  row.stockCount = stockCount || 0;
+  row.stockCount = row.warehouseId
+    ? (await getStockCount(productId, row.warehouseId)) || 0
+    : (await getStockCount(productId)) || 0;
   row.productPrice = product.purchasePrice || 0;
   row.count = row.count || 1;
-
-  handlePriceChange(row);
+  handleRowChange(row);
 }
 
-function handlePriceChange(row: any) {
-  if (row.productPrice && row.count) {
-    row.totalPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
-  }
-  handleUpdateValue(row);
-}
-
-function handleUpdateValue(row: any) {
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index === -1) {
     tableData.value.push(row);
   } else {
     tableData.value[index] = row;
   }
   emit('update:items', [...tableData.value]);
-  // 触发表格重新渲染以更新cellClassName
-  nextTick(() => {
-    gridApi.grid.refreshColumn();
-  });
 }
 
-const getSummaries = (): {
-  count: number;
-  totalPrice: number;
-} => {
-  return {
-    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
-    totalPrice: tableData.value.reduce(
-      (sum, item) => sum + (item.totalPrice || 0),
-      0,
-    ),
-  };
+/** 初始化行数据 */
+const initRow = (row: ErpStockInApi.StockInItem): void => {
+  if (row.productPrice && row.count) {
+    row.totalPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+  }
 };
 
-/** 验证表单 */
-function validate(): Promise<boolean> {
-  return new Promise((resolve) => {
-    isValidating.value = true;
-
-    // 触发表格重新渲染以显示验证错误
-    nextTick(() => {
-      gridApi.grid.refreshColumn();
-    });
-
-    // 验证是否有产品清单
-    if (!tableData.value || tableData.value.length === 0) {
-      resolve(false);
-      return;
-    }
-
-    // 验证每一行的必填字段
-    for (const item of tableData.value) {
-      if (
-        !item.warehouseId ||
-        !item.productId ||
-        !item.count ||
-        item.count <= 0
-      ) {
-        resolve(false);
-        return;
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (item) {
+      if (!item.warehouseId) {
+        throw new Error(`第 ${i + 1} 行：仓库不能为空`);
+      }
+      if (!item.productId) {
+        throw new Error(`第 ${i + 1} 行：产品不能为空`);
+      }
+      if (!item.count || item.count <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
+      }
+      if (!item.productPrice || item.productPrice <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品单价不能为空`);
       }
     }
-
-    // 验证通过，清除验证状态
-    isValidating.value = false;
-    nextTick(() => {
-      gridApi.grid.refreshColumn();
-    });
-
-    resolve(true);
-  });
-}
-
-/** 初始化表格数据 */
-function init(items: ErpStockInApi.StockInItem[]) {
-  tableData.value = items || [];
-  gridApi.grid.reloadData(tableData.value);
+  }
 }
 
 defineExpose({
   validate,
-  init,
-  handleAdd,
+});
+
+/** 初始化 */
+onMounted(async () => {
+  productOptions.value = await getProductSimpleList();
+  warehouseOptions.value = await getWarehouseSimpleList();
+  // 目的：新增时，默认添加一行
+  if (tableData.value.length === 0) {
+    handleAdd();
+  }
 });
 </script>
 
 <template>
-  <div class="w-full">
-    <div class="mb-4 flex justify-between">
-      <span class="text-lg font-medium"></span>
-    </div>
-
-    <Grid>
-      <template #warehouseId="{ row }">
-        <Select
-          v-model:value="row.warehouseId"
-          :options="warehouseOptions"
-          :field-names="{ label: 'name', value: 'id' }"
-          placeholder="请选择仓库"
-          :disabled="disabled"
-          show-search
-          @change="(value) => handleWarehouseChange(value, row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #productId="{ row }">
-        <Select
-          v-model:value="row.productId"
-          :options="productOptions"
-          :field-names="{ label: 'name', value: 'id' }"
-          placeholder="请选择产品"
-          :disabled="disabled"
-          show-search
-          @change="(value) => handleProductChange(value, row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #count="{ row }">
-        <InputNumber
-          v-model:value="row.count"
-          :disabled="disabled"
-          :min="0.001"
-          :precision="3"
-          @change="() => handlePriceChange(row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #productPrice="{ row }">
-        <InputNumber
-          v-model:value="row.productPrice"
-          :disabled="disabled"
-          :min="0.01"
-          :precision="2"
-          @change="() => handlePriceChange(row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #remark="{ row }">
-        <Input
-          v-model:value="row.remark"
-          :disabled="disabled"
-          placeholder="请输入备注"
-        />
-      </template>
-
-      <template #actions="{ row }">
-        <TableAction
-          v-if="!disabled"
-          :actions="[
-            {
-              label: '删除',
-              type: 'link',
-              danger: true,
-              popConfirm: {
-                title: '确认删除该产品吗？',
-                confirm: handleDelete.bind(null, row),
-              },
+  <Grid class="w-full">
+    <template #warehouseId="{ row }">
+      <Select
+        v-model:value="row.warehouseId"
+        :options="warehouseOptions"
+        :field-names="{ label: 'name', value: 'id' }"
+        class="w-full"
+        placeholder="请选择仓库"
+        show-search
+        :disabled="disabled"
+        @change="handleWarehouseChange($event, row)"
+      />
+    </template>
+    <template #productId="{ row }">
+      <Select
+        v-model:value="row.productId"
+        :options="productOptions"
+        :field-names="{ label: 'name', value: 'id' }"
+        class="w-full"
+        placeholder="请选择产品"
+        show-search
+        :disabled="disabled"
+        @change="handleProductChange($event, row)"
+      />
+    </template>
+    <template #count="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.count"
+        :min="0"
+        :precision="3"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ erpCountInputFormatter(row.count) || '-' }}</span>
+    </template>
+    <template #productPrice="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.productPrice"
+        :min="0"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ erpPriceInputFormatter(row.productPrice) || '-' }}</span>
+    </template>
+    <template #remark="{ row }">
+      <Input v-if="!disabled" v-model:value="row.remark" class="w-full" />
+      <span v-else>{{ row.remark || '-' }}</span>
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        v-if="!disabled"
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该产品吗？',
+              confirm: handleDelete.bind(null, row),
             },
-          ]"
-        />
-      </template>
-
-      <template #bottom>
-        <TableAction
-          v-if="!disabled"
-          class="mt-4 flex justify-center"
-          :actions="[
-            {
-              label: '添加产品',
-              type: 'default',
-              onClick: handleAdd,
-            },
-          ]"
-        />
-      </template>
-    </Grid>
-  </div>
+          },
+        ]"
+      />
+    </template>
+
+    <template #bottom>
+      <div class="border-border bg-muted mt-2 rounded border p-2">
+        <div class="text-muted-foreground flex justify-between text-sm">
+          <span class="text-foreground font-medium">合计：</span>
+          <div class="flex space-x-4">
+            <span>数量：{{ erpCountInputFormatter(summaries.count) }}</span>
+            <span>
+              金额：{{ erpPriceInputFormatter(summaries.totalPrice) }}
+            </span>
+          </div>
+        </div>
+      </div>
+      <TableAction
+        v-if="!disabled"
+        class="mt-2 flex justify-center"
+        :actions="[
+          {
+            label: '添加入库产品',
+            type: 'default',
+            onClick: handleAdd,
+          },
+        ]"
+      />
+    </template>
+  </Grid>
 </template>
-
-<style scoped>
-:deep(.vxe-table .vxe-footer--column.stock-in-footer-cell .vxe-cell) {
-  background-color: #f5f5f5 !important;
-}
-</style>
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 edd802b8b010203eac13e2f0218ae372b4f928e5..dc1321e8f1f49cfd1e2d2251ae0965bf61958eab 100644
--- a/apps/web-antd/src/views/erp/stock/move/data.ts
+++ b/apps/web-antd/src/views/erp/stock/move/data.ts
@@ -4,63 +4,58 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import { createRequiredValidation } from '#/adapter/vxe-table';
 import { getProductSimpleList } from '#/api/erp/product/product';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 表单的配置项 */
 export function useFormSchema(formType: string): VbenFormSchema[] {
   return [
     {
+      fieldName: 'id',
       component: 'Input',
-      componentProps: {
-        style: { display: 'none' },
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
       },
-      fieldName: 'id',
-      label: 'ID',
-      hideLabel: true,
-      formItemClass: 'hidden',
     },
     {
+      fieldName: 'no',
+      label: '调度单号',
       component: 'Input',
       componentProps: {
         placeholder: '系统自动生成',
         disabled: true,
       },
-      fieldName: 'no',
-      label: '调度单号',
-      disabled: formType === 'detail',
     },
     {
+      fieldName: 'moveTime',
+      label: '调度时间',
       component: 'DatePicker',
       componentProps: {
         placeholder: '选择调度时间',
         showTime: true,
         format: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
-        style: { width: '100%' },
       },
-      disabled: formType === 'detail',
-      fieldName: 'moveTime',
-      label: '调度时间',
       rules: 'required',
     },
     {
+      fieldName: 'remark',
+      label: '备注',
       component: 'Textarea',
       componentProps: {
         placeholder: '请输入备注',
-        autoSize: { minRows: 2, maxRows: 4 },
-        class: 'w-full',
+        autoSize: { minRows: 1, maxRows: 1 },
+        disabled: formType === 'detail',
       },
-      disabled: formType === 'detail',
-      fieldName: 'remark',
-      label: '备注',
-      formItemClass: 'col-span-3',
+      formItemClass: 'col-span-2',
     },
     {
+      fieldName: 'fileUrl',
+      label: '附件',
       component: 'FileUpload',
-      disabled: formType === 'detail',
       componentProps: {
         maxNumber: 1,
         maxSize: 10,
@@ -75,15 +70,13 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
           'jpeg',
           'png',
         ],
-        showDescription: true,
+        showDescription: formType !== 'detail',
+        disabled: formType === 'detail',
       },
-      fieldName: 'fileUrl',
-      label: '附件',
       formItemClass: 'col-span-3',
     },
     {
-      fieldName: 'product',
-      disabled: formType === 'detail',
+      fieldName: 'items',
       label: '产品清单',
       component: 'Input',
       formItemClass: 'col-span-3',
@@ -91,10 +84,8 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
   ];
 }
 
-/** 调度产品清单表格列定义 */
-export function useStockMoveItemTableColumns(
-  isValidating?: any,
-): VxeTableGridOptions['columns'] {
+/** 表单的明细表格列 */
+export function useFormItemColumns(): VxeTableGridOptions['columns'] {
   return [
     { type: 'seq', title: '序号', minWidth: 50, fixed: 'left' },
     {
@@ -102,26 +93,24 @@ export function useStockMoveItemTableColumns(
       title: '调出仓库',
       minWidth: 150,
       slots: { default: 'fromWarehouseId' },
-      className: createRequiredValidation(isValidating, 'fromWarehouseId'),
     },
     {
       field: 'toWarehouseId',
       title: '调入仓库',
       minWidth: 150,
       slots: { default: 'toWarehouseId' },
-      className: createRequiredValidation(isValidating, 'toWarehouseId'),
     },
     {
       field: 'productId',
       title: '产品名称',
       minWidth: 200,
       slots: { default: 'productId' },
-      className: createRequiredValidation(isValidating, 'productId'),
     },
     {
       field: 'stockCount',
       title: '库存',
-      minWidth: 100,
+      minWidth: 80,
+      formatter: 'formatAmount3',
     },
     {
       field: 'productBarCode',
@@ -133,31 +122,33 @@ export function useStockMoveItemTableColumns(
       title: '单位',
       minWidth: 80,
     },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      slots: { default: 'remark' },
+    },
     {
       field: 'count',
       title: '数量',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'count' },
-      className: createRequiredValidation(isValidating, 'count'),
     },
     {
       field: 'productPrice',
       title: '产品单价',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'productPrice' },
     },
     {
       field: 'totalPrice',
       title: '金额',
       minWidth: 120,
+      fixed: 'right',
       formatter: 'formatAmount2',
     },
-    {
-      field: 'remark',
-      title: '备注',
-      minWidth: 150,
-      slots: { default: 'remark' },
-    },
     {
       title: '操作',
       width: 50,
@@ -188,9 +179,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
         showSearch: true,
         api: getProductSimpleList,
-        labelField: 'name',
-        valueField: 'id',
-        filterOption: false,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
       },
     },
     {
@@ -198,10 +190,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '调度时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始日期', '结束日期'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
     {
@@ -213,9 +203,40 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
         showSearch: true,
         api: getWarehouseSimpleList,
-        labelField: 'name',
-        valueField: 'id',
-        filterOption: false,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'toWarehouseId',
+      label: '调入仓库',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择调入仓库',
+        allowClear: true,
+        showSearch: true,
+        api: getWarehouseSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'creator',
+      label: '创建人',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择创建人',
+        allowClear: true,
+        showSearch: true,
+        api: getSimpleUserList,
+        fieldNames: {
+          label: 'nickname',
+          value: 'id',
+        },
       },
     },
     {
@@ -223,9 +244,9 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '状态',
       component: 'Select',
       componentProps: {
+        options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
         placeholder: '请选择状态',
         allowClear: true,
-        options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
       },
     },
     {
@@ -237,20 +258,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
       },
     },
-    {
-      fieldName: 'creator',
-      label: '创建人',
-      component: 'ApiSelect',
-      componentProps: {
-        placeholder: '请选择创建人',
-        allowClear: true,
-        showSearch: true,
-        api: getSimpleUserList,
-        labelField: 'nickname',
-        valueField: 'id',
-        filterOption: false,
-      },
-    },
   ];
 }
 
@@ -265,40 +272,42 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'no',
       title: '调度单号',
-      minWidth: 180,
+      width: 200,
+      fixed: 'left',
     },
     {
       field: 'productNames',
       title: '产品信息',
-      minWidth: 200,
       showOverflow: 'tooltip',
+      minWidth: 120,
     },
     {
       field: 'moveTime',
       title: '调度时间',
-      minWidth: 180,
+      width: 160,
       formatter: 'formatDate',
     },
     {
       field: 'creatorName',
       title: '创建人',
-      minWidth: 100,
+      minWidth: 120,
     },
     {
       field: 'totalCount',
-      title: '数量',
-      minWidth: 100,
+      title: '总数量',
+      formatter: 'formatAmount3',
+      minWidth: 120,
     },
     {
       field: 'totalPrice',
-      title: '金额',
-      minWidth: 100,
+      title: '总金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
     },
     {
       field: 'status',
       title: '状态',
-      minWidth: 90,
-      fixed: 'right',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
@@ -306,7 +315,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       title: '操作',
-      width: 300,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
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 8a61ecfaf7d5409f1d007c586418a55da38c0b46..ad3214ac8c57a26a3645a9a46c96db1f45874407 100644
--- a/apps/web-antd/src/views/erp/stock/move/index.vue
+++ b/apps/web-antd/src/views/erp/stock/move/index.vue
@@ -2,8 +2,10 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ErpStockMoveApi } from '#/api/erp/stock/move';
 
+import { ref } from 'vue';
+
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
-import { downloadFileFromBlobPart } from '@vben/utils';
+import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
@@ -17,71 +19,84 @@ import {
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import StockInForm from './modules/form.vue';
+import Form from './modules/form.vue';
 
-/** 库存调拨单管理 */
+/** ERP 库存调拨单列表 */
 defineOptions({ name: 'ErpStockMove' });
 
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: StockInForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 导出库存调拨单 */
+/** 导出表格 */
 async function handleExport() {
   const data = await exportStockMove(await gridApi.formApi.getValues());
   downloadFileFromBlobPart({ fileName: '库存调拨单.xls', source: data });
 }
 
-/** 新增/编辑/详情 */
-function openForm(type: string, id?: number) {
-  formModalApi.setData({ type, id }).open();
+/** 新增库存调拨单 */
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+/** 编辑库存调拨单 */
+function handleEdit(row: ErpStockMoveApi.StockMove) {
+  formModalApi.setData({ type: 'edit', id: row.id }).open();
 }
 
-/** 删除 */
-async function handleDelete(ids: any[]) {
+/** 删除库存调拨单 */
+async function handleDelete(ids: number[]) {
   const hideLoading = message.loading({
-    content: '删除中...',
+    content: $t('ui.actionMessage.deleting'),
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
     await deleteStockMove(ids);
-    message.success({
-      content: '删除成功',
-      key: 'action_process_msg',
-    });
-    onRefresh();
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
-/** 审核/反审核 */
-async function handleUpdateStatus(id: any, status: number) {
-  const statusText = status === 20 ? '审核' : '反审核';
+/** 审批/反审批操作 */
+async function handleUpdateStatus(
+  row: ErpStockMoveApi.StockMove,
+  status: number,
+) {
   const hideLoading = message.loading({
-    content: `${statusText}中...`,
+    content: `确定${status === 20 ? '审批' : '反审批'}该调拨单吗？`,
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
-    await updateStockMoveStatus({ id, status });
-    message.success({
-      content: `${statusText}成功`,
-      key: 'action_process_msg',
-    });
-    onRefresh();
+    await updateStockMoveStatus(row.id!, status);
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`);
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
+const checkedIds = ref<number[]>([]);
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ErpStockMoveApi.StockMove[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+
+/** 查看详情 */
+function handleDetail(row: ErpStockMoveApi.StockMove) {
+  formModalApi.setData({ type: 'detail', id: row.id }).open();
+}
+
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
@@ -103,15 +118,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
       search: true,
     },
-    checkboxConfig: {
-      reserve: true,
-    },
   } as VxeTableGridOptions<ErpStockMoveApi.StockMove>,
+  gridEvents: {
+    checkboxAll: handleRowCheckboxChange,
+    checkboxChange: handleRowCheckboxChange,
+  },
 });
 </script>
 
@@ -123,97 +140,86 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/erp/stock-move-check/"
       />
     </template>
+
+    <FormModal @success="handleRefresh" />
     <Grid table-title="库存调拨单列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
             {
-              label: $t('ui.actionTitle.create', ['库存调拨']),
+              label: $t('ui.actionTitle.create', ['库存调拨单']),
               type: 'primary',
               icon: ACTION_ICON.ADD,
               auth: ['erp:stock-move:create'],
-              onClick: () => openForm('create'),
+              onClick: handleCreate,
             },
             {
               label: $t('ui.actionTitle.export'),
-              type: 'default',
+              type: 'primary',
               icon: ACTION_ICON.DOWNLOAD,
               auth: ['erp:stock-move:export'],
               onClick: handleExport,
             },
             {
               label: '批量删除',
-              type: 'default',
+              type: 'primary',
               danger: true,
+              disabled: isEmpty(checkedIds),
               icon: ACTION_ICON.DELETE,
               auth: ['erp:stock-move:delete'],
               popConfirm: {
-                title: '是否删除所选中数据？',
-                confirm: () => {
-                  const checkboxRecords = gridApi.grid.getCheckboxRecords();
-                  if (checkboxRecords.length === 0) {
-                    message.warning('请选择要删除的数据');
-                    return;
-                  }
-                  handleDelete(checkboxRecords.map((item) => item.id));
-                },
+                title: `是否删除所选中数据？`,
+                confirm: handleDelete.bind(null, checkedIds),
               },
             },
           ]"
         />
       </template>
-
       <template #actions="{ row }">
         <TableAction
           :actions="[
             {
-              label: '详情',
+              label: $t('common.detail'),
+              type: 'link',
               icon: ACTION_ICON.VIEW,
               auth: ['erp:stock-move:query'],
-              onClick: () => openForm('detail', row.id),
+              onClick: handleDetail.bind(null, row),
             },
             {
-              label: '编辑',
-              auth: ['erp:stock-move:update'],
+              label: $t('common.edit'),
+              type: 'link',
               icon: ACTION_ICON.EDIT,
-              disabled: row.status !== 10,
-              onClick: () => openForm('update', row.id),
-            },
-            {
-              label: '审核',
               auth: ['erp:stock-move:update'],
-              ifShow: row.status === 10,
-              popConfirm: {
-                title: '确认要审核该调度单吗？',
-                confirm: () => handleUpdateStatus(row.id, 20),
-              },
+              ifShow: () => row.status !== 20,
+              onClick: handleEdit.bind(null, row),
             },
             {
-              label: '反审核',
-              danger: true,
-              auth: ['erp:stock-move:update'],
-              ifShow: row.status === 20,
+              label: row.status === 10 ? '审批' : '反审批',
+              type: 'link',
+              auth: ['erp:stock-move:update-status'],
               popConfirm: {
-                title: '确认要反审核该调度单吗？',
-                confirm: () => handleUpdateStatus(row.id, 10),
+                title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`,
+                confirm: handleUpdateStatus.bind(
+                  null,
+                  row,
+                  row.status === 10 ? 20 : 10,
+                ),
               },
             },
             {
-              label: '删除',
+              label: $t('common.delete'),
+              type: 'link',
               danger: true,
+              color: 'error',
               auth: ['erp:stock-move:delete'],
-              disabled: row.status !== 10,
               popConfirm: {
-                title: '确认要删除该调度单吗？',
-                confirm: () => handleDelete([row.id]),
+                title: $t('ui.actionMessage.deleteConfirm', [row.no]),
+                confirm: handleDelete.bind(null, [row.id!]),
               },
             },
           ]"
         />
       </template>
     </Grid>
-
-    <!-- 表单弹窗 -->
-    <FormModal @success="onRefresh" />
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/erp/stock/move/modules/form.vue b/apps/web-antd/src/views/erp/stock/move/modules/form.vue
index 35b51a9694c4bdc27714960883201366ae46ccdb..ba04b7533c5512ac90ed107d55be9611b46f437b 100644
--- a/apps/web-antd/src/views/erp/stock/move/modules/form.vue
+++ b/apps/web-antd/src/views/erp/stock/move/modules/form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { ErpStockMoveApi } from '#/api/erp/stock/move';
 
-import { computed, nextTick, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
@@ -12,22 +12,25 @@ import {
   createStockMove,
   getStockMove,
   updateStockMove,
-  updateStockMoveStatus,
 } from '#/api/erp/stock/move';
+import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
-import StockMoveItemForm from './stock-move-item-form.vue';
+import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockMoveApi.StockMove>();
-const formType = ref('');
-const itemFormRef = ref();
-
-const getTitle = computed(() => {
-  if (formType.value === 'create') return '添加库存调拨单';
-  if (formType.value === 'update') return '编辑库存调拨单';
-  return '库存调拨单详情';
-});
+const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const itemFormRef = ref<InstanceType<typeof ItemForm>>();
+
+/* eslint-disable unicorn/no-nested-ternary */
+const getTitle = computed(() =>
+  formType.value === 'create'
+    ? $t('ui.actionTitle.create', ['库存调拨单'])
+    : formType.value === 'edit'
+      ? $t('ui.actionTitle.edit', ['库存调拨单'])
+      : '库存调拨单详情',
+);
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -42,60 +45,35 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
+/** 更新调拨单项 */
 const handleUpdateItems = (items: ErpStockMoveApi.StockMoveItem[]) => {
   formData.value = modalApi.getData<ErpStockMoveApi.StockMove>();
-  if (formData.value) {
-    formData.value.items = items;
-  }
+  formData.value.items = items;
+  formApi.setValues({
+    items,
+  });
 };
 
-/**
- * 创建或更新其它出库单
- */
+/** 创建或更新库存调拨单 */
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
-    await nextTick();
-
     const itemFormInstance = Array.isArray(itemFormRef.value)
       ? itemFormRef.value[0]
       : itemFormRef.value;
-    if (itemFormInstance && typeof itemFormInstance.validate === 'function') {
-      try {
-        const isValid = await itemFormInstance.validate();
-        if (!isValid) {
-          message.error('产品清单验证失败，请检查必填项');
-          return;
-        }
-      } catch (error: any) {
-        message.error(error.message || '产品清单验证失败');
-        return;
-      }
-    } else {
-      message.error('产品清单验证方法不存在');
-      return;
-    }
-
-    // 验证产品清单不能为空
-    if (!formData.value?.items || formData.value.items.length === 0) {
-      message.error('产品清单不能为空，请至少添加一个产品');
+    try {
+      itemFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
       return;
     }
 
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as ErpStockMoveApi.StockMove;
-    data.items = formData.value?.items?.map((item) => ({
-      ...item,
-      id: undefined,
-    }));
-    // 将文件数组转换为字符串
-    if (data.fileUrl && Array.isArray(data.fileUrl)) {
-      data.fileUrl = data.fileUrl.length > 0 ? data.fileUrl[0] : '';
-    }
     try {
       await (formType.value === 'create'
         ? createStockMove(data)
@@ -103,7 +81,7 @@ const [Modal, modalApi] = useVbenModal({
       // 关闭并提示
       await modalApi.close();
       emit('success');
-      message.success(formType.value === 'create' ? '新增成功' : '更新成功');
+      message.success($t('ui.actionMessage.operationSuccess'));
     } finally {
       modalApi.unlock();
     }
@@ -115,77 +93,34 @@ const [Modal, modalApi] = useVbenModal({
     }
     // 加载数据
     const data = modalApi.getData<{ id?: number; type: string }>();
-    if (!data) {
-      return;
-    }
     formType.value = data.type;
+    formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
-    if (!data.id) {
-      // 初始化空的表单数据
-      formData.value = { items: [] } as unknown as ErpStockMoveApi.StockMove;
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init([]);
-      }
-      // 如果是新增，自动添加一行
-      if (formType.value === 'create' && itemFormInstance) {
-        itemFormInstance.handleAdd();
-      }
+    if (!data || !data.id) {
       return;
     }
-
     modalApi.lock();
     try {
       formData.value = await getStockMove(data.id);
       // 设置到 values
       await formApi.setValues(formData.value);
-      // 初始化子表单
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init(formData.value.items || []);
-      }
     } finally {
       modalApi.unlock();
     }
   },
 });
-
-/** 审核/反审核 */
-async function handleUpdateStatus(id: number, status: number) {
-  try {
-    await updateStockMoveStatus({ id, status });
-    message.success(status === 20 ? '审核成功' : '反审核成功');
-    emit('success');
-    await modalApi.close();
-  } catch (error: any) {
-    message.error(error.message || '操作失败');
-  }
-}
-
-defineExpose({ modalApi, handleUpdateStatus });
 </script>
 
 <template>
   <Modal
-    v-bind="$attrs"
     :title="getTitle"
-    class="w-4/5"
-    :closable="true"
-    :mask-closable="true"
+    class="w-3/4"
     :show-confirm-button="formType !== 'detail'"
   >
     <Form class="mx-3">
-      <template #product="slotProps">
-        <StockMoveItemForm
-          v-bind="slotProps"
+      <template #items>
+        <ItemForm
           ref="itemFormRef"
-          class="w-full"
           :items="formData?.items ?? []"
           :disabled="formType === 'detail'"
           @update:items="handleUpdateItems"
diff --git a/apps/web-antd/src/views/erp/stock/move/modules/stock-move-item-form.vue b/apps/web-antd/src/views/erp/stock/move/modules/item-form.vue
similarity index 30%
rename from apps/web-antd/src/views/erp/stock/move/modules/stock-move-item-form.vue
rename to apps/web-antd/src/views/erp/stock/move/modules/item-form.vue
index 6f0c2dd45fc412c09d6f0844bf28af70b59ef75c..5a3b45626f90ed4296042b0d445b9394c7929d57 100644
--- a/apps/web-antd/src/views/erp/stock/move/modules/stock-move-item-form.vue
+++ b/apps/web-antd/src/views/erp/stock/move/modules/item-form.vue
@@ -1,10 +1,14 @@
 <script lang="ts" setup>
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ErpProductApi } from '#/api/erp/product/product';
 import type { ErpStockMoveApi } from '#/api/erp/stock/move';
 
-import { nextTick, onMounted, ref, watch } from 'vue';
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
-import { erpPriceMultiply } from '@vben/utils';
+import {
+  erpCountInputFormatter,
+  erpPriceInputFormatter,
+  erpPriceMultiply,
+} from '@vben/utils';
 
 import { Input, InputNumber, Select } from 'ant-design-vue';
 
@@ -13,7 +17,12 @@ import { getProductSimpleList } from '#/api/erp/product/product';
 import { getStockCount } from '#/api/erp/stock/stock';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 
-import { useStockMoveItemTableColumns } from '../data';
+import { useFormItemColumns } from '../data';
+
+interface Props {
+  items?: ErpStockMoveApi.StockMoveItem[];
+  disabled?: boolean;
+}
 
 const props = withDefaults(defineProps<Props>(), {
   items: () => [],
@@ -22,32 +31,32 @@ const props = withDefaults(defineProps<Props>(), {
 
 const emit = defineEmits(['update:items']);
 
-interface Props {
-  items?: ErpStockMoveApi.StockMoveItem[];
-  disabled?: boolean;
-}
+const tableData = ref<ErpStockMoveApi.StockMoveItem[]>([]); // 表格数据
+const productOptions = ref<ErpProductApi.Product[]>([]); // 产品下拉选项
+const warehouseOptions = ref<any[]>([]); // 仓库下拉选项
 
-const tableData = ref<ErpStockMoveApi.StockMoveItem[]>([]);
-const productOptions = ref<any[]>([]);
-const warehouseOptions = ref<any[]>([]);
-const isValidating = ref(false);
+/** 获取表格合计数据 */
+const summaries = computed(() => {
+  return {
+    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
+    totalPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalPrice || 0),
+      0,
+    ),
+  };
+});
 
 /** 表格配置 */
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    editConfig: {
-      trigger: 'click',
-      mode: 'cell',
-    },
-    columns: useStockMoveItemTableColumns(isValidating),
+    columns: useFormItemColumns(),
     data: tableData.value,
-    border: true,
-    showOverflow: true,
-    autoResize: true,
     minHeight: 250,
-    keepSource: true,
+    autoResize: true,
+    border: true,
     rowConfig: {
-      keyField: 'id',
+      keyField: 'seq',
+      isHover: true,
     },
     pagerConfig: {
       enabled: false,
@@ -55,30 +64,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
     toolbarConfig: {
       enabled: false,
     },
-    showFooter: true,
-    footerCellClassName: 'stock-in-footer-cell',
-    footerMethod: ({
-      columns,
-    }: {
-      columns: VxeTableGridOptions['columns'];
-    }) => {
-      const footers: any[][] = [];
-      const sums = getSummaries();
-      const footerData: any[] = [];
-      columns!.forEach((column, columnIndex: number) => {
-        if (columnIndex === 0) {
-          footerData.push('合计');
-        } else if (column.field === 'count') {
-          footerData.push(sums.count);
-        } else if (column.field === 'totalPrice') {
-          footerData.push(sums.totalPrice);
-        } else {
-          footerData.push('');
-        }
-      });
-      footers.push(footerData);
-      return footers;
-    },
   },
 });
 
@@ -89,9 +74,9 @@ watch(
     if (!items) {
       return;
     }
-    await nextTick();
+    items.forEach((item) => initRow(item));
     tableData.value = [...items];
-    await nextTick();
+    await nextTick(); // 特殊：保证 gridApi 已经初始化
     await gridApi.grid.reloadData(tableData.value);
   },
   {
@@ -99,284 +84,235 @@ watch(
   },
 );
 
-/** 初始化 */
-onMounted(async () => {
-  productOptions.value = await getProductSimpleList();
-  warehouseOptions.value = await getWarehouseSimpleList();
-});
-
+/** 处理新增 */
 function handleAdd() {
   const newRow = {
+    id: undefined,
     fromWarehouseId: undefined,
     toWarehouseId: undefined,
     productId: undefined,
-    productName: '',
-    productUnitId: undefined,
-    productUnitName: '',
-    productBarCode: '',
+    productUnitName: undefined, // 产品单位
+    productBarCode: undefined, // 产品条码
+    productPrice: undefined,
+    stockCount: undefined,
     count: 1,
-    productPrice: 0,
-    totalPrice: 0,
-    stockCount: 0,
-    remark: '',
+    totalPrice: undefined,
+    remark: undefined,
   };
   tableData.value.push(newRow);
-  gridApi.grid.insertAt(newRow, -1);
+  // 通知父组件更新
   emit('update:items', [...tableData.value]);
-  // 触发表格重新渲染以更新cellClassName
-  nextTick(() => {
-    gridApi.grid.refreshColumn();
-  });
 }
 
+/** 处理删除 */
 function handleDelete(row: ErpStockMoveApi.StockMoveItem) {
-  gridApi.grid.remove(row);
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index !== -1) {
     tableData.value.splice(index, 1);
   }
+  // 通知父组件更新
   emit('update:items', [...tableData.value]);
 }
 
-async function handleWarehouseChange(warehouseId: any, row: any) {
+/** 处理调出仓库变更 */
+async function handleFromWarehouseChange(warehouseId: any, row: any) {
   const warehouse = warehouseOptions.value.find((w) => w.id === warehouseId);
   if (!warehouse) {
     return;
   }
-
-  row.warehouseId = warehouseId;
-
+  row.fromWarehouseId = warehouseId;
   // 如果已选择产品，重新获取库存
   if (row.productId) {
-    const stockCount = await getStockCount(row.productId, warehouseId);
-    row.stockCount = stockCount || 0;
+    row.stockCount = (await getStockCount(row.productId, warehouseId)) || 0;
   }
+  handleRowChange(row);
+}
 
-  handleUpdateValue(row);
+/** 处理调入仓库变更 */
+async function handleToWarehouseChange(warehouseId: any, row: any) {
+  const warehouse = warehouseOptions.value.find((w) => w.id === warehouseId);
+  if (!warehouse) {
+    return;
+  }
+  row.toWarehouseId = warehouseId;
+  handleRowChange(row);
 }
 
+/** 处理产品变更 */
 async function handleProductChange(productId: any, row: any) {
   const product = productOptions.value.find((p) => p.id === productId);
   if (!product) {
     return;
   }
-
-  // 获取库存数量
-  const stockCount = row.warehouseId
-    ? await getStockCount(productId, row.warehouseId)
-    : await getStockCount(productId);
-
   row.productId = productId;
   row.productUnitId = product.unitId;
   row.productBarCode = product.barCode;
   row.productUnitName = product.unitName;
   row.productName = product.name;
-  row.stockCount = stockCount || 0;
+  row.stockCount = row.fromWarehouseId
+    ? (await getStockCount(productId, row.fromWarehouseId)) || 0
+    : (await getStockCount(productId)) || 0;
   row.productPrice = product.purchasePrice || 0;
   row.count = row.count || 1;
-
-  handlePriceChange(row);
+  handleRowChange(row);
 }
 
-function handlePriceChange(row: any) {
-  if (row.productPrice && row.count) {
-    row.totalPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
-  }
-  handleUpdateValue(row);
-}
-
-function handleUpdateValue(row: any) {
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index === -1) {
     tableData.value.push(row);
   } else {
     tableData.value[index] = row;
   }
   emit('update:items', [...tableData.value]);
-  // 触发表格重新渲染以更新cellClassName
-  nextTick(() => {
-    gridApi.grid.refreshColumn();
-  });
 }
 
-const getSummaries = (): {
-  count: number;
-  totalPrice: number;
-} => {
-  return {
-    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
-    totalPrice: tableData.value.reduce(
-      (sum, item) => sum + (item.totalPrice || 0),
-      0,
-    ),
-  };
+/** 初始化行数据 */
+const initRow = (row: ErpStockMoveApi.StockMoveItem): void => {
+  if (row.productPrice && row.count) {
+    row.totalPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+  }
 };
 
-/** 验证表单 */
-function validate(): Promise<boolean> {
-  return new Promise((resolve) => {
-    isValidating.value = true;
-
-    // 触发表格重新渲染以显示验证错误
-    nextTick(() => {
-      gridApi.grid.refreshColumn();
-    });
-
-    // 验证是否有产品清单
-    if (!tableData.value || tableData.value.length === 0) {
-      resolve(false);
-      return;
-    }
-
-    // 验证每一行的必填字段
-    for (const item of tableData.value) {
-      if (
-        !item.fromWarehouseId ||
-        !item.toWarehouseId ||
-        !item.productId ||
-        !item.count ||
-        item.count <= 0
-      ) {
-        resolve(false);
-        return;
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (item) {
+      if (!item.fromWarehouseId) {
+        throw new Error(`第 ${i + 1} 行：调出仓库不能为空`);
+      }
+      if (!item.toWarehouseId) {
+        throw new Error(`第 ${i + 1} 行：调入仓库不能为空`);
+      }
+      if (!item.productId) {
+        throw new Error(`第 ${i + 1} 行：产品不能为空`);
+      }
+      if (!item.count || item.count <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
       }
     }
-
-    // 验证通过，清除验证状态
-    isValidating.value = false;
-    nextTick(() => {
-      gridApi.grid.refreshColumn();
-    });
-
-    resolve(true);
-  });
-}
-
-/** 初始化表格数据 */
-function init(items: ErpStockMoveApi.StockMoveItem[]) {
-  tableData.value = items || [];
-  gridApi.grid.reloadData(tableData.value);
+  }
 }
 
 defineExpose({
   validate,
-  init,
-  handleAdd,
+});
+
+/** 初始化 */
+onMounted(async () => {
+  productOptions.value = await getProductSimpleList();
+  warehouseOptions.value = await getWarehouseSimpleList();
+  // 目的：新增时，默认添加一行
+  if (tableData.value.length === 0) {
+    handleAdd();
+  }
 });
 </script>
 
 <template>
-  <div class="w-full">
-    <div class="mb-4 flex justify-between">
-      <span class="text-lg font-medium"></span>
-    </div>
-
-    <Grid>
-      <template #fromWarehouseId="{ row }">
-        <Select
-          v-model:value="row.fromWarehouseId"
-          :options="warehouseOptions"
-          :field-names="{ label: 'name', value: 'id' }"
-          placeholder="请选择调出仓库"
-          :disabled="disabled"
-          show-search
-          @change="(value) => handleWarehouseChange(value, row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #toWarehouseId="{ row }">
-        <Select
-          v-model:value="row.toWarehouseId"
-          :options="warehouseOptions"
-          :field-names="{ label: 'name', value: 'id' }"
-          placeholder="请选择调入仓库"
-          :disabled="disabled"
-          show-search
-          @change="(value) => handleWarehouseChange(value, row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #productId="{ row }">
-        <Select
-          v-model:value="row.productId"
-          :options="productOptions"
-          :field-names="{ label: 'name', value: 'id' }"
-          placeholder="请选择产品"
-          :disabled="disabled"
-          show-search
-          @change="(value) => handleProductChange(value, row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #count="{ row }">
-        <InputNumber
-          v-model:value="row.count"
-          :disabled="disabled"
-          :min="0.001"
-          :precision="3"
-          @change="() => handlePriceChange(row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #productPrice="{ row }">
-        <InputNumber
-          v-model:value="row.productPrice"
-          :disabled="disabled"
-          :min="0.01"
-          :precision="2"
-          @change="() => handlePriceChange(row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #remark="{ row }">
-        <Input
-          v-model:value="row.remark"
-          :disabled="disabled"
-          placeholder="请输入备注"
-        />
-      </template>
-
-      <template #actions="{ row }">
-        <TableAction
-          v-if="!disabled"
-          :actions="[
-            {
-              label: '删除',
-              type: 'link',
-              danger: true,
-              popConfirm: {
-                title: '确认删除该产品吗？',
-                confirm: handleDelete.bind(null, row),
-              },
-            },
-          ]"
-        />
-      </template>
-
-      <template #bottom>
-        <TableAction
-          v-if="!disabled"
-          class="mt-4 flex justify-center"
-          :actions="[
-            {
-              label: '添加产品',
-              type: 'default',
-              onClick: handleAdd,
+  <Grid class="w-full">
+    <template #fromWarehouseId="{ row }">
+      <Select
+        v-model:value="row.fromWarehouseId"
+        :options="warehouseOptions"
+        :field-names="{ label: 'name', value: 'id' }"
+        class="w-full"
+        placeholder="请选择调出仓库"
+        show-search
+        :disabled="disabled"
+        @change="handleFromWarehouseChange($event, row)"
+      />
+    </template>
+    <template #toWarehouseId="{ row }">
+      <Select
+        v-model:value="row.toWarehouseId"
+        :options="warehouseOptions"
+        :field-names="{ label: 'name', value: 'id' }"
+        class="w-full"
+        placeholder="请选择调入仓库"
+        show-search
+        :disabled="disabled"
+        @change="handleToWarehouseChange($event, row)"
+      />
+    </template>
+    <template #productId="{ row }">
+      <Select
+        v-model:value="row.productId"
+        :options="productOptions"
+        :field-names="{ label: 'name', value: 'id' }"
+        class="w-full"
+        placeholder="请选择产品"
+        show-search
+        :disabled="disabled"
+        @change="handleProductChange($event, row)"
+      />
+    </template>
+    <template #count="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.count"
+        :min="0"
+        :precision="3"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ erpCountInputFormatter(row.count) || '-' }}</span>
+    </template>
+    <template #productPrice="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.productPrice"
+        :min="0"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ erpPriceInputFormatter(row.productPrice) || '-' }}</span>
+    </template>
+    <template #remark="{ row }">
+      <Input v-if="!disabled" v-model:value="row.remark" class="w-full" />
+      <span v-else>{{ row.remark || '-' }}</span>
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        v-if="!disabled"
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该产品吗？',
+              confirm: handleDelete.bind(null, row),
             },
-          ]"
-        />
-      </template>
-    </Grid>
-  </div>
+          },
+        ]"
+      />
+    </template>
+
+    <template #bottom>
+      <div class="border-border bg-muted mt-2 rounded border p-2">
+        <div class="text-muted-foreground flex justify-between text-sm">
+          <span class="text-foreground font-medium">合计：</span>
+          <div class="flex space-x-4">
+            <span>数量：{{ erpCountInputFormatter(summaries.count) }}</span>
+            <span>
+              金额：{{ erpPriceInputFormatter(summaries.totalPrice) }}
+            </span>
+          </div>
+        </div>
+      </div>
+      <TableAction
+        v-if="!disabled"
+        class="mt-2 flex justify-center"
+        :actions="[
+          {
+            label: '添加调拨产品',
+            type: 'default',
+            onClick: handleAdd,
+          },
+        ]"
+      />
+    </template>
+  </Grid>
 </template>
-
-<style scoped>
-:deep(.vxe-table .vxe-footer--column.stock-in-footer-cell .vxe-cell) {
-  background-color: #f5f5f5 !important;
-}
-</style>
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 a34ba51713c9b53d7021e211c041accdd1afd1d1..3fb67b7048b791814f84c70b7a3ee85e37aa8466 100644
--- a/apps/web-antd/src/views/erp/stock/out/data.ts
+++ b/apps/web-antd/src/views/erp/stock/out/data.ts
@@ -4,49 +4,47 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import { createRequiredValidation } from '#/adapter/vxe-table';
 import { getProductSimpleList } from '#/api/erp/product/product';
 import { getCustomerSimpleList } from '#/api/erp/sale/customer';
+import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 表单的配置项 */
 export function useFormSchema(formType: string): VbenFormSchema[] {
   return [
     {
+      fieldName: 'id',
       component: 'Input',
-      componentProps: {
-        style: { display: 'none' },
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
       },
-      fieldName: 'id',
-      label: 'ID',
-      hideLabel: true,
-      formItemClass: 'hidden',
     },
     {
+      fieldName: 'no',
+      label: '出库单号',
       component: 'Input',
       componentProps: {
         placeholder: '系统自动生成',
         disabled: true,
       },
-      fieldName: 'no',
-      label: '出库单号',
-      disabled: formType === 'detail',
     },
     {
+      fieldName: 'outTime',
+      label: '出库时间',
       component: 'DatePicker',
       componentProps: {
         placeholder: '选择出库时间',
         showTime: true,
         format: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
-        style: { width: '100%' },
       },
-      disabled: formType === 'detail',
-      fieldName: 'outTime',
-      label: '出库时间',
       rules: 'required',
     },
     {
+      label: '客户',
+      fieldName: 'customerId',
       component: 'ApiSelect',
       componentProps: {
         placeholder: '请选择客户',
@@ -58,26 +56,23 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
           value: 'id',
         },
       },
-      disabled: formType === 'detail',
-      fieldName: 'customerId',
-      label: '客户',
+      rules: 'required',
     },
-
     {
+      fieldName: 'remark',
+      label: '备注',
       component: 'Textarea',
       componentProps: {
         placeholder: '请输入备注',
-        autoSize: { minRows: 2, maxRows: 4 },
-        class: 'w-full',
+        autoSize: { minRows: 1, maxRows: 1 },
+        disabled: formType === 'detail',
       },
-      disabled: formType === 'detail',
-      fieldName: 'remark',
-      label: '备注',
-      formItemClass: 'col-span-3',
+      formItemClass: 'col-span-2',
     },
     {
+      fieldName: 'fileUrl',
+      label: '附件',
       component: 'FileUpload',
-      disabled: formType === 'detail',
       componentProps: {
         maxNumber: 1,
         maxSize: 10,
@@ -92,26 +87,22 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
           'jpeg',
           'png',
         ],
-        showDescription: true,
+        showDescription: formType !== 'detail',
+        disabled: formType === 'detail',
       },
-      fieldName: 'fileUrl',
-      label: '附件',
       formItemClass: 'col-span-3',
     },
     {
-      fieldName: 'product',
-      disabled: formType === 'detail',
-      label: '产品清单',
+      fieldName: 'items',
+      label: '出库产品清单',
       component: 'Input',
       formItemClass: 'col-span-3',
     },
   ];
 }
 
-/** 出库产品清单表格列定义 */
-export function useStockInItemTableColumns(
-  isValidating?: any,
-): VxeTableGridOptions['columns'] {
+/** 表单的明细表格列 */
+export function useFormItemColumns(): VxeTableGridOptions['columns'] {
   return [
     { type: 'seq', title: '序号', minWidth: 50, fixed: 'left' },
     {
@@ -119,19 +110,18 @@ export function useStockInItemTableColumns(
       title: '仓库名称',
       minWidth: 150,
       slots: { default: 'warehouseId' },
-      className: createRequiredValidation(isValidating, 'warehouseId'),
     },
     {
       field: 'productId',
       title: '产品名称',
       minWidth: 200,
       slots: { default: 'productId' },
-      className: createRequiredValidation(isValidating, 'productId'),
     },
     {
       field: 'stockCount',
       title: '库存',
-      minWidth: 100,
+      minWidth: 80,
+      formatter: 'formatAmount3',
     },
     {
       field: 'productBarCode',
@@ -143,31 +133,33 @@ export function useStockInItemTableColumns(
       title: '单位',
       minWidth: 80,
     },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 150,
+      slots: { default: 'remark' },
+    },
     {
       field: 'count',
       title: '数量',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'count' },
-      className: createRequiredValidation(isValidating, 'count'),
     },
     {
       field: 'productPrice',
       title: '产品单价',
       minWidth: 120,
+      fixed: 'right',
       slots: { default: 'productPrice' },
     },
     {
       field: 'totalPrice',
       title: '金额',
       minWidth: 120,
+      fixed: 'right',
       formatter: 'formatAmount2',
     },
-    {
-      field: 'remark',
-      title: '备注',
-      minWidth: 150,
-      slots: { default: 'remark' },
-    },
     {
       title: '操作',
       width: 50,
@@ -198,9 +190,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
         showSearch: true,
         api: getProductSimpleList,
-        labelField: 'name',
-        valueField: 'id',
-        filterOption: false,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
       },
     },
     {
@@ -208,10 +201,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '出库时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始日期', '结束日期'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
     {
@@ -223,9 +214,40 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
         showSearch: true,
         api: getCustomerSimpleList,
-        labelField: 'name',
-        valueField: 'id',
-        filterOption: false,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'warehouseId',
+      label: '仓库',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择仓库',
+        allowClear: true,
+        showSearch: true,
+        api: getWarehouseSimpleList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+    },
+    {
+      fieldName: 'creator',
+      label: '创建人',
+      component: 'ApiSelect',
+      componentProps: {
+        placeholder: '请选择创建人',
+        allowClear: true,
+        showSearch: true,
+        api: getSimpleUserList,
+        fieldNames: {
+          label: 'nickname',
+          value: 'id',
+        },
       },
     },
     {
@@ -233,9 +255,9 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '状态',
       component: 'Select',
       componentProps: {
+        options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
         placeholder: '请选择状态',
         allowClear: true,
-        options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
       },
     },
     {
@@ -247,20 +269,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
         allowClear: true,
       },
     },
-    {
-      fieldName: 'creator',
-      label: '创建人',
-      component: 'ApiSelect',
-      componentProps: {
-        placeholder: '请选择创建人',
-        allowClear: true,
-        showSearch: true,
-        api: getSimpleUserList,
-        labelField: 'nickname',
-        valueField: 'id',
-        filterOption: false,
-      },
-    },
   ];
 }
 
@@ -275,13 +283,14 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'no',
       title: '出库单号',
-      minWidth: 180,
+      width: 200,
+      fixed: 'left',
     },
     {
       field: 'productNames',
       title: '产品信息',
-      minWidth: 200,
       showOverflow: 'tooltip',
+      minWidth: 120,
     },
     {
       field: 'customerName',
@@ -291,31 +300,30 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'outTime',
       title: '出库时间',
-      minWidth: 180,
-      cellRender: {
-        name: 'CellDateTime',
-      },
+      width: 160,
+      formatter: 'formatDate',
     },
     {
       field: 'creatorName',
       title: '创建人',
-      minWidth: 100,
+      minWidth: 120,
     },
     {
       field: 'totalCount',
-      title: '数量',
-      minWidth: 100,
+      title: '总数量',
+      formatter: 'formatAmount3',
+      minWidth: 120,
     },
     {
       field: 'totalPrice',
-      title: '价格',
-      minWidth: 100,
+      title: '总金额',
+      formatter: 'formatAmount2',
+      minWidth: 120,
     },
     {
       field: 'status',
       title: '状态',
-      minWidth: 90,
-      fixed: 'right',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
@@ -323,7 +331,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       title: '操作',
-      width: 300,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
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 b42896b3735dfac98f5c9d9a431193877d629e5a..f323dec82b0dc9f659b18a7b49f1cdb2e344f853 100644
--- a/apps/web-antd/src/views/erp/stock/out/index.vue
+++ b/apps/web-antd/src/views/erp/stock/out/index.vue
@@ -2,8 +2,10 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ErpStockOutApi } from '#/api/erp/stock/out';
 
+import { ref } from 'vue';
+
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
-import { downloadFileFromBlobPart } from '@vben/utils';
+import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
@@ -17,71 +19,84 @@ import {
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import StockInForm from './modules/form.vue';
+import Form from './modules/form.vue';
 
-/** 其它出库单管理 */
+/** ERP 其它出库单列表 */
 defineOptions({ name: 'ErpStockOut' });
 
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: StockInForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 导出出库单 */
+/** 导出表格 */
 async function handleExport() {
   const data = await exportStockOut(await gridApi.formApi.getValues());
   downloadFileFromBlobPart({ fileName: '其它出库单.xls', source: data });
 }
 
-/** 新增/编辑/详情 */
-function openForm(type: string, id?: number) {
-  formModalApi.setData({ type, id }).open();
+/** 新增其它出库单 */
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+/** 编辑其它出库单 */
+function handleEdit(row: ErpStockOutApi.StockOut) {
+  formModalApi.setData({ type: 'edit', id: row.id }).open();
 }
 
-/** 删除 */
-async function handleDelete(ids: any[]) {
+/** 删除其它出库单 */
+async function handleDelete(ids: number[]) {
   const hideLoading = message.loading({
-    content: '删除中...',
+    content: $t('ui.actionMessage.deleting'),
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
     await deleteStockOut(ids);
-    message.success({
-      content: '删除成功',
-      key: 'action_process_msg',
-    });
-    onRefresh();
+    message.success($t('ui.actionMessage.deleteSuccess'));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
-/** 审核/反审核 */
-async function handleUpdateStatus(id: any, status: number) {
-  const statusText = status === 20 ? '审核' : '反审核';
+/** 审批/反审批操作 */
+async function handleUpdateStatus(
+  row: ErpStockOutApi.StockOut,
+  status: number,
+) {
   const hideLoading = message.loading({
-    content: `${statusText}中...`,
+    content: `确定${status === 20 ? '审批' : '反审批'}该出库单吗？`,
     duration: 0,
-    key: 'action_process_msg',
   });
   try {
-    await updateStockOutStatus({ id, status });
-    message.success({
-      content: `${statusText}成功`,
-      key: 'action_process_msg',
-    });
-    onRefresh();
+    await updateStockOutStatus(row.id!, status);
+    message.success(`${status === 20 ? '审批' : '反审批'}成功`);
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
+const checkedIds = ref<number[]>([]);
+function handleRowCheckboxChange({
+  records,
+}: {
+  records: ErpStockOutApi.StockOut[];
+}) {
+  checkedIds.value = records.map((item) => item.id!);
+}
+
+/** 查看详情 */
+function handleDetail(row: ErpStockOutApi.StockOut) {
+  formModalApi.setData({ type: 'detail', id: row.id }).open();
+}
+
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
@@ -103,15 +118,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
       search: true,
     },
-    checkboxConfig: {
-      reserve: true,
-    },
   } as VxeTableGridOptions<ErpStockOutApi.StockOut>,
+  gridEvents: {
+    checkboxAll: handleRowCheckboxChange,
+    checkboxChange: handleRowCheckboxChange,
+  },
 });
 </script>
 
@@ -123,97 +140,86 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/erp/stock-in-out/"
       />
     </template>
+
+    <FormModal @success="handleRefresh" />
     <Grid table-title="其它出库单列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
             {
-              label: $t('ui.actionTitle.create', ['其它出库']),
+              label: $t('ui.actionTitle.create', ['其它出库单']),
               type: 'primary',
               icon: ACTION_ICON.ADD,
               auth: ['erp:stock-out:create'],
-              onClick: () => openForm('create'),
+              onClick: handleCreate,
             },
             {
               label: $t('ui.actionTitle.export'),
-              type: 'default',
+              type: 'primary',
               icon: ACTION_ICON.DOWNLOAD,
               auth: ['erp:stock-out:export'],
               onClick: handleExport,
             },
             {
               label: '批量删除',
-              type: 'default',
+              type: 'primary',
               danger: true,
+              disabled: isEmpty(checkedIds),
               icon: ACTION_ICON.DELETE,
               auth: ['erp:stock-out:delete'],
               popConfirm: {
-                title: '是否删除所选中数据？',
-                confirm: () => {
-                  const checkboxRecords = gridApi.grid.getCheckboxRecords();
-                  if (checkboxRecords.length === 0) {
-                    message.warning('请选择要删除的数据');
-                    return;
-                  }
-                  handleDelete(checkboxRecords.map((item) => item.id));
-                },
+                title: `是否删除所选中数据？`,
+                confirm: handleDelete.bind(null, checkedIds),
               },
             },
           ]"
         />
       </template>
-
       <template #actions="{ row }">
         <TableAction
           :actions="[
             {
-              label: '详情',
+              label: $t('common.detail'),
+              type: 'link',
               icon: ACTION_ICON.VIEW,
               auth: ['erp:stock-out:query'],
-              onClick: () => openForm('detail', row.id),
+              onClick: handleDetail.bind(null, row),
             },
             {
-              label: '编辑',
-              auth: ['erp:stock-out:update'],
+              label: $t('common.edit'),
+              type: 'link',
               icon: ACTION_ICON.EDIT,
-              disabled: row.status !== 10,
-              onClick: () => openForm('update', row.id),
-            },
-            {
-              label: '审核',
               auth: ['erp:stock-out:update'],
-              ifShow: row.status === 10,
-              popConfirm: {
-                title: '确认要审核该入库单吗？',
-                confirm: () => handleUpdateStatus(row.id, 20),
-              },
+              ifShow: () => row.status !== 20,
+              onClick: handleEdit.bind(null, row),
             },
             {
-              label: '反审核',
-              danger: true,
-              auth: ['erp:stock-out:update'],
-              ifShow: row.status === 20,
+              label: row.status === 10 ? '审批' : '反审批',
+              type: 'link',
+              auth: ['erp:stock-out:update-status'],
               popConfirm: {
-                title: '确认要反审核该入库单吗？',
-                confirm: () => handleUpdateStatus(row.id, 10),
+                title: `确认${row.status === 10 ? '审批' : '反审批'}${row.no}吗？`,
+                confirm: handleUpdateStatus.bind(
+                  null,
+                  row,
+                  row.status === 10 ? 20 : 10,
+                ),
               },
             },
             {
-              label: '删除',
+              label: $t('common.delete'),
+              type: 'link',
               danger: true,
+              color: 'error',
               auth: ['erp:stock-out:delete'],
-              disabled: row.status !== 10,
               popConfirm: {
-                title: '确认要删除该出库单吗？',
-                confirm: () => handleDelete([row.id]),
+                title: $t('ui.actionMessage.deleteConfirm', [row.no]),
+                confirm: handleDelete.bind(null, [row.id!]),
               },
             },
           ]"
         />
       </template>
     </Grid>
-
-    <!-- 表单弹窗 -->
-    <FormModal @success="onRefresh" />
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/erp/stock/out/modules/form.vue b/apps/web-antd/src/views/erp/stock/out/modules/form.vue
index 7e8a840318dc721f2006b3200b690c3cedb82825..d8ae8a4485598ed78815b227988b8b83b04b378b 100644
--- a/apps/web-antd/src/views/erp/stock/out/modules/form.vue
+++ b/apps/web-antd/src/views/erp/stock/out/modules/form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { ErpStockOutApi } from '#/api/erp/stock/out';
 
-import { computed, nextTick, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
@@ -12,22 +12,25 @@ import {
   createStockOut,
   getStockOut,
   updateStockOut,
-  updateStockOutStatus,
 } from '#/api/erp/stock/out';
+import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
-import StockInItemForm from './stock-out-item-form.vue';
+import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockOutApi.StockOut>();
-const formType = ref('');
-const itemFormRef = ref();
-
-const getTitle = computed(() => {
-  if (formType.value === 'create') return '添加其它出库单';
-  if (formType.value === 'update') return '编辑其它出库单';
-  return '其它出库单详情';
-});
+const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const itemFormRef = ref<InstanceType<typeof ItemForm>>();
+
+/* eslint-disable unicorn/no-nested-ternary */
+const getTitle = computed(() =>
+  formType.value === 'create'
+    ? $t('ui.actionTitle.create', ['其它出库单'])
+    : formType.value === 'edit'
+      ? $t('ui.actionTitle.edit', ['其它出库单'])
+      : '其它出库单详情',
+);
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -42,60 +45,35 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
+/** 更新出库单项 */
 const handleUpdateItems = (items: ErpStockOutApi.StockOutItem[]) => {
   formData.value = modalApi.getData<ErpStockOutApi.StockOut>();
-  if (formData.value) {
-    formData.value.items = items;
-  }
+  formData.value.items = items;
+  formApi.setValues({
+    items,
+  });
 };
 
-/**
- * 创建或更新其它出库单
- */
+/** 创建或更新其它出库单 */
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
-    await nextTick();
-
     const itemFormInstance = Array.isArray(itemFormRef.value)
       ? itemFormRef.value[0]
       : itemFormRef.value;
-    if (itemFormInstance && typeof itemFormInstance.validate === 'function') {
-      try {
-        const isValid = await itemFormInstance.validate();
-        if (!isValid) {
-          message.error('产品清单验证失败，请检查必填项');
-          return;
-        }
-      } catch (error: any) {
-        message.error(error.message || '产品清单验证失败');
-        return;
-      }
-    } else {
-      message.error('产品清单验证方法不存在');
-      return;
-    }
-
-    // 验证产品清单不能为空
-    if (!formData.value?.items || formData.value.items.length === 0) {
-      message.error('产品清单不能为空，请至少添加一个产品');
+    try {
+      itemFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
       return;
     }
 
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as ErpStockOutApi.StockOut;
-    data.items = formData.value?.items?.map((item) => ({
-      ...item,
-      id: undefined,
-    }));
-    // 将文件数组转换为字符串
-    if (data.fileUrl && Array.isArray(data.fileUrl)) {
-      data.fileUrl = data.fileUrl.length > 0 ? data.fileUrl[0] : '';
-    }
     try {
       await (formType.value === 'create'
         ? createStockOut(data)
@@ -103,7 +81,7 @@ const [Modal, modalApi] = useVbenModal({
       // 关闭并提示
       await modalApi.close();
       emit('success');
-      message.success(formType.value === 'create' ? '新增成功' : '更新成功');
+      message.success($t('ui.actionMessage.operationSuccess'));
     } finally {
       modalApi.unlock();
     }
@@ -115,77 +93,34 @@ const [Modal, modalApi] = useVbenModal({
     }
     // 加载数据
     const data = modalApi.getData<{ id?: number; type: string }>();
-    if (!data) {
-      return;
-    }
     formType.value = data.type;
+    formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
-    if (!data.id) {
-      // 初始化空的表单数据
-      formData.value = { items: [] } as unknown as ErpStockOutApi.StockOut;
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init([]);
-      }
-      // 如果是新增，自动添加一行
-      if (formType.value === 'create' && itemFormInstance) {
-        itemFormInstance.handleAdd();
-      }
+    if (!data || !data.id) {
       return;
     }
-
     modalApi.lock();
     try {
       formData.value = await getStockOut(data.id);
       // 设置到 values
       await formApi.setValues(formData.value);
-      // 初始化子表单
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init(formData.value.items || []);
-      }
     } finally {
       modalApi.unlock();
     }
   },
 });
-
-/** 审核/反审核 */
-async function handleUpdateStatus(id: number, status: number) {
-  try {
-    await updateStockOutStatus({ id, status });
-    message.success(status === 20 ? '审核成功' : '反审核成功');
-    emit('success');
-    await modalApi.close();
-  } catch (error: any) {
-    message.error(error.message || '操作失败');
-  }
-}
-
-defineExpose({ modalApi, handleUpdateStatus });
 </script>
 
 <template>
   <Modal
-    v-bind="$attrs"
     :title="getTitle"
-    class="w-4/5"
-    :closable="true"
-    :mask-closable="true"
+    class="w-3/4"
     :show-confirm-button="formType !== 'detail'"
   >
     <Form class="mx-3">
-      <template #product="slotProps">
-        <StockInItemForm
-          v-bind="slotProps"
+      <template #items>
+        <ItemForm
           ref="itemFormRef"
-          class="w-full"
           :items="formData?.items ?? []"
           :disabled="formType === 'detail'"
           @update:items="handleUpdateItems"
diff --git a/apps/web-antd/src/views/erp/stock/out/modules/stock-out-item-form.vue b/apps/web-antd/src/views/erp/stock/out/modules/item-form.vue
similarity index 32%
rename from apps/web-antd/src/views/erp/stock/out/modules/stock-out-item-form.vue
rename to apps/web-antd/src/views/erp/stock/out/modules/item-form.vue
index 14ff4fe1389e8e5db3552c0cc04ddde3efe7600b..e8ade25ba327825181b58f076ebb2dc8608edacd 100644
--- a/apps/web-antd/src/views/erp/stock/out/modules/stock-out-item-form.vue
+++ b/apps/web-antd/src/views/erp/stock/out/modules/item-form.vue
@@ -1,10 +1,14 @@
 <script lang="ts" setup>
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ErpProductApi } from '#/api/erp/product/product';
 import type { ErpStockOutApi } from '#/api/erp/stock/out';
 
-import { nextTick, onMounted, ref, watch } from 'vue';
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
-import { erpPriceMultiply } from '@vben/utils';
+import {
+  erpCountInputFormatter,
+  erpPriceInputFormatter,
+  erpPriceMultiply,
+} from '@vben/utils';
 
 import { Input, InputNumber, Select } from 'ant-design-vue';
 
@@ -13,7 +17,12 @@ import { getProductSimpleList } from '#/api/erp/product/product';
 import { getStockCount } from '#/api/erp/stock/stock';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 
-import { useStockInItemTableColumns } from '../data';
+import { useFormItemColumns } from '../data';
+
+interface Props {
+  items?: ErpStockOutApi.StockOutItem[];
+  disabled?: boolean;
+}
 
 const props = withDefaults(defineProps<Props>(), {
   items: () => [],
@@ -22,32 +31,32 @@ const props = withDefaults(defineProps<Props>(), {
 
 const emit = defineEmits(['update:items']);
 
-interface Props {
-  items?: ErpStockOutApi.StockOutItem[];
-  disabled?: boolean;
-}
+const tableData = ref<ErpStockOutApi.StockOutItem[]>([]); // 表格数据
+const productOptions = ref<ErpProductApi.Product[]>([]); // 产品下拉选项
+const warehouseOptions = ref<any[]>([]); // 仓库下拉选项
 
-const tableData = ref<ErpStockOutApi.StockOutItem[]>([]);
-const productOptions = ref<any[]>([]);
-const warehouseOptions = ref<any[]>([]);
-const isValidating = ref(false);
+/** 获取表格合计数据 */
+const summaries = computed(() => {
+  return {
+    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
+    totalPrice: tableData.value.reduce(
+      (sum, item) => sum + (item.totalPrice || 0),
+      0,
+    ),
+  };
+});
 
 /** 表格配置 */
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    editConfig: {
-      trigger: 'click',
-      mode: 'cell',
-    },
-    columns: useStockInItemTableColumns(isValidating),
+    columns: useFormItemColumns(),
     data: tableData.value,
-    border: true,
-    showOverflow: true,
-    autoResize: true,
     minHeight: 250,
-    keepSource: true,
+    autoResize: true,
+    border: true,
     rowConfig: {
-      keyField: 'id',
+      keyField: 'seq',
+      isHover: true,
     },
     pagerConfig: {
       enabled: false,
@@ -55,30 +64,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
     toolbarConfig: {
       enabled: false,
     },
-    showFooter: true,
-    footerCellClassName: 'stock-in-footer-cell',
-    footerMethod: ({
-      columns,
-    }: {
-      columns: VxeTableGridOptions['columns'];
-    }) => {
-      const footers: any[][] = [];
-      const sums = getSummaries();
-      const footerData: any[] = [];
-      columns!.forEach((column, columnIndex: number) => {
-        if (columnIndex === 0) {
-          footerData.push('合计');
-        } else if (column.field === 'count') {
-          footerData.push(sums.count);
-        } else if (column.field === 'totalPrice') {
-          footerData.push(sums.totalPrice);
-        } else {
-          footerData.push('');
-        }
-      });
-      footers.push(footerData);
-      return footers;
-    },
   },
 });
 
@@ -89,279 +74,222 @@ watch(
     if (!items) {
       return;
     }
-    await nextTick();
+    items.forEach((item) => initRow(item));
     tableData.value = [...items];
-    await nextTick();
-    gridApi.grid.reloadData(tableData.value);
+    await nextTick(); // 特殊：保证 gridApi 已经初始化
+    await gridApi.grid.reloadData(tableData.value);
   },
   {
     immediate: true,
   },
 );
 
-/** 初始化 */
-onMounted(async () => {
-  productOptions.value = await getProductSimpleList();
-  warehouseOptions.value = await getWarehouseSimpleList();
-});
-
+/** 处理新增 */
 function handleAdd() {
   const newRow = {
+    id: undefined,
     warehouseId: undefined,
     productId: undefined,
-    productName: '',
-    productUnitId: undefined,
-    productUnitName: '',
-    productBarCode: '',
+    productUnitName: undefined, // 产品单位
+    productBarCode: undefined, // 产品条码
+    productPrice: undefined,
+    stockCount: undefined,
     count: 1,
-    productPrice: 0,
-    totalPrice: 0,
-    stockCount: 0,
-    remark: '',
+    totalPrice: undefined,
+    remark: undefined,
   };
   tableData.value.push(newRow);
-  gridApi.grid.insertAt(newRow, -1);
+  // 通知父组件更新
   emit('update:items', [...tableData.value]);
-  // 触发表格重新渲染以更新cellClassName
-  nextTick(() => {
-    gridApi.grid.refreshColumn();
-  });
 }
 
+/** 处理删除 */
 function handleDelete(row: ErpStockOutApi.StockOutItem) {
-  gridApi.grid.remove(row);
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index !== -1) {
     tableData.value.splice(index, 1);
   }
+  // 通知父组件更新
   emit('update:items', [...tableData.value]);
 }
 
+/** 处理仓库变更 */
 async function handleWarehouseChange(warehouseId: any, row: any) {
   const warehouse = warehouseOptions.value.find((w) => w.id === warehouseId);
   if (!warehouse) {
     return;
   }
-
   row.warehouseId = warehouseId;
-
   // 如果已选择产品，重新获取库存
   if (row.productId) {
-    const stockCount = await getStockCount(row.productId, warehouseId);
-    row.stockCount = stockCount || 0;
+    row.stockCount = (await getStockCount(row.productId, warehouseId)) || 0;
   }
-
-  handleUpdateValue(row);
+  handleRowChange(row);
 }
 
+/** 处理产品变更 */
 async function handleProductChange(productId: any, row: any) {
   const product = productOptions.value.find((p) => p.id === productId);
   if (!product) {
     return;
   }
-
-  // 获取库存数量
-  const stockCount = row.warehouseId
-    ? await getStockCount(productId, row.warehouseId)
-    : await getStockCount(productId);
-
   row.productId = productId;
   row.productUnitId = product.unitId;
   row.productBarCode = product.barCode;
   row.productUnitName = product.unitName;
   row.productName = product.name;
-  row.stockCount = stockCount || 0;
+  row.stockCount = row.warehouseId
+    ? (await getStockCount(productId, row.warehouseId)) || 0
+    : (await getStockCount(productId)) || 0;
   row.productPrice = product.purchasePrice || 0;
   row.count = row.count || 1;
-
-  handlePriceChange(row);
-}
-
-function handlePriceChange(row: any) {
-  if (row.productPrice && row.count) {
-    row.totalPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
-  }
-  handleUpdateValue(row);
+  handleRowChange(row);
 }
 
-function handleUpdateValue(row: any) {
-  const index = tableData.value.findIndex((item) => item.id === row.id);
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
   if (index === -1) {
     tableData.value.push(row);
   } else {
     tableData.value[index] = row;
   }
   emit('update:items', [...tableData.value]);
-  // 触发表格重新渲染以更新cellClassName
-  nextTick(() => {
-    gridApi.grid.refreshColumn();
-  });
 }
 
-const getSummaries = (): {
-  count: number;
-  totalPrice: number;
-} => {
-  return {
-    count: tableData.value.reduce((sum, item) => sum + (item.count || 0), 0),
-    totalPrice: tableData.value.reduce(
-      (sum, item) => sum + (item.totalPrice || 0),
-      0,
-    ),
-  };
+/** 初始化行数据 */
+const initRow = (row: ErpStockOutApi.StockOutItem): void => {
+  if (row.productPrice && row.count) {
+    row.totalPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+  }
 };
 
-/** 验证表单 */
-function validate(): Promise<boolean> {
-  return new Promise((resolve) => {
-    isValidating.value = true;
-
-    // 触发表格重新渲染以显示验证错误
-    nextTick(() => {
-      gridApi.grid.refreshColumn();
-    });
-
-    // 验证是否有产品清单
-    if (!tableData.value || tableData.value.length === 0) {
-      resolve(false);
-      return;
-    }
-
-    // 验证每一行的必填字段
-    for (const item of tableData.value) {
-      if (
-        !item.warehouseId ||
-        !item.productId ||
-        !item.count ||
-        item.count <= 0
-      ) {
-        resolve(false);
-        return;
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (item) {
+      if (!item.warehouseId) {
+        throw new Error(`第 ${i + 1} 行：仓库不能为空`);
+      }
+      if (!item.productId) {
+        throw new Error(`第 ${i + 1} 行：产品不能为空`);
+      }
+      if (!item.count || item.count <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品数量不能为空`);
+      }
+      if (!item.productPrice || item.productPrice <= 0) {
+        throw new Error(`第 ${i + 1} 行：产品单价不能为空`);
       }
     }
-
-    // 验证通过，清除验证状态
-    isValidating.value = false;
-    nextTick(() => {
-      gridApi.grid.refreshColumn();
-    });
-
-    resolve(true);
-  });
-}
-
-/** 初始化表格数据 */
-function init(items: ErpStockOutApi.StockOutItem[]) {
-  tableData.value = items || [];
-  gridApi.grid.reloadData(tableData.value);
+  }
 }
 
 defineExpose({
   validate,
-  init,
-  handleAdd,
+});
+
+/** 初始化 */
+onMounted(async () => {
+  productOptions.value = await getProductSimpleList();
+  warehouseOptions.value = await getWarehouseSimpleList();
+  // 目的：新增时，默认添加一行
+  if (tableData.value.length === 0) {
+    handleAdd();
+  }
 });
 </script>
 
 <template>
-  <div class="w-full">
-    <div class="mb-4 flex justify-between">
-      <span class="text-lg font-medium"></span>
-    </div>
-
-    <Grid>
-      <template #warehouseId="{ row }">
-        <Select
-          v-model:value="row.warehouseId"
-          :options="warehouseOptions"
-          :field-names="{ label: 'name', value: 'id' }"
-          placeholder="请选择仓库"
-          :disabled="disabled"
-          show-search
-          @change="(value) => handleWarehouseChange(value, row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #productId="{ row }">
-        <Select
-          v-model:value="row.productId"
-          :options="productOptions"
-          :field-names="{ label: 'name', value: 'id' }"
-          placeholder="请选择产品"
-          :disabled="disabled"
-          show-search
-          @change="(value) => handleProductChange(value, row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #count="{ row }">
-        <InputNumber
-          v-model:value="row.count"
-          :disabled="disabled"
-          :min="0.001"
-          :precision="3"
-          @change="() => handlePriceChange(row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #productPrice="{ row }">
-        <InputNumber
-          v-model:value="row.productPrice"
-          :disabled="disabled"
-          :min="0.01"
-          :precision="2"
-          @change="() => handlePriceChange(row)"
-          class="w-full"
-        />
-      </template>
-
-      <template #remark="{ row }">
-        <Input
-          v-model:value="row.remark"
-          :disabled="disabled"
-          placeholder="请输入备注"
-        />
-      </template>
-
-      <template #actions="{ row }">
-        <TableAction
-          v-if="!disabled"
-          :actions="[
-            {
-              label: '删除',
-              type: 'link',
-              danger: true,
-              popConfirm: {
-                title: '确认删除该产品吗？',
-                confirm: handleDelete.bind(null, row),
-              },
-            },
-          ]"
-        />
-      </template>
-
-      <template #bottom>
-        <TableAction
-          v-if="!disabled"
-          class="mt-4 flex justify-center"
-          :actions="[
-            {
-              label: '添加产品',
-              type: 'default',
-              onClick: handleAdd,
+  <Grid class="w-full">
+    <template #warehouseId="{ row }">
+      <Select
+        v-model:value="row.warehouseId"
+        :options="warehouseOptions"
+        :field-names="{ label: 'name', value: 'id' }"
+        class="w-full"
+        placeholder="请选择仓库"
+        show-search
+        :disabled="disabled"
+        @change="handleWarehouseChange($event, row)"
+      />
+    </template>
+    <template #productId="{ row }">
+      <Select
+        v-model:value="row.productId"
+        :options="productOptions"
+        :field-names="{ label: 'name', value: 'id' }"
+        class="w-full"
+        placeholder="请选择产品"
+        show-search
+        :disabled="disabled"
+        @change="handleProductChange($event, row)"
+      />
+    </template>
+    <template #count="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.count"
+        :min="0"
+        :precision="3"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ erpCountInputFormatter(row.count) || '-' }}</span>
+    </template>
+    <template #productPrice="{ row }">
+      <InputNumber
+        v-if="!disabled"
+        v-model:value="row.productPrice"
+        :min="0"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+      <span v-else>{{ erpPriceInputFormatter(row.productPrice) || '-' }}</span>
+    </template>
+    <template #remark="{ row }">
+      <Input v-if="!disabled" v-model:value="row.remark" class="w-full" />
+      <span v-else>{{ row.remark || '-' }}</span>
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        v-if="!disabled"
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该产品吗？',
+              confirm: handleDelete.bind(null, row),
             },
-          ]"
-        />
-      </template>
-    </Grid>
-  </div>
+          },
+        ]"
+      />
+    </template>
+
+    <template #bottom>
+      <div class="border-border bg-muted mt-2 rounded border p-2">
+        <div class="text-muted-foreground flex justify-between text-sm">
+          <span class="text-foreground font-medium">合计：</span>
+          <div class="flex space-x-4">
+            <span>数量：{{ erpCountInputFormatter(summaries.count) }}</span>
+            <span>
+              金额：{{ erpPriceInputFormatter(summaries.totalPrice) }}
+            </span>
+          </div>
+        </div>
+      </div>
+      <TableAction
+        v-if="!disabled"
+        class="mt-2 flex justify-center"
+        :actions="[
+          {
+            label: '添加出库产品',
+            type: 'default',
+            onClick: handleAdd,
+          },
+        ]"
+      />
+    </template>
+  </Grid>
 </template>
-
-<style scoped>
-:deep(.vxe-table .vxe-footer--column.stock-in-footer-cell .vxe-cell) {
-  background-color: #f5f5f5 !important;
-}
-</style>
diff --git a/apps/web-antd/src/views/erp/stock/record/data.ts b/apps/web-antd/src/views/erp/stock/record/data.ts
index f4753b8944ea3dea3eafbf6cb4d1a2246b25fa23..e4e3d0ecda077c4579a9df7811ccc82b735bfa1c 100644
--- a/apps/web-antd/src/views/erp/stock/record/data.ts
+++ b/apps/web-antd/src/views/erp/stock/record/data.ts
@@ -6,6 +6,7 @@ import { getDictOptions } from '@vben/hooks';
 
 import { getProductSimpleList } from '#/api/erp/product/product';
 import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
@@ -21,7 +22,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
         api: getProductSimpleList,
         labelField: 'name',
         valueField: 'id',
-        filterOption: false,
       },
     },
     {
@@ -35,7 +35,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
         api: getWarehouseSimpleList,
         labelField: 'name',
         valueField: 'id',
-        filterOption: false,
       },
     },
     {
@@ -62,10 +61,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '创建时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始日期', '结束日期'],
-        showTime: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
   ];
@@ -113,31 +110,19 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       field: 'createTime',
       title: '出入库日期',
       width: 180,
-      cellRender: {
-        name: 'CellDateTime',
-      },
+      formatter: 'formatDateTime',
     },
     {
       field: 'count',
       title: '出入库数量',
       width: 120,
-      cellRender: {
-        name: 'CellAmount',
-        props: {
-          digits: 2,
-        },
-      },
+      formatter: 'formatAmount3',
     },
     {
       field: 'totalCount',
       title: '库存量',
       width: 100,
-      cellRender: {
-        name: 'CellAmount',
-        props: {
-          digits: 2,
-        },
-      },
+      formatter: 'formatAmount3',
     },
     {
       field: 'creatorName',
diff --git a/apps/web-antd/src/views/erp/stock/record/index.vue b/apps/web-antd/src/views/erp/stock/record/index.vue
index a05f403eb4bf8f74c715a99dfe0c3ca48be4543c..8c975031a99810018f21d7e69d9f662b2d70f80a 100644
--- a/apps/web-antd/src/views/erp/stock/record/index.vue
+++ b/apps/web-antd/src/views/erp/stock/record/index.vue
@@ -41,6 +41,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
diff --git a/apps/web-antd/src/views/erp/stock/stock/data.ts b/apps/web-antd/src/views/erp/stock/stock/data.ts
index 4d0e52b7eea709811a452f3ea46345d7060b5125..037bb9c45686cac9964604b822c3fb2026ffa936 100644
--- a/apps/web-antd/src/views/erp/stock/stock/data.ts
+++ b/apps/web-antd/src/views/erp/stock/stock/data.ts
@@ -18,7 +18,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
         api: getProductSimpleList,
         labelField: 'name',
         valueField: 'id',
-        filterOption: false,
       },
     },
     {
@@ -32,7 +31,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
         api: getWarehouseSimpleList,
         labelField: 'name',
         valueField: 'id',
-        filterOption: false,
       },
     },
   ];
@@ -60,12 +58,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       field: 'count',
       title: '库存量',
       minWidth: 100,
-      cellRender: {
-        name: 'CellAmount',
-        props: {
-          digits: 2,
-        },
-      },
+      formatter: 'formatAmount3',
     },
     {
       field: 'warehouseName',
diff --git a/apps/web-antd/src/views/erp/stock/stock/index.vue b/apps/web-antd/src/views/erp/stock/stock/index.vue
index 8cd51e59c5161024018944d4e4ae614f07309887..2b20d74753425a282a041b9bd69d0ba26c7ae31e 100644
--- a/apps/web-antd/src/views/erp/stock/stock/index.vue
+++ b/apps/web-antd/src/views/erp/stock/stock/index.vue
@@ -41,6 +41,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
diff --git a/apps/web-antd/src/views/erp/stock/warehouse/data.ts b/apps/web-antd/src/views/erp/stock/warehouse/data.ts
index 308f2583bcb3c2045857f3f9463d3bb3a2fb2ae3..fead0d5aba9776810198d59f7e261799ae5a461f 100644
--- a/apps/web-antd/src/views/erp/stock/warehouse/data.ts
+++ b/apps/web-antd/src/views/erp/stock/warehouse/data.ts
@@ -2,9 +2,11 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ErpWarehouseApi } from '#/api/erp/stock/warehouse';
 
-import { DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
+import { z } from '#/adapter/form';
+
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
@@ -39,9 +41,10 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'RadioGroup',
       componentProps: {
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        buttonStyle: 'solid',
+        optionType: 'button',
       },
-      rules: 'required',
-      defaultValue: 0,
+      rules: z.number().default(CommonStatusEnum.ENABLE),
     },
     {
       fieldName: 'warehousePrice',
@@ -51,7 +54,6 @@ export function useFormSchema(): VbenFormSchema[] {
         placeholder: '请输入仓储费，单位：元/天/KG',
         min: 0,
         precision: 2,
-        class: 'w-full',
       },
     },
     {
@@ -62,7 +64,6 @@ export function useFormSchema(): VbenFormSchema[] {
         placeholder: '请输入搬运费，单位：元',
         min: 0,
         precision: 2,
-        class: 'w-full',
       },
     },
     {
@@ -80,10 +81,8 @@ export function useFormSchema(): VbenFormSchema[] {
       componentProps: {
         placeholder: '请输入排序',
         precision: 0,
-        class: 'w-full',
       },
       rules: 'required',
-      defaultValue: 0,
     },
     {
       fieldName: 'remark',
@@ -91,9 +90,7 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'Textarea',
       componentProps: {
         placeholder: '请输入备注',
-        rows: 3,
       },
-      formItemClass: 'col-span-2',
     },
   ];
 }
@@ -144,34 +141,30 @@ export function useGridColumns<T = ErpWarehouseApi.Warehouse>(
     },
     {
       field: 'warehousePrice',
-      title: '仓储费(元)',
-      width: 120,
-      cellRender: {
-        name: 'CellMoney',
-      },
+      title: '仓储费',
+      minWidth: 120,
+      formatter: 'formatAmount2',
     },
     {
       field: 'truckagePrice',
-      title: '搬运费(元)',
-      width: 120,
-      cellRender: {
-        name: 'CellMoney',
-      },
+      title: '搬运费',
+      minWidth: 120,
+      formatter: 'formatAmount2',
     },
     {
       field: 'principal',
       title: '负责人',
-      width: 100,
+      minWidth: 100,
     },
     {
       field: 'sort',
       title: '排序',
-      width: 80,
+      minWidth: 80,
     },
     {
       field: 'status',
       title: '状态',
-      width: 100,
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -180,7 +173,7 @@ export function useGridColumns<T = ErpWarehouseApi.Warehouse>(
     {
       field: 'defaultStatus',
       title: '是否默认',
-      width: 100,
+      minWidth: 100,
       cellRender: {
         attrs: { beforeChange: onDefaultStatusChange },
         name: 'CellSwitch',
@@ -199,15 +192,12 @@ export function useGridColumns<T = ErpWarehouseApi.Warehouse>(
     {
       field: 'createTime',
       title: '创建时间',
-      width: 180,
-      cellRender: {
-        name: 'CellDateTime',
-      },
+      minWidth: 180,
+      formatter: 'formatDateTime',
     },
     {
-      field: 'actions',
       title: '操作',
-      width: 160,
+      width: 130,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-antd/src/views/erp/stock/warehouse/index.vue b/apps/web-antd/src/views/erp/stock/warehouse/index.vue
index 74c2decf51ef5ee190e3280d123f48d9afda5dc4..58d931ed2cffa9dc75d643bdc90bc08db6b93589 100644
--- a/apps/web-antd/src/views/erp/stock/warehouse/index.vue
+++ b/apps/web-antd/src/views/erp/stock/warehouse/index.vue
@@ -23,18 +23,24 @@ import WarehouseForm from './modules/form.vue';
 defineOptions({ name: 'ErpWarehouse' });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 添加仓库 */
+/** 导出仓库 */
+async function handleExport() {
+  const data = await exportWarehouse(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '仓库.xls', source: data });
+}
+
+/** 创建仓库 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData(null).open();
 }
 
 /** 编辑仓库 */
 function handleEdit(row: ErpWarehouseApi.Warehouse) {
-  formModalApi.setData({ type: 'update', id: row.id }).open();
+  formModalApi.setData(row).open();
 }
 
 /** 删除仓库 */
@@ -45,11 +51,9 @@ async function handleDelete(row: ErpWarehouseApi.Warehouse) {
   });
   try {
     await deleteWarehouse(row.id!);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
-  } catch {
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
     hideLoading();
   }
 }
@@ -60,15 +64,14 @@ async function handleDefaultStatusChange(
   row: ErpWarehouseApi.Warehouse,
 ): Promise<boolean | undefined> {
   return new Promise((resolve, reject) => {
-    const text = newStatus ? '开启' : '取消';
-
+    const text = newStatus ? '设置' : '取消';
     confirm({
       content: `确认要${text}"${row.name}"默认吗?`,
     })
       .then(async () => {
         // 更新默认状态
         await updateWarehouseDefaultStatus(row.id!, newStatus);
-        message.success(`${text}默认状态成功`);
+        message.success(`${text}默认成功`);
         resolve(true);
       })
       .catch(() => {
@@ -77,12 +80,6 @@ async function handleDefaultStatusChange(
   });
 }
 
-/** 导出仓库 */
-async function handleExport() {
-  const data = await exportWarehouse(await gridApi.formApi.getValues());
-  downloadFileFromBlobPart({ fileName: '仓库.xls', source: data });
-}
-
 const [FormModal, formModalApi] = useVbenModal({
   connectedComponent: WarehouseForm,
   destroyOnClose: true,
@@ -109,6 +106,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -127,7 +125,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
 
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="仓库列表">
       <template #toolbar-tools>
         <TableAction
@@ -154,14 +152,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
         <TableAction
           :actions="[
             {
-              label: '编辑',
+              label: $t('common.edit'),
               type: 'link',
               icon: ACTION_ICON.EDIT,
               auth: ['erp:warehouse:update'],
               onClick: handleEdit.bind(null, row),
             },
             {
-              label: '删除',
+              label: $t('common.delete'),
               type: 'link',
               danger: true,
               icon: ACTION_ICON.DELETE,
diff --git a/apps/web-antd/src/views/erp/stock/warehouse/modules/form.vue b/apps/web-antd/src/views/erp/stock/warehouse/modules/form.vue
index cbcda5d626455fa092ee831e96d2c06b7171bc09..f25d28cf7e795482a5d785a3a83b75cf0d69ec05 100644
--- a/apps/web-antd/src/views/erp/stock/warehouse/modules/form.vue
+++ b/apps/web-antd/src/views/erp/stock/warehouse/modules/form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { ErpWarehouseApi } from '#/api/erp/stock/warehouse';
 
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
@@ -18,9 +18,12 @@ import { $t } from '#/locales';
 import { useFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
-
-const formType = ref<'create' | 'update'>('create');
-const warehouseId = ref<number>();
+const formData = ref<ErpWarehouseApi.Warehouse>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['仓库'])
+    : $t('ui.actionTitle.create', ['仓库']);
+});
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -45,51 +48,41 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as ErpWarehouseApi.Warehouse;
     try {
-      if (formType.value === 'create') {
-        await createWarehouse(data);
-        message.success($t('ui.actionMessage.createSuccess'));
-      } else {
-        await updateWarehouse(data);
-        message.success($t('ui.actionMessage.updateSuccess'));
-      }
+      await (formData.value?.id
+        ? updateWarehouse(data)
+        : createWarehouse(data));
       // 关闭并提示
       await modalApi.close();
       emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
     } finally {
       modalApi.unlock();
     }
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
+      formData.value = undefined;
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: 'create' | 'update' }>();
-    if (!data) {
+    const data = modalApi.getData<ErpWarehouseApi.Warehouse>();
+    if (!data || !data.id) {
       return;
     }
-    formType.value = data.type;
-    warehouseId.value = data.id;
-
     modalApi.lock();
     try {
-      if (data.type === 'update' && data.id) {
-        const warehouseData = await getWarehouse(data.id);
-        await formApi.setValues(warehouseData);
-      }
+      formData.value = await getWarehouse(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
   },
 });
-
-defineExpose({
-  modalApi,
-});
 </script>
 
 <template>
-  <Modal :title="formType === 'create' ? '新增仓库' : '编辑仓库'" class="w-3/5">
+  <Modal :title="getTitle" class="w-1/2">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue
index e430bf2b682044ab7e9f1d37c707445dcd4de593..22614a60982fd14bda8d5134f69a8cdb47253be4 100644
--- a/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue
@@ -73,9 +73,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDemo01Contact(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue
index 4c009b21fd70246b16bae4d6cf8ae47775f1391a..3f4e9f79c8c87ea6b0da89733473dad168589925 100644
--- a/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue
@@ -76,9 +76,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDemo02Category(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue
index bf4c20f1a08947c4c72699ade93ed998deea0ee3..552d950ee746fcae9c00431dbb2d25560b839dd7 100644
--- a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue
@@ -73,9 +73,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDemo03Student(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/product/property/modules/property-form.vue b/apps/web-antd/src/views/mall/product/property/modules/property-form.vue
index e6765a4d84eb9d131acda42de1c6f5f465879b2b..0af8accb9c2c1e02282bc3c47fab7e8d108b9d22 100644
--- a/apps/web-antd/src/views/mall/product/property/modules/property-form.vue
+++ b/apps/web-antd/src/views/mall/product/property/modules/property-form.vue
@@ -71,9 +71,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getProperty(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/product/property/modules/value-form.vue b/apps/web-antd/src/views/mall/product/property/modules/value-form.vue
index 2674c3734ffcf032c112f9ee09f7429b97ef417e..1d4e4eef24d3c4cce242f4a5dbea6b71a92b3d6c 100644
--- a/apps/web-antd/src/views/mall/product/property/modules/value-form.vue
+++ b/apps/web-antd/src/views/mall/product/property/modules/value-form.vue
@@ -77,9 +77,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         formData.value = await getPropertyValue(data.id);
         // 设置到 values
-        if (formData.value) {
-          await formApi.setValues(formData.value);
-        }
+        await formApi.setValues(formData.value);
       } finally {
         modalApi.unlock();
       }
diff --git a/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue
index 4d3f3ed15d18a2ae46e1b3208b952dfab8187d5f..92047c4abfb6071ec7f2633bfb8ffccc7929add6 100644
--- a/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue
@@ -76,9 +76,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getCombinationActivity(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue
index 8ddedb84593d4f9802209b19a07729505f1c6980..260c7a98f06d68c21a2cb42e0784e88416b44211 100644
--- a/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue
@@ -81,9 +81,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDiscountActivity(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/promotion/diy/page/modules/form.vue b/apps/web-antd/src/views/mall/promotion/diy/page/modules/form.vue
index bdd97adfd513b6fea94e5a4311ed7d98a793d346..5045bf2404364a25a7856007c5ea0a4f9d6ca217 100644
--- a/apps/web-antd/src/views/mall/promotion/diy/page/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/diy/page/modules/form.vue
@@ -75,9 +75,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDiyPage(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/promotion/diy/template/modules/form.vue b/apps/web-antd/src/views/mall/promotion/diy/template/modules/form.vue
index 71a99d2ac9e1cffe4283e7148bffa79d0c71e85b..c262b70c7a688114feb549e754b98934d51f1896 100644
--- a/apps/web-antd/src/views/mall/promotion/diy/template/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/diy/template/modules/form.vue
@@ -82,9 +82,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDiyTemplate(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/promotion/point/activity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/point/activity/modules/form.vue
index a698f812b124a9c39187bc7d65bba083f503938c..f8103ef7a34c550057f6e0e6988070077fb86eeb 100644
--- a/apps/web-antd/src/views/mall/promotion/point/activity/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/point/activity/modules/form.vue
@@ -81,9 +81,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getPointActivity(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue
index f9cc680587f521f32510ba300154789ae84cfcdf..cd2dc5e1d7a16bc247406658e816f5953c2823c1 100644
--- a/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue
@@ -79,9 +79,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getReward(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/pay/app/data.ts b/apps/web-antd/src/views/pay/app/data.ts
index c5f3c51e597b20603101cfe1c1e70d49be4a9792..451faa62b39c1988401ba9110d64d3839c70ba6b 100644
--- a/apps/web-antd/src/views/pay/app/data.ts
+++ b/apps/web-antd/src/views/pay/app/data.ts
@@ -2,39 +2,50 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { PayAppApi } from '#/api/pay/app';
 
+import { h } from 'vue';
+
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
+import { z } from '#/adapter/form';
+import { InputUpload } from '#/components/upload';
+import { getRangePickerDefaultProps } from '#/utils';
+
+/** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
     {
-      component: 'Input',
       fieldName: 'name',
       label: '应用名',
+      component: 'Input',
       componentProps: {
         placeholder: '请输入应用名',
+        allowClear: true,
       },
     },
     {
-      component: 'Select',
       fieldName: 'status',
       label: '开启状态',
+      component: 'Select',
       componentProps: {
         placeholder: '请选择开启状态',
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        allowClear: true,
       },
     },
     {
-      component: 'RangePicker',
       fieldName: 'createTime',
       label: '创建时间',
+      component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始日期', '结束日期'],
+        ...getRangePickerDefaultProps(),
+        clearable: true,
       },
     },
   ];
 }
 
+/** 列表的字段 */
 export function useGridColumns<T = PayAppApi.App>(
   onStatusChange?: (
     newStatus: number,
@@ -42,19 +53,21 @@ export function useGridColumns<T = PayAppApi.App>(
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
-    { type: 'checkbox', width: 60 },
     {
-      title: '应用标识',
       field: 'appKey',
+      title: '应用标识',
+      minWidth: 40,
     },
     {
-      title: '应用名',
       field: 'name',
+      title: '应用名',
+      minWidth: 40,
     },
     {
       field: 'status',
       title: '状态',
       align: 'center',
+      minWidth: 40,
       cellRender: {
         attrs: { beforeChange: onStatusChange },
         name: 'CellSwitch',
@@ -68,31 +81,32 @@ export function useGridColumns<T = PayAppApi.App>(
       title: '支付宝配置',
       children: [
         {
-          title: 'APP 支付',
+          title: 'APP',
           slots: {
             default: 'alipayAppConfig',
           },
         },
         {
-          title: 'PC 网站支付',
+          title: 'PC 网站',
           slots: {
             default: 'alipayPCConfig',
           },
         },
         {
-          title: 'WAP 网站支付',
+          title: 'WAP 网站',
           slots: {
             default: 'alipayWAPConfig',
           },
+          minWidth: 10,
         },
         {
-          title: '扫码支付',
+          title: '扫码',
           slots: {
             default: 'alipayQrConfig',
           },
         },
         {
-          title: '条码支付',
+          title: '条码',
           slots: {
             default: 'alipayBarConfig',
           },
@@ -103,37 +117,38 @@ export function useGridColumns<T = PayAppApi.App>(
       title: '微信配置',
       children: [
         {
-          title: '小程序支付',
+          title: '小程序',
           slots: {
             default: 'wxLiteConfig',
           },
         },
         {
-          title: 'JSAPI 支付',
+          title: 'JSAPI',
           slots: {
             default: 'wxPubConfig',
           },
         },
         {
-          title: 'APP 支付',
+          title: 'APP',
           slots: {
             default: 'wxAppConfig',
           },
         },
         {
-          title: 'Native 支付',
+          title: 'Native',
           slots: {
             default: 'wxNativeConfig',
           },
         },
         {
-          title: 'WAP 网站支付',
+          title: 'WAP 网站',
           slots: {
             default: 'wxWapConfig',
           },
+          minWidth: 10,
         },
         {
-          title: '条码支付',
+          title: '条码',
           slots: {
             default: 'wxBarConfig',
           },
@@ -156,28 +171,27 @@ export function useGridColumns<T = PayAppApi.App>(
     },
     {
       title: '操作',
-      width: 130,
+      width: 140,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
 
-/** 新增/修改的表单 */
-export function useFormSchema(): VbenFormSchema[] {
+/** 应用新增/修改的表单 */
+export function useAppFormSchema(): VbenFormSchema[] {
   return [
     {
-      label: '应用编号',
       fieldName: 'id',
       component: 'Input',
       dependencies: {
-        show: () => false,
         triggerFields: [''],
+        show: () => false,
       },
     },
     {
-      label: '应用名',
       fieldName: 'name',
+      label: '应用名',
       component: 'Input',
       rules: 'required',
       componentProps: {
@@ -185,8 +199,8 @@ export function useFormSchema(): VbenFormSchema[] {
       },
     },
     {
-      label: '应用标识',
       fieldName: 'appKey',
+      label: '应用标识',
       component: 'Input',
       rules: 'required',
       componentProps: {
@@ -194,17 +208,19 @@ export function useFormSchema(): VbenFormSchema[] {
       },
     },
     {
-      label: '开启状态',
       fieldName: 'status',
+      label: '开启状态',
       component: 'RadioGroup',
-      rules: 'required',
+      rules: z.number().default(CommonStatusEnum.ENABLE),
       componentProps: {
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        buttonStyle: 'solid',
+        optionType: 'button',
       },
     },
     {
-      label: '支付结果的回调地址',
       fieldName: 'orderNotifyUrl',
+      label: '支付结果的回调地址',
       component: 'Input',
       rules: 'required',
       componentProps: {
@@ -212,26 +228,25 @@ export function useFormSchema(): VbenFormSchema[] {
       },
     },
     {
-      label: '退款结果的回调地址',
       fieldName: 'refundNotifyUrl',
+      label: '退款结果的回调地址',
       component: 'Input',
       rules: 'required',
       componentProps: {
-        placeholder: '请输入支付结果的回调地址',
+        placeholder: '请输入退款结果的回调地址',
       },
     },
     {
-      label: '转账结果的回调地址',
       fieldName: 'transferNotifyUrl',
+      label: '转账结果的回调地址',
       component: 'Input',
-      rules: 'required',
       componentProps: {
         placeholder: '请输入转账结果的回调地址',
       },
     },
     {
-      label: '备注',
       fieldName: 'remark',
+      label: '备注',
       component: 'Textarea',
       componentProps: {
         rows: 3,
@@ -240,3 +255,420 @@ export function useFormSchema(): VbenFormSchema[] {
     },
   ];
 }
+
+/** 渠道新增/修改的表单 */
+export function useChannelFormSchema(formType: string = ''): VbenFormSchema[] {
+  const schema: VbenFormSchema[] = [];
+  // 添加通用字段
+  schema.push(
+    {
+      component: 'Input',
+      fieldName: 'id',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      label: '应用编号',
+      fieldName: 'appId',
+      component: 'Input',
+      dependencies: {
+        show: () => false,
+        triggerFields: [''],
+      },
+    },
+    {
+      label: '渠道编码',
+      fieldName: 'code',
+      component: 'Input',
+      dependencies: {
+        show: () => false,
+        triggerFields: [''],
+      },
+    },
+    {
+      label: '渠道费率',
+      fieldName: 'feeRate',
+      component: 'InputNumber',
+      rules: 'required',
+      componentProps: {
+        placeholder: '请输入渠道费率',
+        addonAfter: '%',
+      },
+      defaultValue: 0,
+    },
+    {
+      label: '渠道状态',
+      fieldName: 'status',
+      component: 'RadioGroup',
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        buttonStyle: 'solid',
+        optionType: 'button',
+      },
+    },
+  );
+  // 根据类型添加特定字段
+  if (formType.includes('alipay_')) {
+    schema.push(
+      {
+        label: '开放平台 APPID',
+        fieldName: 'config.appId',
+        component: 'Input',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入开放平台 APPID',
+        },
+      },
+      {
+        label: '网关地址',
+        fieldName: 'config.serverUrl',
+        component: 'RadioGroup',
+        rules: 'required',
+        componentProps: {
+          options: [
+            {
+              value: 'https://openapi.alipay.com/gateway.do',
+              label: '线上环境',
+            },
+            {
+              value: 'https://openapi-sandbox.dl.alipaydev.com/gateway.do',
+              label: '沙箱环境',
+            },
+          ],
+          buttonStyle: 'solid',
+          optionType: 'button',
+        },
+      },
+      {
+        label: '算法类型',
+        fieldName: 'config.signType',
+        component: 'RadioGroup',
+        rules: 'required',
+        componentProps: {
+          options: [
+            {
+              value: 'RSA2',
+              label: 'RSA2',
+            },
+          ],
+          buttonStyle: 'solid',
+          optionType: 'button',
+        },
+        defaultValue: 'RSA2',
+      },
+      {
+        label: '公钥类型',
+        fieldName: 'config.mode',
+        component: 'RadioGroup',
+        rules: 'required',
+        componentProps: {
+          options: [
+            {
+              value: 1,
+              label: '公钥模式',
+            },
+            {
+              value: 2,
+              label: '证书模式',
+            },
+          ],
+          buttonStyle: 'solid',
+          optionType: 'button',
+        },
+      },
+      {
+        label: '应用私钥',
+        fieldName: 'config.privateKey',
+        component: 'Textarea',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入应用私钥',
+          rows: 3,
+        },
+      },
+      {
+        label: '支付宝公钥',
+        fieldName: 'config.alipayPublicKey',
+        component: 'Textarea',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入支付宝公钥',
+          rows: 3,
+        },
+        dependencies: {
+          show(values: any) {
+            return values?.config?.mode === 1;
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '商户公钥应用证书',
+        fieldName: 'config.appCertContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: { rows: 3, placeholder: '请上传商户公钥应用证书' },
+          fileUploadProps: {
+            accept: ['crt'],
+          },
+        }),
+        rules: 'required',
+        dependencies: {
+          show(values: any) {
+            return values?.config?.mode === 2;
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '支付宝公钥证书',
+        fieldName: 'config.alipayPublicCertContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: { rows: 3, placeholder: '请上传支付宝公钥证书' },
+          fileUploadProps: {
+            accept: ['crt'],
+          },
+        }),
+        rules: 'required',
+        dependencies: {
+          show(values: any) {
+            return values?.config?.mode === 2;
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '根证书',
+        fieldName: 'config.rootCertContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: { rows: 3, placeholder: '请上传根证书' },
+          fileUploadProps: {
+            accept: ['crt'],
+          },
+        }),
+        rules: 'required',
+        dependencies: {
+          show(values: any) {
+            return values?.config?.mode === 2;
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '接口内容加密方式',
+        fieldName: 'config.encryptType',
+        component: 'RadioGroup',
+        rules: 'required',
+        componentProps: {
+          options: [
+            {
+              value: 'NONE',
+              label: '无加密',
+            },
+            {
+              value: 'AES',
+              label: 'AES',
+            },
+          ],
+          buttonStyle: 'solid',
+          optionType: 'button',
+        },
+        defaultValue: 'NONE',
+      },
+      {
+        label: '接口内容加密密钥',
+        fieldName: 'config.encryptKey',
+        component: 'Input',
+        rules: 'required',
+        dependencies: {
+          show(values: any) {
+            return values?.config?.encryptType === 'AES';
+          },
+          triggerFields: ['config.encryptType', 'encryptType', 'config'],
+        },
+      },
+    );
+  } else if (formType.includes('wx_')) {
+    schema.push(
+      {
+        label: '微信 APPID',
+        fieldName: 'config.appId',
+        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/extend/merchant_appid/mapay_platform/account_manage]查看 APPID',
+        component: 'Input',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入微信 APPID',
+        },
+      },
+      {
+        label: '商户号',
+        fieldName: 'config.mchId',
+        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/extend/pay_setting]查看商户号',
+        component: 'Input',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入商户号',
+        },
+      },
+      {
+        label: 'API 版本',
+        fieldName: 'config.apiVersion',
+        component: 'RadioGroup',
+        rules: 'required',
+        componentProps: {
+          options: [
+            {
+              label: 'v2',
+              value: 'v2',
+            },
+            {
+              label: 'v3',
+              value: 'v3',
+            },
+          ],
+          buttonStyle: 'solid',
+          optionType: 'button',
+        },
+      },
+      {
+        label: '商户密钥',
+        fieldName: 'config.mchKey',
+        component: 'Input',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入商户密钥',
+        },
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v2';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: 'apiclient_cert.p12 证书',
+        fieldName: 'config.keyContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: {
+            rows: 3,
+            placeholder: '请上传 apiclient_cert.p12 证书',
+          },
+          fileUploadProps: {
+            accept: ['p12'],
+          },
+        }),
+        rules: 'required',
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v2';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: 'API V3 密钥',
+        fieldName: 'config.apiV3Key',
+        component: 'Input',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入 API V3 密钥',
+        },
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v3';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: 'apiclient_key.pem 证书',
+        fieldName: 'config.privateKeyContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: {
+            rows: 3,
+            placeholder: '请上传 apiclient_key.pem 证书',
+          },
+          fileUploadProps: {
+            accept: ['pem'],
+          },
+        }),
+        rules: 'required',
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v3';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '证书序列号',
+        fieldName: 'config.certSerialNo',
+        component: 'Input',
+        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/core/cert/api_cert#/api-cert-manage]查看证书序列号',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入证书序列号',
+        },
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v3';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: 'public_key.pem 证书',
+        fieldName: 'config.publicKeyContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: {
+            rows: 3,
+            placeholder: '请上传 public_key.pem 证书',
+          },
+          fileUploadProps: {
+            accept: ['pem'],
+          },
+        }),
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v3';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '公钥 ID',
+        fieldName: 'config.publicKeyId',
+        component: 'Input',
+        help: '微信支付公钥产品简介及使用说明[https://pay.weixin.qq.com/doc/v3/merchant/4012153196]',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入公钥 ID',
+        },
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v3';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+    );
+  }
+  // 添加备注字段（所有类型都有）
+  schema.push({
+    label: '备注',
+    fieldName: 'remark',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入备注',
+    },
+  });
+  return schema;
+}
diff --git a/apps/web-antd/src/views/pay/app/index.vue b/apps/web-antd/src/views/pay/app/index.vue
index 66c91dc85bd419ba0cdd2446040ae5783582dfae..8163d616c99b7577d9e43bf45c8b970b95b7eeef 100644
--- a/apps/web-antd/src/views/pay/app/index.vue
+++ b/apps/web-antd/src/views/pay/app/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ActionItem, VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { PayAppApi } from '#/api/pay/app';
 
 import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
@@ -8,52 +8,59 @@ import { CommonStatusEnum, PayChannelEnum } from '@vben/constants';
 import { message } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { changeAppStatus, deleteApp, getAppPage } from '#/api/pay/app';
+import { deleteApp, getAppPage, updateAppStatus } from '#/api/pay/app';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import appFrom from './modules/app-form.vue';
-import channelFrom from './modules/channel-form.vue';
+import AppForm from './modules/app-form.vue';
+import ChannelForm from './modules/channel-form.vue';
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
 const [AppFormModal, appFormModalApi] = useVbenModal({
-  connectedComponent: appFrom,
+  connectedComponent: AppForm,
   destroyOnClose: true,
 });
 
 const [ChannelFormModal, channelFormModalApi] = useVbenModal({
-  connectedComponent: channelFrom,
+  connectedComponent: ChannelForm,
   destroyOnClose: true,
 });
 
+/** 创建应用 */
 function handleCreate() {
   appFormModalApi.setData(null).open();
 }
 
+/** 编辑应用 */
 function handleEdit(row: PayAppApi.App) {
   appFormModalApi.setData({ id: row.id }).open();
 }
 
+/** 创建/编辑渠道 */
+async function handleChannelForm(row: PayAppApi.App, payCode: string) {
+  channelFormModalApi.setData({ appId: row.id, code: payCode }).open();
+}
+
+/** 删除应用 */
 async function handleDelete(row: PayAppApi.App) {
   const hideLoading = message.loading({
     content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
   });
   try {
-    await deleteApp(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    await deleteApp(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
-/** 更新状态 */
+/** 更新应用状态 */
 async function handleStatusChange(
   newStatus: number,
   row: PayAppApi.App,
@@ -65,8 +72,8 @@ async function handleStatusChange(
     })
       .then(async () => {
         // 更新状态
-        const res = await changeAppStatus({
-          id: row.id as number,
+        const res = await updateAppStatus({
+          id: row.id!,
           status: newStatus,
         });
         if (res) {
@@ -83,21 +90,22 @@ async function handleStatusChange(
   });
 }
 
-/**
- * 根据渠道编码判断渠道列表中是否存在
- *
- * @param channels 渠道列表
- * @param channelCode 渠道编码
- */
-function isChannelExists(channels: string[], channelCode: string) {
-  if (!channels) {
-    return false;
-  }
-  return channels.includes(channelCode);
-}
-
-async function openChannelForm(row: PayAppApi.App, payCode: string) {
-  channelFormModalApi.setData({ id: row.id, payCode }).open();
+/** 生成渠道配置按钮 */
+function createChannelConfigAction(
+  row: PayAppApi.App,
+  channelCode: string,
+): ActionItem[] {
+  const exists = row.channelCodes?.includes(channelCode);
+  return [
+    {
+      type: 'primary',
+      size: 'small',
+      icon: exists ? 'lucide:check' : 'lucide:x',
+      danger: !exists,
+      shape: 'circle',
+      onClick: handleChannelForm.bind(null, row, channelCode),
+    },
+  ];
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -121,6 +129,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -136,10 +145,10 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <DocAlert title="支付功能开启" url="https://doc.iocoder.cn/pay/build/" />
     </template>
 
-    <AppFormModal @success="onRefresh" />
-    <ChannelFormModal @success="onRefresh" />
+    <AppFormModal @success="handleRefresh" />
+    <ChannelFormModal @success="handleRefresh" />
 
-    <Grid>
+    <Grid table-title="应用列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
@@ -179,337 +188,79 @@ const [Grid, gridApi] = useVbenVxeGrid({
       </template>
       <template #alipayAppConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_APP.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_APP.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_APP.code,
-              ),
-            },
-          ]"
+          :actions="
+            createChannelConfigAction(row, PayChannelEnum.ALIPAY_APP.code)
+          "
         />
       </template>
       <template #alipayPCConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_PC.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_PC.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_PC.code,
-              ),
-            },
-          ]"
+          :actions="
+            createChannelConfigAction(row, PayChannelEnum.ALIPAY_PC.code)
+          "
         />
       </template>
       <template #alipayWAPConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_WAP.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_WAP.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_WAP.code,
-              ),
-            },
-          ]"
+          :actions="
+            createChannelConfigAction(row, PayChannelEnum.ALIPAY_WAP.code)
+          "
         />
       </template>
       <template #alipayQrConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_QR.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_QR.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_QR.code,
-              ),
-            },
-          ]"
+          :actions="
+            createChannelConfigAction(row, PayChannelEnum.ALIPAY_QR.code)
+          "
         />
       </template>
       <template #alipayBarConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_BAR.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_BAR.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_BAR.code,
-              ),
-            },
-          ]"
+          :actions="
+            createChannelConfigAction(row, PayChannelEnum.ALIPAY_BAR.code)
+          "
         />
       </template>
       <template #wxLiteConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_LITE.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_LITE.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_LITE.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.WX_LITE.code)"
         />
       </template>
       <template #wxPubConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_PUB.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_PUB.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_PUB.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.WX_PUB.code)"
         />
       </template>
       <template #wxAppConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_APP.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_APP.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_APP.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.WX_APP.code)"
         />
       </template>
       <template #wxNativeConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_NATIVE.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_NATIVE.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_NATIVE.code,
-              ),
-            },
-          ]"
+          :actions="
+            createChannelConfigAction(row, PayChannelEnum.WX_NATIVE.code)
+          "
         />
       </template>
       <template #wxWapConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_WAP.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_WAP.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_WAP.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.WX_WAP.code)"
         />
       </template>
       <template #wxBarConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_BAR.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_BAR.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_BAR.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.WX_BAR.code)"
         />
       </template>
       <template #walletConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WALLET.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WALLET.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WALLET.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.WALLET.code)"
         />
       </template>
       <template #mockConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              type: 'primary',
-              size: 'small',
-              icon: isChannelExists(row.channelCodes, PayChannelEnum.MOCK.code)
-                ? 'lucide:check'
-                : 'lucide:x',
-              danger: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.MOCK.code,
-              ),
-              shape: 'circle',
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.MOCK.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.MOCK.code)"
         />
       </template>
     </Grid>
diff --git a/apps/web-antd/src/views/pay/app/modules/app-form.vue b/apps/web-antd/src/views/pay/app/modules/app-form.vue
index 2b6d5c266eb0ae4e55fc5e59ac166f6149da5933..dd3a1eedafe79ab425df4568f400081625d19eaa 100644
--- a/apps/web-antd/src/views/pay/app/modules/app-form.vue
+++ b/apps/web-antd/src/views/pay/app/modules/app-form.vue
@@ -11,14 +11,14 @@ import { message } from 'ant-design-vue';
 import { useVbenForm } from '#/adapter/form';
 import { createApp, getApp, updateApp } from '#/api/pay/app';
 
-import { useFormSchema } from '../data';
+import { useAppFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
 const formData = ref<PayAppApi.App>();
 const title = 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({
@@ -30,7 +30,7 @@ const [Form, formApi] = useVbenForm({
     labelWidth: 160,
   },
   layout: 'horizontal',
-  schema: useFormSchema(),
+  schema: useAppFormSchema(),
   showDefaultActions: false,
 });
 
@@ -53,7 +53,7 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.unlock();
     }
   },
-  onOpenChange: async (isOpen) => {
+  async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
       return;
@@ -77,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({
 });
 </script>
 <template>
-  <Modal :close-on-click-modal="false" :title="title" class="w-2/5">
+  <Modal :title="title" class="w-2/5">
     <Form />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/pay/app/modules/channel-form.vue b/apps/web-antd/src/views/pay/app/modules/channel-form.vue
index a0cdc31cf7f2a694f3ae9c4f770728c22d818857..83ad9281cef33e3b6d20ed442d79a4bbacb91d88 100644
--- a/apps/web-antd/src/views/pay/app/modules/channel-form.vue
+++ b/apps/web-antd/src/views/pay/app/modules/channel-form.vue
@@ -12,15 +12,14 @@ import { message } from 'ant-design-vue';
 import { useVbenForm } from '#/adapter/form';
 import { createChannel, getChannel, updateChannel } from '#/api/pay/channel';
 
-import { channelSchema } from './data';
+import { useChannelFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
 const formData = ref<any>();
-const formType = ref<string>('');
 const title = computed(() => {
   return formData.value?.id === 0
-    ? $t('ui.actionTitle.create', '应用')
-    : $t('ui.actionTitle.edit', '应用');
+    ? $t('ui.actionTitle.create', ['渠道'])
+    : $t('ui.actionTitle.edit', ['渠道']);
 });
 
 const [Form, formApi] = useVbenForm({
@@ -44,17 +43,9 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as PayChannelApi.Channel;
-    // 只保留表单中实际存在的字段，且值不为 undefined
-    const data2 = Object.fromEntries(
-      Object.entries(data).filter(([key, value]) => {
-        // 检查字段是否在表单中存在，且值不为 undefined
-        return key in data && value !== undefined;
-      }),
-    );
-    const data3 = { ...formData.value, ...data2 };
-    data3.config = JSON.stringify(data3.config);
+    data.config = JSON.stringify(data.config);
     try {
-      await (data3.id ? updateChannel(data3) : createChannel(data3));
+      await (data.id ? updateChannel(data) : createChannel(data));
       // 关闭并提示
       await modalApi.close();
       emit('success');
@@ -63,94 +54,75 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.unlock();
     }
   },
-  onOpenChange: async (isOpen) => {
+  async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
       return;
     }
     // 加载数据
-    const { id, payCode } = modalApi.getData() as {
-      id?: number;
-      payCode?: string;
+    const { appId, code } = modalApi.getData() as {
+      appId?: number;
+      code?: string;
     };
-    if (!id || !payCode) {
+    if (!appId || !code) {
       return;
     }
     modalApi.lock();
-    formType.value = payCode;
-    if (payCode.includes('alipay_')) {
-      formData.value = {
-        appId: id,
-        code: payCode,
-        status: CommonStatusEnum.ENABLE,
-        remark: '',
-        feeRate: null,
-        config: {
-          appId: '',
-          serverUrl: null,
-          signType: 'RSA2',
-          mode: null,
-          privateKey: '',
-          alipayPublicKey: '',
-          appCertContent: '',
-          alipayPublicCertContent: '',
-          rootCertContent: '',
-          encryptType: '',
-          encryptKey: '',
-        },
+    formData.value = {
+      appId,
+      code,
+      status: CommonStatusEnum.ENABLE,
+      remark: '',
+      feeRate: 0,
+      config: {},
+    };
+    if (code.includes('alipay_')) {
+      formData.value.config = {
+        appId: undefined,
+        serverUrl: undefined,
+        signType: 'RSA2',
+        mode: undefined,
+        privateKey: undefined,
+        alipayPublicKey: undefined,
+        appCertContent: undefined,
+        alipayPublicCertContent: undefined,
+        rootCertContent: undefined,
+        encryptType: undefined,
+        encryptKey: undefined,
       };
-    } else if (payCode.includes('mock')) {
-      formData.value = {
-        appId: id,
-        code: payCode,
-        status: CommonStatusEnum.ENABLE,
-        remark: '',
-        feeRate: 0,
-        config: {
-          name: 'mock-conf',
-        },
+    } else if (code.includes('mock')) {
+      formData.value.config = {
+        name: 'mock-conf',
       };
-    } else if (payCode.includes('wallet')) {
-      formData.value = {
-        appId: id,
-        code: payCode,
-        status: CommonStatusEnum.ENABLE,
-        remark: '',
-        feeRate: 0,
+    } else if (code.includes('wallet')) {
+      formData.value.config = {
         config: {
-          name: 'mock-conf',
+          name: 'wallet-conf',
         },
       };
-    } else if (payCode.includes('wx')) {
-      formData.value = {
-        appId: id,
-        code: payCode,
-        status: CommonStatusEnum.ENABLE,
-        feeRate: undefined,
-        remark: '',
-        config: {
-          appId: '',
-          mchId: '',
-          apiVersion: '',
-          mchKey: '',
-          keyContent: '',
-          privateKeyContent: '',
-          certSerialNo: '',
-          apiV3Key: '',
-          publicKeyContent: '',
-          publicKeyId: '',
-        },
+    } else if (code.includes('wx')) {
+      formData.value.config = {
+        appId: undefined,
+        mchId: undefined,
+        apiVersion: undefined,
+        mchKey: undefined,
+        keyContent: undefined,
+        privateKeyContent: undefined,
+        certSerialNo: undefined,
+        apiV3Key: undefined,
+        publicKeyContent: undefined,
+        publicKeyId: undefined,
       };
     }
 
     try {
-      const res = await getChannel(id, payCode);
-      formData.value = {
-        ...res,
-        config: {
-          ...JSON.parse(res.config),
-        },
-      };
+      const res = await getChannel(appId, code);
+      if (res) {
+        formData.value = {
+          ...res,
+          config: JSON.parse(res.config),
+        };
+      }
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
@@ -161,7 +133,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal :close-on-click-modal="false" :title="title" class="w-2/5">
-    <Form :schema="channelSchema(formType)" />
+  <Modal :title="title" class="w-2/5">
+    <Form :schema="useChannelFormSchema(formData?.code)" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/pay/app/modules/data.ts b/apps/web-antd/src/views/pay/app/modules/data.ts
deleted file mode 100644
index 59c9b4a0a0224cd8b069226439702e877ca1e535..0000000000000000000000000000000000000000
--- a/apps/web-antd/src/views/pay/app/modules/data.ts
+++ /dev/null
@@ -1,492 +0,0 @@
-import type { VbenFormSchema } from '#/adapter/form';
-
-import { h } from 'vue';
-
-import { DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
-
-import { InputUpload } from '#/components/upload';
-
-export function channelSchema(formType: string): VbenFormSchema[] {
-  if (formType.includes('alipay_')) {
-    return [
-      {
-        label: '应用编号',
-        fieldName: 'appId',
-        component: 'Input',
-        dependencies: {
-          show: () => false,
-          triggerFields: [''],
-        },
-      },
-      {
-        label: '渠道费率',
-        fieldName: 'feeRate',
-        component: 'InputNumber',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入渠道费率',
-          addonAfter: '%',
-        },
-        defaultValue: 0,
-      },
-      {
-        label: '开放平台 APPID',
-        fieldName: 'config.appId',
-        component: 'Input',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入开放平台 APPID',
-        },
-      },
-      {
-        label: '渠道状态',
-        fieldName: 'status',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        },
-        defaultValue: 0,
-      },
-      {
-        label: '网关地址',
-        fieldName: 'config.serverUrl',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: [
-            {
-              value: 'https://openapi.alipay.com/gateway.do',
-              label: '线上环境',
-            },
-            {
-              value: 'https://openapi-sandbox.dl.alipaydev.com/gateway.do',
-              label: '沙箱环境',
-            },
-          ],
-        },
-      },
-      {
-        label: '算法类型',
-        fieldName: 'config.signType',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: [
-            {
-              value: 'RSA2',
-              label: 'RSA2',
-            },
-          ],
-        },
-        defaultValue: 'RSA2',
-      },
-      {
-        label: '公钥类型',
-        fieldName: 'config.mode',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: [
-            {
-              value: 1,
-              label: '公钥模式',
-            },
-            {
-              value: 2,
-              label: '证书模式',
-            },
-          ],
-        },
-      },
-      {
-        label: '应用私钥',
-        fieldName: 'config.privateKey',
-        component: 'Textarea',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入应用私钥',
-          rows: 8,
-        },
-      },
-      {
-        label: '支付宝公钥',
-        fieldName: 'config.alipayPublicKey',
-        component: 'Textarea',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入支付宝公钥',
-          rows: 8,
-        },
-        dependencies: {
-          show(values) {
-            return values?.config?.mode === 1;
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '商户公钥应用证书',
-        fieldName: 'config.appCertContent',
-        component: h(InputUpload, {
-          inputType: 'textarea',
-          textareaProps: { rows: 8, placeholder: '请上传商户公钥应用证书' },
-          fileUploadProps: {
-            accept: ['crt'],
-          },
-        }),
-        rules: 'required',
-        dependencies: {
-          show(values) {
-            return values?.config?.mode === 2;
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '支付宝公钥证书',
-        fieldName: 'config.alipayPublicCertContent',
-        component: h(InputUpload, {
-          inputType: 'textarea',
-          textareaProps: { rows: 8, placeholder: '请上传支付宝公钥证书' },
-          fileUploadProps: {
-            accept: ['crt'],
-          },
-        }),
-        rules: 'required',
-        dependencies: {
-          show(values) {
-            return values?.config?.mode === 2;
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '根证书',
-        fieldName: 'config.rootCertContent',
-        component: h(InputUpload, {
-          inputType: 'textarea',
-          textareaProps: { rows: 8, placeholder: '请上传根证书' },
-          fileUploadProps: {
-            accept: ['crt'],
-          },
-        }),
-        rules: 'required',
-        dependencies: {
-          show(values) {
-            return values?.config?.mode === 2;
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '接口内容加密方式',
-        fieldName: 'config.encryptType',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: [
-            {
-              value: 'NONE',
-              label: '无加密',
-            },
-            {
-              value: 'AES',
-              label: 'AES',
-            },
-          ],
-        },
-        defaultValue: 'NONE',
-      },
-      {
-        label: '接口内容加密密钥',
-        fieldName: 'config.encryptKey',
-        component: 'Input',
-        rules: 'required',
-        dependencies: {
-          show(values) {
-            return values?.config?.encryptType === 'AES';
-          },
-          triggerFields: ['config.encryptType', 'encryptType', 'config'],
-        },
-      },
-      {
-        label: '备注',
-        fieldName: 'remark',
-        component: 'Input',
-        componentProps: {
-          placeholder: '请输入备注',
-        },
-      },
-    ];
-  } else if (formType.includes('mock') || formType.includes('wallet')) {
-    return [
-      {
-        label: '应用编号',
-        fieldName: 'appId',
-        component: 'Input',
-        dependencies: {
-          show: () => false,
-          triggerFields: [''],
-        },
-      },
-      {
-        label: '渠道状态',
-        fieldName: 'status',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        },
-        defaultValue: 0,
-      },
-      {
-        label: '渠道编码',
-        fieldName: 'code',
-        component: 'Input',
-        dependencies: {
-          show: () => false,
-          triggerFields: [''],
-        },
-      },
-      {
-        label: '渠道费率',
-        fieldName: 'feeRate',
-        component: 'InputNumber',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入渠道费率',
-          addonAfter: '%',
-        },
-        defaultValue: 0,
-        dependencies: {
-          show: () => false,
-          triggerFields: [''],
-        },
-      },
-      {
-        label: '备注',
-        fieldName: 'remark',
-        component: 'Input',
-        componentProps: {
-          placeholder: '请输入备注',
-        },
-      },
-    ];
-  } else if (formType.includes('wx')) {
-    return [
-      {
-        label: '应用编号',
-        fieldName: 'appId',
-        component: 'Input',
-        dependencies: {
-          show: () => false,
-          triggerFields: [''],
-        },
-      },
-      {
-        label: '渠道编码',
-        fieldName: 'code',
-        component: 'Input',
-        dependencies: {
-          show: () => false,
-          triggerFields: [''],
-        },
-      },
-      {
-        label: '渠道费率',
-        fieldName: 'feeRate',
-        component: 'InputNumber',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入渠道费率',
-          addonAfter: '%',
-        },
-        defaultValue: 0,
-      },
-      {
-        label: '微信 APPID',
-        fieldName: 'config.appId',
-        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/extend/merchant_appid/mapay_platform/account_manage]查看 APPID',
-        component: 'Input',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入微信 APPID',
-        },
-      },
-      {
-        label: '商户号',
-        fieldName: 'config.mchId',
-        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/extend/pay_setting]查看商户号',
-        component: 'Input',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入商户号',
-        },
-      },
-      {
-        label: '渠道状态',
-        fieldName: 'status',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        },
-        defaultValue: 0,
-      },
-      {
-        label: 'API 版本',
-        fieldName: 'config.apiVersion',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: [
-            {
-              label: 'v2',
-              value: 'v2',
-            },
-            {
-              label: 'v3',
-              value: 'v3',
-            },
-          ],
-        },
-      },
-      {
-        label: '商户密钥',
-        fieldName: 'config.mchKey',
-        component: 'Input',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入商户密钥',
-        },
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v2';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: 'apiclient_cert.p12 证书',
-        fieldName: 'config.keyContent',
-        component: h(InputUpload, {
-          inputType: 'textarea',
-          textareaProps: {
-            rows: 8,
-            placeholder: '请上传 apiclient_cert.p12 证书',
-          },
-          fileUploadProps: {
-            accept: ['p12'],
-          },
-        }),
-        rules: 'required',
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v2';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: 'API V3 密钥',
-        fieldName: 'config.apiV3Key',
-        component: 'Input',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入 API V3 密钥',
-        },
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v3';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: 'apiclient_key.pem 证书',
-        fieldName: 'config.privateKeyContent',
-        component: h(InputUpload, {
-          inputType: 'textarea',
-          textareaProps: {
-            rows: 8,
-            placeholder: '请上传 apiclient_key.pem 证书',
-          },
-          fileUploadProps: {
-            accept: ['pem'],
-          },
-        }),
-        rules: 'required',
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v3';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '证书序列号',
-        fieldName: 'config.certSerialNo',
-        component: 'Input',
-        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/core/cert/api_cert#/api-cert-manage]查看证书序列号',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入证书序列号',
-        },
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v3';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: 'public_key.pem 证书',
-        fieldName: 'config.publicKeyContent',
-        component: h(InputUpload, {
-          inputType: 'textarea',
-          textareaProps: {
-            rows: 8,
-            placeholder: '请上传 public_key.pem 证书',
-          },
-          fileUploadProps: {
-            accept: ['pem'],
-          },
-        }),
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v3';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '公钥 ID',
-        fieldName: 'config.publicKeyId',
-        component: 'Input',
-        help: '微信支付公钥产品简介及使用说明[https://pay.weixin.qq.com/doc/v3/merchant/4012153196]',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入公钥 ID',
-        },
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v3';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '备注',
-        fieldName: 'remark',
-        component: 'Input',
-        componentProps: {
-          placeholder: '请输入备注',
-        },
-      },
-    ];
-  } else {
-    return [];
-  }
-}
diff --git a/apps/web-antd/src/views/pay/cashier/data.ts b/apps/web-antd/src/views/pay/cashier/data.ts
index 0918a6f100e7a3678f5ea65017d6b757b41db162..eb0cec95711dc2a692ba5fbfe083074e609346e3 100644
--- a/apps/web-antd/src/views/pay/cashier/data.ts
+++ b/apps/web-antd/src/views/pay/cashier/data.ts
@@ -40,6 +40,7 @@ export const channelsAlipay = [
     code: 'alipay_bar',
   },
 ];
+
 export const channelsWechat = [
   {
     name: '微信公众号支付',
@@ -67,6 +68,7 @@ export const channelsWechat = [
     code: 'wx_bar',
   },
 ];
+
 export const channelsMock = [
   {
     name: '钱包支付',
diff --git a/apps/web-antd/src/views/pay/cashier/index.vue b/apps/web-antd/src/views/pay/cashier/index.vue
index 31662f4389734bcf01ea9fcfd9f3761a2e5b2643..dcbac0a633861bee9f111deb3adb7a0572153656 100644
--- a/apps/web-antd/src/views/pay/cashier/index.vue
+++ b/apps/web-antd/src/views/pay/cashier/index.vue
@@ -28,22 +28,21 @@ import { channelsAlipay, channelsMock, channelsWechat } from './data';
 
 defineOptions({ name: 'PayCashier' });
 
-const [Modal, modalApi] = useVbenModal({
-  showConfirmButton: false,
-  destroyOnClose: true,
-});
-
 const route = useRoute();
-const { push } = useRouter(); // 路由
+const { push } = useRouter();
 const { closeCurrentTab } = useTabs();
 
 const id = ref(); // 支付单号
 const title = ref('支付订单');
 const returnUrl = ref<string>(); // 支付完的回调地址
-
 const payOrder = ref<PayOrderApi.Order>();
 const interval = ref<any>(undefined); // 定时任务，轮询是否完成支付
 
+const [Modal, modalApi] = useVbenModal({
+  showConfirmButton: false,
+  destroyOnClose: true,
+});
+
 /** 展示形式：二维码 */
 const qrCode = ref({
   url: '',
@@ -87,9 +86,11 @@ async function getDetail() {
     goReturnUrl('close');
     return;
   }
+  // 2. 正常展示支付信息
   payOrder.value = res;
 }
 
+/** 处理支付 */
 function handlePay(channelCode: string) {
   switch (channelCode) {
     // 条形码支付，需要特殊处理
@@ -129,6 +130,7 @@ function handlePay(channelCode: string) {
   }
 }
 
+/** 提交支付 */
 async function submit(channelCode: string) {
   try {
     const submitParam = {
@@ -165,9 +167,7 @@ async function submit(channelCode: string) {
 
     // 打开轮询任务
     createQueryInterval();
-  } finally {
-    // message.success('支付成功！')
-  }
+  } finally {}
 }
 
 /** 构建提交支付的额外参数 */
@@ -291,10 +291,12 @@ function goReturnUrl(payResult: string) {
   }
 }
 
+/** 页面加载时，获取支付信息 */
 onMounted(async () => {
   await getDetail();
 });
 
+/** 页面卸载时，清理定时任务 */
 onBeforeUnmount(() => {
   clearQueryInterval();
 });
diff --git a/apps/web-antd/src/views/pay/demo/order/data.ts b/apps/web-antd/src/views/pay/demo/order/data.ts
index 9e61188f0fc91cdff899779777d3a156a7ea97d7..9f4b30aa7045ccdec5b08b9eb3c01f2212c176cf 100644
--- a/apps/web-antd/src/views/pay/demo/order/data.ts
+++ b/apps/web-antd/src/views/pay/demo/order/data.ts
@@ -2,32 +2,35 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { DICT_TYPE } from '@vben/constants';
+import { formatDateTime } from '@vben/utils';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
     {
-      component: 'Input',
       fieldName: 'id',
+      component: 'Input',
       dependencies: {
         triggerFields: [''],
         show: () => false,
       },
     },
     {
-      component: 'Select',
       fieldName: 'spuId',
       label: '商品',
-      rules: 'required',
+      component: 'Select',
       componentProps: {
         options: [
-          { label: '华为手机 --- 1.00元', value: 1, price: 1 },
-          { label: '小米电视 --- 10.00元', value: 2, price: 10 },
-          { label: '苹果手表 --- 100.00元', value: 3, price: 100 },
-          { label: '华硕笔记本 --- 1000.00元', value: 4, price: 1000 },
-          { label: '蔚来汽车 --- 200000.00元', value: 5, price: 200_000 },
+          { label: '华为手机 --- 1.00元', value: 1 },
+          { label: '小米电视 --- 10.00元', value: 2 },
+          { label: '苹果手表 --- 100.00元', value: 3 },
+          { label: '华硕笔记本 --- 1000.00元', value: 4 },
+          { label: '蔚来汽车 --- 200000.00元', value: 5 },
         ],
+        placeholder: '请选择下单商品',
+        allowClear: true,
       },
+      rules: 'required',
     },
   ];
 }
@@ -38,37 +41,45 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '订单编号',
+      minWidth: 100,
     },
     {
       field: 'userId',
       title: '用户编号',
+      minWidth: 100,
     },
     {
       field: 'spuName',
       title: '商品名字',
+      minWidth: 150,
     },
     {
       field: 'price',
       title: '支付价格',
+      minWidth: 100,
       formatter: 'formatAmount2',
     },
     {
       field: 'refundPrice',
       title: '退款金额',
+      minWidth: 100,
       formatter: 'formatAmount2',
     },
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'payOrderId',
       title: '支付单号',
+      minWidth: 120,
     },
     {
       field: 'payStatus',
       title: '是否支付',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
@@ -77,16 +88,26 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'payTime',
       title: '支付时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'refundTime',
       title: '退款时间',
-      slots: { default: 'refundTime' },
+      minWidth: 180,
+      formatter: ({ cellValue, row }) => {
+        if (cellValue) {
+          return formatDateTime(cellValue);
+        }
+        if (row.payRefundId) {
+          return '退款中，等待退款结果';
+        }
+        return '';
+      },
     },
     {
       title: '操作',
-      width: 200,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-antd/src/views/pay/demo/order/index.vue b/apps/web-antd/src/views/pay/demo/order/index.vue
index f143cc6a3d17665c1de425419ecca0781b1d04e2..35273adffc7fc22224d5d5158c8a9d15cd3fac5c 100644
--- a/apps/web-antd/src/views/pay/demo/order/index.vue
+++ b/apps/web-antd/src/views/pay/demo/order/index.vue
@@ -5,13 +5,11 @@ import type { DemoOrderApi } from '#/api/pay/demo/order';
 import { useRouter } from 'vue-router';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
-import { formatDateTime } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getDemoOrderPage, refundDemoOrder } from '#/api/pay/demo/order';
-import { $t } from '#/locales';
 
 import { useGridColumns } from './data';
 import Form from './modules/form.vue';
@@ -24,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({
 const router = useRouter();
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -52,10 +50,8 @@ async function handleRefund(row: DemoOrderApi.Order) {
   });
   try {
     await refundDemoOrder(row.id as number);
-    message.success({
-      content: '退款成功',
-    });
-    onRefresh();
+    message.success('发起退款成功！');
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -79,10 +75,10 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
-      search: true,
     },
   } as VxeTableGridOptions<DemoOrderApi.Order>,
 });
@@ -109,13 +105,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
 
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="示例订单列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
             {
-              label: $t('ui.actionTitle.create', ['示例订单']),
+              label: '发起订单',
               type: 'primary',
               icon: ACTION_ICON.ADD,
               onClick: handleCreate,
@@ -123,16 +119,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
           ]"
         />
       </template>
-      <template #refundTime="{ row }">
-        <span v-if="row.refundTime">{{ formatDateTime(row.refundTime) }}</span>
-        <span v-else-if="row.payRefundId">退款中，等待退款结果</span>
-      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[
             {
               label: '前往支付',
               type: 'link',
+              icon: ACTION_ICON.ADD,
               ifShow: !row.payStatus,
               onClick: handlePay.bind(null, row),
             },
@@ -140,6 +133,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: '发起退款',
               type: 'link',
               danger: true,
+              icon: ACTION_ICON.EDIT,
               ifShow: row.payStatus && !row.payRefundId,
               popConfirm: {
                 title: '确定发起退款吗？',
diff --git a/apps/web-antd/src/views/pay/demo/order/modules/form.vue b/apps/web-antd/src/views/pay/demo/order/modules/form.vue
index cf97334cd4288483398e4e2fdf6235bd2500c5c9..bdec3b4ab6dfc70b09f0e02f6de9b37d631cb421 100644
--- a/apps/web-antd/src/views/pay/demo/order/modules/form.vue
+++ b/apps/web-antd/src/views/pay/demo/order/modules/form.vue
@@ -49,7 +49,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="$t('ui.actionTitle.create', ['退款订单'])">
+  <Modal class="w-1/4" title="发起订单">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/pay/demo/withdraw/data.ts b/apps/web-antd/src/views/pay/demo/withdraw/data.ts
index ebf9b855301766c77daab26263c4cf4677ac8871..8b2c1b547031abeb858d1e373c02d6af0917da52 100644
--- a/apps/web-antd/src/views/pay/demo/withdraw/data.ts
+++ b/apps/web-antd/src/views/pay/demo/withdraw/data.ts
@@ -7,34 +7,38 @@ import { DICT_TYPE } from '@vben/constants';
 export function useFormSchema(): VbenFormSchema[] {
   return [
     {
-      component: 'Input',
       fieldName: 'id',
+      component: 'Input',
       dependencies: {
         triggerFields: [''],
         show: () => false,
       },
     },
     {
-      component: 'Input',
       fieldName: 'subject',
       label: '提现标题',
+      component: 'Input',
       rules: 'required',
+      componentProps: {
+        placeholder: '请输入提现标题',
+      },
     },
     {
-      component: 'InputNumber',
       fieldName: 'price',
       label: '提现金额',
+      component: 'InputNumber',
       rules: 'required',
       componentProps: {
         min: 1,
         precision: 2,
         step: 0.01,
+        placeholder: '请输入提现金额',
       },
     },
     {
-      component: 'Select',
       fieldName: 'type',
       label: '提现类型',
+      component: 'Select',
       rules: 'required',
       componentProps: {
         options: [
@@ -42,19 +46,46 @@ export function useFormSchema(): VbenFormSchema[] {
           { label: '微信余额', value: 2 },
           { label: '钱包余额', value: 3 },
         ],
+        placeholder: '请选择提现类型',
       },
     },
     {
+      fieldName: 'userAccount',
+      label: '收款人账号',
       component: 'Input',
-      fieldName: 'userName',
-      label: '收款人姓名',
       rules: 'required',
+      dependencies: {
+        triggerFields: ['type'],
+        componentProps: (values) => {
+          const type = values.type;
+          let placeholder = '请输入收款人账号';
+          switch (type) {
+            case 1: {
+              placeholder = '请输入支付宝账号';
+              break;
+            }
+            case 2: {
+              placeholder = '请输入微信 openid';
+              break;
+            }
+            case 3: {
+              placeholder = '请输入钱包编号';
+              break;
+            }
+          }
+          return {
+            placeholder,
+          };
+        },
+      },
     },
     {
+      fieldName: 'userName',
+      label: '收款人姓名',
       component: 'Input',
-      fieldName: 'userAccount',
-      label: '收款人账号',
-      rules: 'required',
+      componentProps: {
+        placeholder: '请输入收款人姓名',
+      },
     },
   ];
 }
@@ -65,41 +96,50 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '提现单编号',
+      minWidth: 100,
     },
     {
       field: 'subject',
       title: '提现标题',
+      minWidth: 150,
     },
     {
       field: 'type',
       title: '提现类型',
+      minWidth: 100,
       slots: { default: 'type' },
     },
     {
       field: 'price',
       title: '提现金额',
+      minWidth: 100,
       formatter: 'formatAmount2',
     },
     {
       field: 'userName',
       title: '收款人姓名',
+      minWidth: 120,
     },
     {
       field: 'userAccount',
       title: '收款人账号',
+      minWidth: 150,
     },
     {
       field: 'status',
       title: '提现状态',
+      minWidth: 100,
       slots: { default: 'status' },
     },
     {
       field: 'payTransferId',
       title: '转账单号',
+      minWidth: 120,
     },
     {
       field: 'transferChannelCode',
       title: '转账渠道',
+      minWidth: 130,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_CHANNEL_CODE },
@@ -108,15 +148,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'transferTime',
       title: '转账时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'transferErrorMsg',
       title: '转账失败原因',
+      minWidth: 150,
     },
     {
       title: '操作',
-      width: 130,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-antd/src/views/pay/demo/withdraw/index.vue b/apps/web-antd/src/views/pay/demo/withdraw/index.vue
index 8f856b0f4d13fe3d42a7938a3caeb57cd864c6f3..0a64d3c2df6a747d6d14f0789dc8f73ea0e765d8 100644
--- a/apps/web-antd/src/views/pay/demo/withdraw/index.vue
+++ b/apps/web-antd/src/views/pay/demo/withdraw/index.vue
@@ -12,7 +12,6 @@ import {
   getDemoWithdrawPage,
   transferDemoWithdraw,
 } from '#/api/pay/demo/withdraw';
-import { $t } from '#/locales';
 
 import { useGridColumns } from './data';
 import Form from './modules/form.vue';
@@ -23,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -40,10 +39,8 @@ async function handleTransfer(row: DemoWithdrawApi.Withdraw) {
   });
   try {
     const payTransferId = await transferDemoWithdraw(row.id as number);
-    message.success({
-      content: `转账提交成功，转账单号：${payTransferId}`,
-    });
-    onRefresh();
+    message.success(`转账提交成功，转账单号：${payTransferId}`);
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -67,6 +64,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -89,7 +87,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
 
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="示例提现单列表">
       <template #toolbar-tools>
         <TableAction
@@ -127,12 +125,15 @@ const [Grid, gridApi] = useVbenVxeGrid({
             {
               label: '发起转账',
               type: 'link',
+              icon: ACTION_ICON.ADD,
               ifShow: row.status === 0 && !row.payTransferId,
               onClick: handleTransfer.bind(null, row),
             },
             {
               label: '重新转账',
               type: 'link',
+              danger: true,
+              icon: ACTION_ICON.EDIT,
               ifShow: row.status === 20,
               onClick: handleTransfer.bind(null, row),
             },
diff --git a/apps/web-antd/src/views/pay/demo/withdraw/modules/form.vue b/apps/web-antd/src/views/pay/demo/withdraw/modules/form.vue
index 46e1a2043c8b1052351bd3aa93748d6a0dc15cb9..78240de7c008d1accfc5976732f1e21fa71d0857 100644
--- a/apps/web-antd/src/views/pay/demo/withdraw/modules/form.vue
+++ b/apps/web-antd/src/views/pay/demo/withdraw/modules/form.vue
@@ -49,7 +49,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="$t('ui.actionTitle.create', ['示例提现单'])">
+  <Modal class="w-1/4" :title="$t('ui.actionTitle.create', ['示例提现单'])">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/pay/notify/data.ts b/apps/web-antd/src/views/pay/notify/data.ts
index e44122eb5ea9e46eb78a84ccd3049934a892f617..d81585e2ea24b1427e2d58f8449b22991d77e2e9 100644
--- a/apps/web-antd/src/views/pay/notify/data.ts
+++ b/apps/web-antd/src/views/pay/notify/data.ts
@@ -1,10 +1,16 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayNotifyApi } from '#/api/pay/notify';
+import type { DescriptionItemSchema } from '#/components/description';
+
+import { h } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { formatDateTime } from '@vben/utils';
 
 import { getAppList } from '#/api/pay/app';
+import { DictTag } from '#/components/dict-tag';
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
@@ -23,7 +29,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
           }));
         },
         autoSelect: 'first',
-        placeholder: '请选择数据源',
+        placeholder: '请选择应用编号',
       },
     },
     {
@@ -41,6 +47,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '关联编号',
       component: 'Input',
       componentProps: {
+        allowClear: true,
         placeholder: '请输入关联编号',
       },
     },
@@ -59,9 +66,28 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '商户订单编号',
       component: 'Input',
       componentProps: {
+        allowClear: true,
         placeholder: '请输入商户订单编号',
       },
     },
+    {
+      fieldName: 'merchantRefundId',
+      label: '商户退款编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入商户退款编号',
+      },
+    },
+    {
+      fieldName: 'merchantTransferId',
+      label: '商户转账编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入商户转账编号',
+      },
+    },
     {
       fieldName: 'createTime',
       label: '创建时间',
@@ -81,18 +107,25 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '任务编号',
+      minWidth: 100,
     },
     {
       field: 'appName',
-      title: '应用编号',
+      title: '应用名称',
+      minWidth: 150,
     },
     {
-      field: 'merchantOrderId',
-      title: '商户订单编号',
+      field: 'merchantInfo',
+      title: '商户单信息',
+      minWidth: 240,
+      slots: {
+        default: 'merchantInfo',
+      },
     },
     {
       field: 'type',
       title: '通知类型',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_NOTIFY_TYPE },
@@ -101,10 +134,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'dataId',
       title: '关联编号',
+      minWidth: 120,
     },
     {
       field: 'status',
       title: '通知状态',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_NOTIFY_STATUS },
@@ -113,23 +148,20 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'lastExecuteTime',
       title: '最后通知时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'nextNotifyTime',
       title: '下次通知时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'notifyTimes',
       title: '通知次数',
-      cellRender: {
-        name: 'CellTag',
-        props: {
-          type: 'success',
-          content: '{notifyTimes} / {maxNotifyTimes}',
-        },
-      },
+      minWidth: 120,
+      formatter: ({ row }) => `${row.notifyTimes} / ${row.maxNotifyTimes}`,
     },
     {
       title: '操作',
@@ -140,41 +172,110 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
   ];
 }
 
-/** 详情列表的字段 */
-export const detailColumns = [
-  {
-    title: '日志编号',
-    dataIndex: 'id',
-    key: 'id',
-    width: 120,
-    ellipsis: false,
-  },
-  {
-    title: '通知状态',
-    dataIndex: 'status',
-    key: 'status',
-    width: 120,
-    ellipsis: false,
-  },
-  {
-    title: '通知次数',
-    dataIndex: 'notifyTimes',
-    key: 'notifyTimes',
-    width: 120,
-    ellipsis: false,
-  },
-  {
-    title: '通知时间',
-    dataIndex: 'lastExecuteTime',
-    key: 'lastExecuteTime',
-    width: 120,
-    ellipsis: false,
-  },
-  {
-    title: '响应结果',
-    dataIndex: 'response',
-    key: 'response',
-    width: 120,
-    ellipsis: false,
-  },
-];
+/** 详情的字段 */
+export function useDetailSchema(): DescriptionItemSchema[] {
+  return [
+    {
+      field: 'appId',
+      label: '应用编号',
+    },
+    {
+      field: 'appName',
+      label: '应用名称',
+    },
+    {
+      field: 'type',
+      label: '通知类型',
+      content: (data: PayNotifyApi.NotifyTask) =>
+        h(DictTag, {
+          type: DICT_TYPE.PAY_NOTIFY_TYPE,
+          value: data?.type,
+        }),
+    },
+    {
+      field: 'dataId',
+      label: '关联编号',
+    },
+    {
+      field: 'status',
+      label: '通知状态',
+      content: (data: PayNotifyApi.NotifyTask) =>
+        h(DictTag, {
+          type: DICT_TYPE.PAY_NOTIFY_STATUS,
+          value: data?.status,
+        }),
+    },
+    {
+      field: 'merchantOrderId',
+      label: '商户订单编号',
+    },
+    {
+      field: 'lastExecuteTime',
+      label: '最后通知时间',
+      content: (data: PayNotifyApi.NotifyTask) =>
+        formatDateTime(data?.lastExecuteTime) as string,
+    },
+    {
+      field: 'nextNotifyTime',
+      label: '下次通知时间',
+      content: (data: PayNotifyApi.NotifyTask) =>
+        formatDateTime(data?.nextNotifyTime) as string,
+    },
+    {
+      field: 'notifyTimes',
+      label: '通知次数',
+    },
+    {
+      field: 'maxNotifyTimes',
+      label: '最大通知次数',
+    },
+    {
+      field: 'createTime',
+      label: '创建时间',
+      content: (data: PayNotifyApi.NotifyTask) =>
+        formatDateTime(data?.createTime) as string,
+    },
+    {
+      field: 'updateTime',
+      label: '更新时间',
+      content: (data: PayNotifyApi.NotifyTask) =>
+        formatDateTime(data?.updateTime) as string,
+    },
+  ];
+}
+
+/** 详情的日志字段 */
+export function useDetailLogColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '日志编号',
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '通知状态',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.PAY_NOTIFY_STATUS },
+      },
+    },
+    {
+      field: 'notifyTimes',
+      title: '通知次数',
+      minWidth: 120,
+    },
+    {
+      field: 'createTime',
+      title: '通知时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'response',
+      title: '响应结果',
+      minWidth: 200,
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/pay/notify/index.vue b/apps/web-antd/src/views/pay/notify/index.vue
index 4c79dc0915f595c45b14d7d51ee31129ba8a9fa5..5140e38a844fbb3230dc85fb6e9888f0d833e601 100644
--- a/apps/web-antd/src/views/pay/notify/index.vue
+++ b/apps/web-antd/src/views/pay/notify/index.vue
@@ -1,9 +1,12 @@
 <script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayNotifyApi } from '#/api/pay/notify';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
+import { Tag } from 'ant-design-vue';
+
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getNotifyTaskPage } from '#/api/pay/notify';
 
@@ -16,12 +19,12 @@ const [DetailModal, detailModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
 /** 查看详情 */
-function handleDetail(row: any) {
+function handleDetail(row: PayNotifyApi.NotifyTask) {
   detailModalApi.setData(row).open();
 }
 
@@ -30,6 +33,9 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
+    cellConfig: {
+      height: 80,
+    },
     columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
@@ -46,12 +52,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
       search: true,
     },
-  } as VxeTableGridOptions<any>,
+  } as VxeTableGridOptions<PayNotifyApi.NotifyTask>,
 });
 </script>
 <template>
@@ -60,8 +67,24 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <DocAlert title="支付功能开启" url="https://doc.iocoder.cn/pay/build/" />
     </template>
 
-    <DetailModal @success="onRefresh" />
-    <Grid table-title="支付通知列表">
+    <DetailModal @success="handleRefresh" />
+    <Grid table-title="通知列表">
+      <template #merchantInfo="{ row }">
+        <div class="flex flex-col gap-1 text-left">
+          <p class="text-sm" v-if="row.merchantOrderId">
+            <Tag size="small" color="blue">商户订单编号</Tag>
+            {{ row.merchantOrderId }}
+          </p>
+          <p class="text-sm" v-if="row.merchantRefundId">
+            <Tag size="small" color="orange">商户退款编号</Tag>
+            {{ row.merchantRefundId }}
+          </p>
+          <p class="text-sm" v-if="row.merchantTransferId">
+            <Tag size="small" color="green">商户转账编号</Tag>
+            {{ row.merchantTransferId }}
+          </p>
+        </div>
+      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[
diff --git a/apps/web-antd/src/views/pay/notify/modules/detail.vue b/apps/web-antd/src/views/pay/notify/modules/detail.vue
index fcd31958cc11756c6a56fce2146aa5495546e211..7914903da5c8861daaf2111fee1b40a53592bd06 100644
--- a/apps/web-antd/src/views/pay/notify/modules/detail.vue
+++ b/apps/web-antd/src/views/pay/notify/modules/detail.vue
@@ -1,18 +1,48 @@
 <script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayNotifyApi } from '#/api/pay/notify';
+
 import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
 
-import { Descriptions, Divider, Table, Tag } from 'ant-design-vue';
+import { Divider } from 'ant-design-vue';
 
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getNotifyTaskDetail } from '#/api/pay/notify';
-import { DictTag } from '#/components/dict-tag';
+import { useDescription } from '#/components/description';
+
+import { useDetailLogColumns, useDetailSchema } from '../data';
+
+const formData = ref<PayNotifyApi.NotifyTask>();
 
-import { detailColumns } from '../data';
+const [Description] = useDescription({
+  componentProps: {
+    bordered: true,
+    column: 2,
+    class: 'mx-4',
+  },
+  schema: useDetailSchema(),
+});
 
-const formData = ref();
+const [LogGrid, logGridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useDetailLogColumns(),
+    height: 'auto',
+    keepSource: true,
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    pagerConfig: {
+      enabled: false,
+    },
+    toolbarConfig: {
+      enabled: true,
+      refresh: true,
+    },
+  } as VxeTableGridOptions,
+});
 
 const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
@@ -21,13 +51,14 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData();
+    const data = modalApi.getData<PayNotifyApi.NotifyTask>();
     if (!data || !data.id) {
       return;
     }
     modalApi.lock();
     try {
       formData.value = await getNotifyTaskDetail(data.id);
+      logGridApi.grid?.reloadData(formData.value?.logs || []);
     } finally {
       modalApi.unlock();
     }
@@ -42,63 +73,10 @@ const [Modal, modalApi] = useVbenModal({
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <Descriptions bordered :column="2" size="middle" class="mx-4">
-      <Descriptions.Item label="商户订单编号">
-        <Tag>{{ formData?.merchantOrderId }}</Tag>
-      </Descriptions.Item>
-      <Descriptions.Item label="通知状态">
-        <DictTag
-          :type="DICT_TYPE.PAY_NOTIFY_STATUS"
-          :value="formData?.status"
-        />
-      </Descriptions.Item>
-
-      <Descriptions.Item label="应用编号">
-        {{ formData?.appId }}
-      </Descriptions.Item>
-      <Descriptions.Item label="应用名称">
-        {{ formData?.appName }}
-      </Descriptions.Item>
-
-      <Descriptions.Item label="关联编号">
-        {{ formData?.dataId }}
-      </Descriptions.Item>
-      <Descriptions.Item label="通知类型">
-        <DictTag :type="DICT_TYPE.PAY_NOTIFY_TYPE" :value="formData?.type" />
-      </Descriptions.Item>
-
-      <Descriptions.Item label="通知次数">
-        {{ formData?.notifyTimes }}
-      </Descriptions.Item>
-      <Descriptions.Item label="最大通知次数">
-        {{ formData?.maxNotifyTimes }}
-      </Descriptions.Item>
-
-      <Descriptions.Item label="最后通知时间">
-        {{ formatDateTime(formData?.lastExecuteTime || '') }}
-      </Descriptions.Item>
-      <Descriptions.Item label="下次通知时间">
-        {{ formatDateTime(formData?.nextNotifyTime || '') }}
-      </Descriptions.Item>
-
-      <Descriptions.Item label="创建时间">
-        {{ formatDateTime(formData?.createTime || '') }}
-      </Descriptions.Item>
-      <Descriptions.Item label="更新时间">
-        {{ formatDateTime(formData?.updateTime || '') }}
-      </Descriptions.Item>
-    </Descriptions>
+    <Description :data="formData" />
 
     <Divider />
 
-    <Descriptions bordered :column="1" size="middle" class="mx-4">
-      <Descriptions.Item label="回调日志">
-        <Table
-          v-if="formData"
-          :data-source="formData.logs"
-          :columns="detailColumns"
-        />
-      </Descriptions.Item>
-    </Descriptions>
+    <LogGrid table-title="支付通知列表" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/pay/order/data.ts b/apps/web-antd/src/views/pay/order/data.ts
index 1fcd6ee21a917534e568b2ca7ef64a7d3ea2bbe6..7acf14000b3a14dc1de0d94134b6ffb870213d64 100644
--- a/apps/web-antd/src/views/pay/order/data.ts
+++ b/apps/web-antd/src/views/pay/order/data.ts
@@ -1,5 +1,6 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayOrderApi } from '#/api/pay/order';
 import type { DescriptionItemSchema } from '#/components/description';
 
 import { h } from 'vue';
@@ -11,66 +12,74 @@ import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
 import { Tag } from 'ant-design-vue';
 
 import { DictTag } from '#/components/dict-tag';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
     {
-      component: 'Input',
       fieldName: 'appId',
       label: '应用编号',
+      component: 'Input',
       componentProps: {
+        allowClear: true,
         placeholder: '请输入应用编号',
       },
     },
     {
-      component: 'Select',
       fieldName: 'channelCode',
       label: '支付渠道',
+      component: 'Select',
       componentProps: {
-        placeholder: '请选择开启状态',
+        allowClear: true,
+        placeholder: '请选择支付渠道',
         options: getDictOptions(DICT_TYPE.PAY_CHANNEL_CODE, 'string'),
       },
     },
     {
-      component: 'Input',
       fieldName: 'merchantOrderId',
       label: '商户单号',
+      component: 'Input',
       componentProps: {
+        allowClear: true,
         placeholder: '请输入商户单号',
       },
     },
     {
-      component: 'Input',
       fieldName: 'no',
       label: '支付单号',
+      component: 'Input',
       componentProps: {
+        allowClear: true,
         placeholder: '请输入支付单号',
       },
     },
     {
-      component: 'Input',
       fieldName: 'channelOrderNo',
       label: '渠道单号',
+      component: 'Input',
       componentProps: {
+        allowClear: true,
         placeholder: '请输入渠道单号',
       },
     },
     {
-      component: 'Select',
       fieldName: 'status',
       label: '支付状态',
+      component: 'Select',
       componentProps: {
+        allowClear: true,
         placeholder: '请选择支付状态',
         options: getDictOptions(DICT_TYPE.PAY_ORDER_STATUS, 'number'),
       },
     },
     {
-      component: 'RangePicker',
       fieldName: 'createTime',
       label: '创建时间',
+      component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始日期', '结束日期'],
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
       },
     },
   ];
@@ -79,65 +88,74 @@ export function useGridFormSchema(): VbenFormSchema[] {
 /** 列表的字段 */
 export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
-    { type: 'checkbox', width: 60 },
     {
-      title: '编号',
       field: 'id',
+      title: '编号',
+      minWidth: 100,
     },
     {
-      title: '支付金额',
       field: 'price',
+      title: '支付金额',
+      minWidth: 120,
       formatter: 'formatAmount2',
     },
     {
-      title: '退款金额',
       field: 'refundPrice',
+      title: '退款金额',
+      minWidth: 120,
       formatter: 'formatAmount2',
     },
     {
-      title: '手续金额',
       field: 'channelFeePrice',
+      title: '手续金额',
+      minWidth: 120,
       formatter: 'formatAmount2',
     },
     {
-      title: '订单号',
       field: 'no',
+      title: '订单号',
+      minWidth: 240,
       slots: {
         default: 'no',
       },
     },
     {
-      title: '支付状态',
       field: 'status',
+      title: '支付状态',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_ORDER_STATUS },
       },
     },
     {
-      title: '支付渠道',
       field: 'channelCode',
+      title: '支付渠道',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_CHANNEL_CODE },
       },
     },
     {
-      title: '支付时间',
       field: 'successTime',
+      title: '支付时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
-      title: '支付应用',
       field: 'appName',
+      title: '支付应用',
+      minWidth: 150,
     },
     {
-      title: '商品标题',
       field: 'subject',
+      title: '商品标题',
+      minWidth: 200,
     },
     {
       title: '操作',
-      width: 100,
+      width: 80,
       fixed: 'right',
       slots: { default: 'actions' },
     },
@@ -166,7 +184,7 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'status',
       label: '支付状态',
-      content: (data) =>
+      content: (data: any) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_ORDER_STATUS,
           value: data?.status,
@@ -175,37 +193,44 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'price',
       label: '支付金额',
-      content: (data) => `￥${erpPriceInputFormatter(data?.price)}`,
+      content: (data: PayOrderApi.Order) =>
+        `￥${erpPriceInputFormatter(data?.price)}`,
     },
     {
       field: 'channelFeePrice',
       label: '手续费',
-      content: (data) => `￥${erpPriceInputFormatter(data?.channelFeePrice)}`,
+      content: (data: PayOrderApi.Order) =>
+        `￥${erpPriceInputFormatter(data?.channelFeePrice)}`,
     },
     {
       field: 'channelFeeRate',
       label: '手续费比例',
-      content: (data) => `${erpPriceInputFormatter(data?.channelFeeRate)}%`,
+      content: (data: PayOrderApi.Order) =>
+        `${erpPriceInputFormatter(data?.channelFeeRate)}%`,
     },
     {
       field: 'successTime',
       label: '支付时间',
-      content: (data) => formatDateTime(data?.successTime) as string,
+      content: (data: PayOrderApi.Order) =>
+        formatDateTime(data?.successTime) as string,
     },
     {
       field: 'expireTime',
       label: '失效时间',
-      content: (data) => formatDateTime(data?.expireTime) as string,
+      content: (data: PayOrderApi.Order) =>
+        formatDateTime(data?.expireTime) as string,
     },
     {
       field: 'createTime',
       label: '创建时间',
-      content: (data) => formatDateTime(data?.createTime) as string,
+      content: (data: PayOrderApi.Order) =>
+        formatDateTime(data?.createTime) as string,
     },
     {
       field: 'updateTime',
       label: '更新时间',
-      content: (data) => formatDateTime(data?.updateTime) as string,
+      content: (data: PayOrderApi.Order) =>
+        formatDateTime(data?.updateTime) as string,
     },
     {
       field: 'subject',
@@ -218,7 +243,7 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'channelCode',
       label: '支付渠道',
-      content: (data) =>
+      content: (data: PayOrderApi.Order) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_CHANNEL_CODE,
           value: data?.channelCode,
@@ -231,8 +256,10 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'channelOrderNo',
       label: '渠道单号',
-      content: (data) =>
-        h(Tag, { color: 'green' }, () => data?.channelOrderNo || ''),
+      content: (data: PayOrderApi.Order) =>
+        data?.channelOrderNo
+          ? h(Tag, { color: 'green' }, () => data.channelOrderNo)
+          : '',
     },
     {
       field: 'channelUserId',
@@ -241,7 +268,8 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'refundPrice',
       label: '退款金额',
-      content: (data) => `￥${erpPriceInputFormatter(data?.refundPrice)}`,
+      content: (data: PayOrderApi.Order) =>
+        `￥${erpPriceInputFormatter(data?.refundPrice)}`,
     },
     {
       field: 'notifyUrl',
diff --git a/apps/web-antd/src/views/pay/order/index.vue b/apps/web-antd/src/views/pay/order/index.vue
index 098b88e34157edbf29de729fc589746a49e159aa..c8c88bdc371cf25a04f7054cbd2f52a583652f0c 100644
--- a/apps/web-antd/src/views/pay/order/index.vue
+++ b/apps/web-antd/src/views/pay/order/index.vue
@@ -3,11 +3,13 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { PayOrderApi } from '#/api/pay/order';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { Tag } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { getOrderPage } from '#/api/pay/order';
+import { exportOrder, getOrderPage } from '#/api/pay/order';
+import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Detail from './modules/detail.vue';
@@ -18,10 +20,16 @@ const [DetailModal, detailModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
+/** 导出支付订单 */
+async function handleExport() {
+  const data = await exportOrder(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '支付订单.xls', source: data });
+}
+
 /** 查看详情 */
 function handleDetail(row: PayOrderApi.Order) {
   detailModalApi.setData(row).open();
@@ -30,7 +38,6 @@ function handleDetail(row: PayOrderApi.Order) {
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
-    collapsed: false,
   },
   gridOptions: {
     cellConfig: {
@@ -52,9 +59,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
-      isCurrent: true,
       isHover: true,
-      resizable: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -80,8 +85,21 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/pay/wx-lite-pay-demo/"
       />
     </template>
-    <DetailModal @success="onRefresh" />
+    <DetailModal @success="handleRefresh" />
     <Grid table-title="支付订单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.export', ['支付订单']),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['pay:order:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[
diff --git a/apps/web-antd/src/views/pay/order/modules/detail.vue b/apps/web-antd/src/views/pay/order/modules/detail.vue
index 6d06605ba95cd581f3ab386fd36c51ff26a64d0a..dea8cdad443f700b4f7b8c91aed788f34f6b1cdf 100644
--- a/apps/web-antd/src/views/pay/order/modules/detail.vue
+++ b/apps/web-antd/src/views/pay/order/modules/detail.vue
@@ -1,20 +1,20 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import type { PayOrderApi } from '#/api/pay/order';
 
 import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
-import { getOrder } from '#/api/pay/order';
+import { getOrderDetail } from '#/api/pay/order';
 import { useDescription } from '#/components/description';
 
 import { useDetailSchema } from '../data';
 
-const detailData = ref<PayOrderApi.Order>();
+const formData = ref<PayOrderApi.Order>();
 
 const [Descriptions] = useDescription({
   componentProps: {
-    bordered: false,
+    bordered: true,
     column: 2,
     class: 'mx-4',
   },
@@ -22,9 +22,9 @@ const [Descriptions] = useDescription({
 });
 
 const [Modal, modalApi] = useVbenModal({
-  onOpenChange: async (isOpen) => {
+  async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      detailData.value = undefined;
+      formData.value = undefined;
       return;
     }
     // 加载数据
@@ -34,7 +34,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      detailData.value = await getOrder(data.id);
+      formData.value = await getOrderDetail(data.id);
     } finally {
       modalApi.unlock();
     }
@@ -48,6 +48,6 @@ const [Modal, modalApi] = useVbenModal({
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <Descriptions :data="detailData" />
+    <Descriptions :data="formData" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/pay/refund/data.ts b/apps/web-antd/src/views/pay/refund/data.ts
index eb181c9b4c331336d0080df330ceacb39a398b4b..69eee72241b98196d12cbe95d886c33cc7fe2b50 100644
--- a/apps/web-antd/src/views/pay/refund/data.ts
+++ b/apps/web-antd/src/views/pay/refund/data.ts
@@ -1,18 +1,17 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayRefundApi } from '#/api/pay/refund';
 import type { DescriptionItemSchema } from '#/components/description';
 
 import { h } from 'vue';
 
-import { fenToYuan, formatDateTime } from '@vben/utils';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
 
 import { Tag } from 'ant-design-vue';
 
-import { getAppList } from '#/api/pay/app';
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
-
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
@@ -21,17 +20,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
     {
       fieldName: 'appId',
       label: '应用编号',
-      component: 'ApiSelect',
+      component: 'Input',
       componentProps: {
-        api: async () => {
-          const data = await getAppList();
-          return data.map((item) => ({
-            label: item.name,
-            value: item.id,
-          }));
-        },
-        autoSelect: 'first',
-        placeholder: '请选择数据源',
+        allowClear: true,
+        placeholder: '请输入应用编号',
       },
     },
     {
@@ -40,28 +32,45 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         allowClear: true,
+        placeholder: '请选择退款渠道',
         options: getDictOptions(DICT_TYPE.PAY_CHANNEL_CODE, 'string'),
       },
     },
     {
       fieldName: 'merchantOrderId',
-      label: '商户支付单号',
+      label: '商户单号',
       component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入商户单号',
+      },
     },
     {
       fieldName: 'merchantRefundId',
-      label: '商户退款单号',
+      label: '退款单号',
       component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入退款单号',
+      },
     },
     {
       fieldName: 'channelOrderNo',
-      label: '渠道支付单号',
+      label: '渠道单号',
       component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入渠道单号',
+      },
     },
     {
       fieldName: 'channelRefundNo',
       label: '渠道退款单号',
       component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入渠道退款单号',
+      },
     },
     {
       fieldName: 'status',
@@ -69,6 +78,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         allowClear: true,
+        placeholder: '请选择退款状态',
         options: getDictOptions(DICT_TYPE.PAY_REFUND_STATUS, 'number'),
       },
     },
@@ -90,81 +100,99 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '编号',
-    },
-    {
-      field: 'merchantRefundId',
-      title: '退款订单号',
-    },
-    {
-      field: 'channelRefundNo',
-      title: '渠道退款单号',
+      minWidth: 100,
     },
     {
       field: 'payPrice',
       title: '支付金额',
+      minWidth: 120,
       formatter: 'formatAmount2',
     },
     {
       field: 'refundPrice',
       title: '退款金额',
+      minWidth: 120,
       formatter: 'formatAmount2',
     },
+    {
+      field: 'merchantRefundId',
+      title: '退款单号',
+      minWidth: 240,
+      slots: {
+        default: 'no',
+      },
+    },
     {
       field: 'status',
       title: '退款状态',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_REFUND_STATUS },
       },
     },
+    {
+      field: 'channelCode',
+      title: '退款渠道',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.PAY_CHANNEL_CODE },
+      },
+    },
+    {
+      field: 'successTime',
+      title: '退款时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
+    {
+      field: 'reason',
+      title: '退款原因',
+      minWidth: 200,
+    },
     {
       title: '操作',
-      width: 100,
+      width: 80,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
 
-/** 详情页的字段 */
-export function useBaseDetailSchema(): DescriptionItemSchema[] {
+/** 详情的字段 */
+export function useDetailSchema(): DescriptionItemSchema[] {
   return [
+    // 基本信息部分
     {
       field: 'merchantRefundId',
       label: '商户退款单号',
-      content: (data) =>
-        h(Tag, {}, () => {
-          return data?.merchantRefundId || '-';
-        }),
+      content: (data: PayRefundApi.Refund) =>
+        h(Tag, {}, () => data?.merchantRefundId || '-'),
     },
     {
       field: 'channelRefundNo',
       label: '渠道退款单号',
-      content: (data) =>
-        h(Tag, {}, () => {
-          return data?.channelRefundNo || '-';
-        }),
+      content: (data: PayRefundApi.Refund) =>
+        h(Tag, { color: 'success' }, () => data?.channelRefundNo || '-'),
     },
     {
       field: 'merchantOrderId',
       label: '商户支付单号',
-      content: (data) =>
-        h(Tag, {}, () => {
-          return data?.merchantOrderId || '-';
-        }),
+      content: (data: PayRefundApi.Refund) =>
+        h(Tag, {}, () => data?.merchantOrderId || '-'),
     },
     {
       field: 'channelOrderNo',
       label: '渠道支付单号',
-      content: (data) =>
-        h(Tag, {}, () => {
-          return data?.channelOrderNo || '-';
-        }),
+      content: (data: PayRefundApi.Refund) =>
+        h(Tag, { color: 'success' }, () => data?.channelOrderNo || '-'),
     },
     {
       field: 'appId',
@@ -177,23 +205,27 @@ export function useBaseDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'payPrice',
       label: '支付金额',
-      content: (data) =>
-        h(Tag, { color: 'success' }, () => {
-          return fenToYuan(data.payPrice || 0);
-        }),
+      content: (data: PayRefundApi.Refund) =>
+        h(
+          Tag,
+          { color: 'success' },
+          () => `￥${erpPriceInputFormatter(data?.payPrice || 0)}`,
+        ),
     },
     {
       field: 'refundPrice',
       label: '退款金额',
-      content: (data) =>
-        h(Tag, { color: 'red' }, () => {
-          return fenToYuan(data.refundPrice || 0);
-        }),
+      content: (data: PayRefundApi.Refund) =>
+        h(
+          Tag,
+          { color: 'danger' },
+          () => `￥${erpPriceInputFormatter(data?.refundPrice || 0)}`,
+        ),
     },
     {
       field: 'status',
       label: '退款状态',
-      content: (data) =>
+      content: (data: any) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_REFUND_STATUS,
           value: data?.status,
@@ -202,28 +234,26 @@ export function useBaseDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'successTime',
       label: '退款时间',
-      content: (data) => formatDateTime(data.successTime) as string,
+      content: (data: PayRefundApi.Refund) =>
+        formatDateTime(data?.successTime) as string,
     },
     {
       field: 'createTime',
       label: '创建时间',
-      content: (data) => formatDateTime(data.createTime) as string,
+      content: (data: PayRefundApi.Refund) =>
+        formatDateTime(data?.createTime) as string,
     },
     {
       field: 'updateTime',
       label: '更新时间',
-      content: (data) => formatDateTime(data.updateTime) as string,
+      content: (data: PayRefundApi.Refund) =>
+        formatDateTime(data?.updateTime) as string,
     },
-  ];
-}
-
-/** 详情页的字段 */
-export function useChannelDetailSchema(): DescriptionItemSchema[] {
-  return [
+    // 渠道信息部分
     {
       field: 'channelCode',
       label: '退款渠道',
-      content: (data) =>
+      content: (data: PayRefundApi.Refund) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_CHANNEL_CODE,
           value: data?.channelCode,
@@ -241,6 +271,7 @@ export function useChannelDetailSchema(): DescriptionItemSchema[] {
       field: 'notifyUrl',
       label: '通知 URL',
     },
+    // 错误信息部分
     {
       field: 'channelErrorCode',
       label: '渠道错误码',
diff --git a/apps/web-antd/src/views/pay/refund/index.vue b/apps/web-antd/src/views/pay/refund/index.vue
index 2d2913c07b44e3de5c52b8b1d9db0750760e2f4f..d2d8cc575ba05c5bd3ee97f61e1184487752889b 100644
--- a/apps/web-antd/src/views/pay/refund/index.vue
+++ b/apps/web-antd/src/views/pay/refund/index.vue
@@ -1,35 +1,38 @@
 <script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayRefundApi } from '#/api/pay/refund';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
+import { Tag } from 'ant-design-vue';
+
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import * as RefundApi from '#/api/pay/refund';
+import { exportRefund, getRefundPage } from '#/api/pay/refund';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Detail from './modules/detail.vue';
 
-const [RefundDetailModal, refundDetailModalApi] = useVbenModal({
+const [DetailModal, detailModalApi] = useVbenModal({
   connectedComponent: Detail,
   destroyOnClose: true,
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 导出表格 */
+/** 导出退款订单 */
 async function handleExport() {
-  const data = await RefundApi.exportRefund(await gridApi.formApi.getValues());
-  downloadFileFromBlobPart({ fileName: '支付退款.xls', source: data });
+  const data = await exportRefund(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '退款订单.xls', source: data });
 }
 
 /** 查看详情 */
-function handleDetail(row: any) {
-  refundDetailModalApi.setData(row).open();
+function handleDetail(row: PayRefundApi.Refund) {
+  detailModalApi.setData(row).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -37,13 +40,16 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
+    cellConfig: {
+      height: 80,
+    },
     columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
-          return await RefundApi.getRefundPage({
+          return await getRefundPage({
             pageNo: page.currentPage,
             pageSize: page.pageSize,
             ...formValues,
@@ -53,12 +59,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
       search: true,
     },
-  } as VxeTableGridOptions<any>,
+  } as VxeTableGridOptions<PayRefundApi.Refund>,
 });
 </script>
 <template>
@@ -69,16 +76,16 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/pay/refund-demo/"
       />
     </template>
-    <RefundDetailModal @success="onRefresh" />
+    <DetailModal @success="handleRefresh" />
     <Grid table-title="支付退款列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
             {
-              label: $t('ui.actionTitle.export'),
+              label: $t('ui.actionTitle.export', ['退款订单']),
               type: 'primary',
               icon: ACTION_ICON.DOWNLOAD,
-              auth: ['pay:refund:query'],
+              auth: ['pay:refund:export'],
               onClick: handleExport,
             },
           ]"
@@ -97,6 +104,21 @@ const [Grid, gridApi] = useVbenVxeGrid({
           ]"
         />
       </template>
+      <template #no="{ row }">
+        <div class="flex flex-col gap-1 text-left">
+          <p class="text-sm">
+            <Tag size="small" color="blue"> 商户</Tag> {{ row.merchantOrderId }}
+          </p>
+          <p class="text-sm" v-if="row.merchantRefundId">
+            <Tag size="small" color="orange">退款</Tag>
+            {{ row.merchantRefundId }}
+          </p>
+          <p class="text-sm" v-if="row.channelRefundNo">
+            <Tag size="small" color="green">渠道</Tag>
+            {{ row.channelRefundNo }}
+          </p>
+        </div>
+      </template>
     </Grid>
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/pay/refund/modules/detail.vue b/apps/web-antd/src/views/pay/refund/modules/detail.vue
index 1df2ec0354345314bb01e7bb54bad904b032a258..1617b1d60b917c5a05af9115ab7d244f0a0f7425 100644
--- a/apps/web-antd/src/views/pay/refund/modules/detail.vue
+++ b/apps/web-antd/src/views/pay/refund/modules/detail.vue
@@ -5,31 +5,20 @@ import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
-import { Divider } from 'ant-design-vue';
-
 import { getRefund } from '#/api/pay/refund';
 import { useDescription } from '#/components/description';
 
-import { useBaseDetailSchema, useChannelDetailSchema } from '../data';
+import { useDetailSchema } from '../data';
 
 const formData = ref<PayRefundApi.Refund>();
 
-const [BaseDescriptions] = useDescription({
-  componentProps: {
-    bordered: false,
-    column: 2,
-    class: 'mx-4',
-  },
-  schema: useBaseDetailSchema(),
-});
-
-const [ChannelDescriptions] = useDescription({
+const [Descriptions] = useDescription({
   componentProps: {
-    bordered: false,
+    bordered: true,
     column: 2,
     class: 'mx-4',
   },
-  schema: useChannelDetailSchema(),
+  schema: useDetailSchema(),
 });
 
 const [Modal, modalApi] = useVbenModal({
@@ -60,8 +49,6 @@ const [Modal, modalApi] = useVbenModal({
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <BaseDescriptions :data="formData" />
-    <Divider />
-    <ChannelDescriptions :data="formData" />
+    <Descriptions :data="formData" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/pay/transfer/data.ts b/apps/web-antd/src/views/pay/transfer/data.ts
index 815aaf2e686c95dbe1a1d86a26cff5f9607235cf..0a8d7c401b6341589251dd9a0f6241b3f98cc4b7 100644
--- a/apps/web-antd/src/views/pay/transfer/data.ts
+++ b/apps/web-antd/src/views/pay/transfer/data.ts
@@ -1,17 +1,17 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayTransferApi } from '#/api/pay/transfer';
 import type { DescriptionItemSchema } from '#/components/description';
 
 import { h } from 'vue';
 
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
 import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
 
 import { Tag } from 'ant-design-vue';
 
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
-
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
@@ -75,7 +75,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       },
     },
     {
-      fieldName: 'accountNo',
+      fieldName: 'userAccount',
       label: '收款人账号',
       component: 'Input',
       componentProps: {
@@ -110,96 +110,95 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '编号',
-    },
-    {
-      field: 'createTime',
-      title: '创建时间',
-      formatter: 'formatDateTime',
-    },
-    {
-      field: 'appName',
-      title: '支付应用',
+      minWidth: 100,
     },
     {
       field: 'price',
       title: '转账金额',
+      minWidth: 120,
       formatter: 'formatAmount2',
     },
     {
-      field: 'status',
-      title: '转账状态',
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.PAY_TRANSFER_STATUS },
+      field: 'merchantTransferId',
+      title: '转账单号',
+      minWidth: 350,
+      slots: {
+        default: 'no',
       },
     },
     {
-      field: 'type',
-      title: '类型',
+      field: 'status',
+      title: '转账状态',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
-        props: { type: DICT_TYPE.PAY_TRANSFER_TYPE },
+        props: { type: DICT_TYPE.PAY_TRANSFER_STATUS },
       },
     },
     {
       field: 'channelCode',
-      title: '支付渠道',
+      title: '转账渠道',
+      minWidth: 140,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_CHANNEL_CODE },
       },
     },
     {
-      field: 'merchantTransferId',
-      title: '商户单号',
+      field: 'createTime',
+      title: '创建时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
     },
     {
-      field: 'channelTransferNo',
-      title: '渠道单号',
+      field: 'successTime',
+      title: '转账时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'subject',
+      title: '转账标题',
+      minWidth: 150,
+    },
+    {
+      field: 'appName',
+      title: '支付应用',
+      minWidth: 150,
     },
     {
       field: 'userName',
       title: '收款人姓名',
+      minWidth: 150,
     },
     {
-      field: 'accountNo',
-      title: '收款人账号',
+      field: 'userAccount',
+      title: '收款账号',
+      minWidth: 200,
     },
     {
       title: '操作',
-      width: 120,
+      width: 80,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
 
-/** 详情的配置 */
+/** 详情的字段 */
 export function useDetailSchema(): DescriptionItemSchema[] {
   return [
-    {
-      field: 'id',
-      label: '编号',
-    },
     {
       field: 'merchantTransferId',
       label: '商户单号',
-      content: (data) => {
-        return h(Tag, {
-          color: 'blue',
-          content: data?.merchantTransferId,
-        });
-      },
+      content: (data: PayTransferApi.Transfer) =>
+        h(Tag, {}, () => data?.merchantTransferId),
     },
     {
       field: 'no',
       label: '转账单号',
-      content: (data) => {
-        return h(Tag, {
-          color: 'blue',
-          content: data?.no,
-        });
-      },
+      content: (data: PayTransferApi.Transfer) =>
+        h(Tag, { color: 'orange' }, () => data?.no),
     },
     {
       field: 'appId',
@@ -208,7 +207,7 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'status',
       label: '转账状态',
-      content: (data) =>
+      content: (data: any) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_TRANSFER_STATUS,
           value: data?.status,
@@ -217,22 +216,24 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'price',
       label: '转账金额',
-      content: (data) => {
-        return h(Tag, {
-          color: 'blue',
-          content: `￥${erpPriceInputFormatter(data?.price)}`,
-        });
-      },
+      content: (data: PayTransferApi.Transfer) =>
+        h(
+          Tag,
+          { color: 'success' },
+          () => `￥${erpPriceInputFormatter(data?.price || 0)}`,
+        ),
     },
     {
       field: 'successTime',
       label: '转账时间',
-      content: (data) => formatDateTime(data?.successTime) as string,
+      content: (data: PayTransferApi.Transfer) =>
+        formatDateTime(data?.successTime) as string,
     },
     {
       field: 'createTime',
       label: '创建时间',
-      content: (data) => formatDateTime(data?.createTime) as string,
+      content: (data: PayTransferApi.Transfer) =>
+        formatDateTime(data?.createTime) as string,
     },
     {
       field: 'userName',
@@ -245,25 +246,23 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'channelCode',
       label: '支付渠道',
-      content: (data) =>
+      content: (data: PayTransferApi.Transfer) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_CHANNEL_CODE,
           value: data?.channelCode,
         }),
     },
     {
-      field: 'channelCode',
+      field: 'userIp',
       label: '支付 IP',
     },
     {
       field: 'channelTransferNo',
       label: '渠道单号',
-      content: (data) => {
-        return h(Tag, {
-          color: 'blue',
-          content: data?.channelTransferNo,
-        });
-      },
+      content: (data: PayTransferApi.Transfer) =>
+        data?.channelTransferNo
+          ? h(Tag, { color: 'success' }, () => data.channelTransferNo)
+          : '',
     },
     {
       field: 'notifyUrl',
diff --git a/apps/web-antd/src/views/pay/transfer/index.vue b/apps/web-antd/src/views/pay/transfer/index.vue
index 4461706f3e32171d44fcd315ef012d9f631e8c43..d688207ae0072df2654e1e45b372054d98a61261 100644
--- a/apps/web-antd/src/views/pay/transfer/index.vue
+++ b/apps/web-antd/src/views/pay/transfer/index.vue
@@ -5,6 +5,8 @@ import type { PayTransferApi } from '#/api/pay/transfer';
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
+import { Tag } from 'ant-design-vue';
+
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { exportTransfer, getTransferPage } from '#/api/pay/transfer';
 import { $t } from '#/locales';
@@ -18,11 +20,11 @@ const [DetailModal, detailModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 导出表格 */
+/** 导出转账单 */
 async function handleExport() {
   const data = await exportTransfer(await gridApi.formApi.getValues());
   downloadFileFromBlobPart({ fileName: '转账单.xls', source: data });
@@ -38,6 +40,9 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
+    cellConfig: {
+      height: 80,
+    },
     columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
@@ -54,6 +59,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -69,13 +75,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <DocAlert title="转账管理" url="https://doc.iocoder.cn/pay/transfer/" />
     </template>
 
-    <DetailModal @success="onRefresh" />
+    <DetailModal @success="handleRefresh" />
     <Grid table-title="转账单列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
             {
-              label: $t('ui.actionTitle.export'),
+              label: $t('ui.actionTitle.export', ['转账单']),
               type: 'primary',
               icon: ACTION_ICON.DOWNLOAD,
               auth: ['pay:transfer:export'],
@@ -97,6 +103,21 @@ const [Grid, gridApi] = useVbenVxeGrid({
           ]"
         />
       </template>
+      <template #no="{ row }">
+        <div class="flex flex-col gap-1 text-left">
+          <p class="text-sm">
+            <Tag size="small" color="blue"> 商户</Tag>
+            {{ row.merchantTransferId }}
+          </p>
+          <p class="text-sm" v-if="row.no">
+            <Tag size="small" color="orange">转账</Tag> {{ row.no }}
+          </p>
+          <p class="text-sm" v-if="row.channelTransferNo">
+            <Tag size="small" color="green">渠道</Tag>
+            {{ row.channelTransferNo }}
+          </p>
+        </div>
+      </template>
     </Grid>
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/pay/transfer/modules/detail.vue b/apps/web-antd/src/views/pay/transfer/modules/detail.vue
index e08fe167401f6107142c1054e1ff27c9ec9c86ce..f3841f0802a15c4c8ed72b180ecb4850ce69f8c3 100644
--- a/apps/web-antd/src/views/pay/transfer/modules/detail.vue
+++ b/apps/web-antd/src/views/pay/transfer/modules/detail.vue
@@ -12,6 +12,15 @@ import { useDetailSchema } from '../data';
 
 const formData = ref<PayTransferApi.Transfer>();
 
+const [Descriptions] = useDescription({
+  componentProps: {
+    bordered: true,
+    column: 2,
+    class: 'mx-4',
+  },
+  schema: useDetailSchema(),
+});
+
 const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
@@ -31,16 +40,6 @@ const [Modal, modalApi] = useVbenModal({
     }
   },
 });
-
-const [Descriptions] = useDescription({
-  componentProps: {
-    title: '基本信息',
-    bordered: false,
-    column: 2,
-    class: 'mx-4',
-  },
-  schema: useDetailSchema(),
-});
 </script>
 
 <template>
diff --git a/apps/web-antd/src/views/pay/wallet/balance/data.ts b/apps/web-antd/src/views/pay/wallet/balance/data.ts
index 4f78c062b87bd0e49d4da610cb1d77ef57e620b8..a6a30895cc027738ea5818388835068815f3bf3b 100644
--- a/apps/web-antd/src/views/pay/wallet/balance/data.ts
+++ b/apps/web-antd/src/views/pay/wallet/balance/data.ts
@@ -1,6 +1,7 @@
-import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
+import type { VxeTableGridOptions as VxeTableGridOptionsLegacy } from '@vben/plugins/vxe-table';
 
 import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -16,6 +17,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Input',
       componentProps: {
         placeholder: '请输入用户编号',
+        allowClear: true,
       },
     },
     {
@@ -25,6 +27,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         options: getDictOptions(DICT_TYPE.USER_TYPE, 'number'),
         placeholder: '请选择用户类型',
+        allowClear: true,
       },
     },
     {
@@ -32,28 +35,30 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '创建时间',
       component: 'RangePicker',
       componentProps: {
-        allowClear: true,
         ...getRangePickerDefaultProps(),
-        placeholder: ['开始日期', '结束日期'],
+        allowClear: true,
       },
     },
   ];
 }
 
 /** 列表的字段 */
-export function useGridColumns(): VxeTableGridOptions['columns'] {
+export function useGridColumns(): VxeTableGridOptionsLegacy['columns'] {
   return [
     {
       title: '编号',
       field: 'id',
+      minWidth: 100,
     },
     {
       title: '用户编号',
       field: 'userId',
+      minWidth: 120,
     },
     {
       title: '用户类型',
       field: 'userType',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.USER_TYPE },
@@ -62,33 +67,73 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       title: '余额',
       field: 'balance',
+      minWidth: 120,
       formatter: 'formatAmount2',
     },
     {
       title: '累计支出',
       field: 'totalExpense',
+      minWidth: 120,
       formatter: 'formatAmount2',
     },
     {
       title: '累计充值',
       field: 'totalRecharge',
+      minWidth: 120,
       formatter: 'formatAmount2',
     },
     {
       title: '冻结金额',
       field: 'freezePrice',
+      minWidth: 120,
       formatter: 'formatAmount2',
     },
     {
       title: '创建时间',
       field: 'createTime',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       title: '操作',
       field: 'actions',
+      width: 80,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
+
+/** 钱包交易记录列表字段 */
+export function useTransactionGridColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '编号',
+      minWidth: 100,
+    },
+    {
+      field: 'title',
+      title: '关联业务标题',
+      minWidth: 200,
+    },
+    {
+      field: 'price',
+      title: '交易金额',
+      minWidth: 120,
+      formatter: 'formatAmount2',
+    },
+    {
+      field: 'balance',
+      title: '钱包余额',
+      minWidth: 120,
+      formatter: 'formatAmount2',
+    },
+    {
+      field: 'createTime',
+      title: '交易时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/pay/wallet/balance/index.vue b/apps/web-antd/src/views/pay/wallet/balance/index.vue
index a8aa1a3afd3756ac0c8d4c2e647a4e8b6a227715..e4b41f17b707443b85d7992fb3f3b7befabbf08e 100644
--- a/apps/web-antd/src/views/pay/wallet/balance/index.vue
+++ b/apps/web-antd/src/views/pay/wallet/balance/index.vue
@@ -9,20 +9,21 @@ import { getWalletPage } from '#/api/pay/wallet/balance';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import WalletDetail from './modules/detail.vue';
+import Detail from './modules/detail.vue';
+
+const [DetailModal, detailModalApi] = useVbenModal({
+  connectedComponent: Detail,
+  destroyOnClose: true,
+});
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-const [WalletModal, walletModalApi] = useVbenModal({
-  connectedComponent: WalletDetail,
-  destroyOnClose: true,
-});
-
+/** 查看钱包 */
 function handleDetail(row: Required<PayWalletApi.Wallet>) {
-  walletModalApi.setData(row).open();
+  detailModalApi.setData(row).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -46,6 +47,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -61,8 +63,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <DocAlert title="钱包余额" url="https://doc.iocoder.cn/pay/build/" />
     </template>
 
-    <WalletModal @reload="onRefresh" />
-
+    <DetailModal @reload="handleRefresh" />
     <Grid>
       <template #actions="{ row }">
         <TableAction
diff --git a/apps/web-antd/src/views/pay/wallet/balance/modules/detail.vue b/apps/web-antd/src/views/pay/wallet/balance/modules/detail.vue
index 4579d132008507ecdbc7e9ae768ec02e2a8a452c..38b83ba046fa355de35adc00d0fc6d29afe7b2cd 100644
--- a/apps/web-antd/src/views/pay/wallet/balance/modules/detail.vue
+++ b/apps/web-antd/src/views/pay/wallet/balance/modules/detail.vue
@@ -1,13 +1,40 @@
 <script setup lang="ts">
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { PayWalletApi } from '#/api/pay/wallet/balance';
+import type { WalletTransactionApi } from '#/api/pay/wallet/transaction';
 
-import { ref } from 'vue';
+import { Page, useVbenModal } from '@vben/common-ui';
 
-import { useVbenModal } from '@vben/common-ui';
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getTransactionPage } from '#/api/pay/wallet/transaction';
 
-import WalletTransactionList from '../../transaction/index.vue';
+import { useTransactionGridColumns } from '../data';
 
-const walletId = ref(0);
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useTransactionGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          return await getTransactionPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            walletId: modalApi.getData<PayWalletApi.Wallet>().id,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<WalletTransactionApi.Transaction>,
+});
 
 const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
@@ -15,13 +42,9 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<PayWalletApi.Wallet>();
-    if (!data || !data.id) {
-      return;
-    }
     modalApi.lock();
     try {
-      walletId.value = data.id;
+      await gridApi.query();
     } finally {
       modalApi.unlock();
     }
@@ -31,10 +54,12 @@ const [Modal, modalApi] = useVbenModal({
 <template>
   <Modal
     title="钱包交易记录"
-    class="w-2/5"
+    class="w-1/2"
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <WalletTransactionList :wallet-id="walletId" />
+    <Page auto-content-height>
+      <Grid />
+    </Page>
   </Modal>
-</template>
+</template>
\ No newline at end of file
diff --git a/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts b/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts
index b7a720e10c9ab1b7b1c4b2a68aecbd62b42c007f..22010869e2f11b1f4718bd8860d2041201d772b7 100644
--- a/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts
+++ b/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts
@@ -1,17 +1,26 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
+import { z } from '#/adapter/form';
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
     {
       fieldName: 'name',
-      label: '套餐名',
+      label: '套餐名称',
       component: 'Input',
       rules: 'required',
       componentProps: {
@@ -22,7 +31,7 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'payPrice',
       label: '支付金额(元)',
       component: 'InputNumber',
-      rules: 'required',
+      rules: z.number().min(0, '支付金额不能小于0'),
       componentProps: {
         min: 0,
         precision: 2,
@@ -34,7 +43,7 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'bonusPrice',
       label: '赠送金额(元)',
       component: 'InputNumber',
-      rules: 'required',
+      rules: z.number().min(0, '赠送金额不能小于0'),
       componentProps: {
         min: 0,
         precision: 2,
@@ -46,11 +55,12 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'status',
       label: '开启状态',
       component: 'RadioGroup',
-      rules: 'required',
       componentProps: {
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        placeholder: '请选择开启状态',
+        buttonStyle: 'solid',
+        optionType: 'button',
       },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
     },
   ];
 }
@@ -64,6 +74,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Input',
       componentProps: {
         placeholder: '请输入套餐名称',
+        allowClear: true,
       },
     },
     {
@@ -71,9 +82,9 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '状态',
       component: 'Select',
       componentProps: {
-        allowClear: true,
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
         placeholder: '请选择状态',
+        allowClear: true,
       },
     },
     {
@@ -81,9 +92,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '创建时间',
       component: 'RangePicker',
       componentProps: {
-        allowClear: true,
         ...getRangePickerDefaultProps(),
-        placeholder: ['开始日期', '结束日期'],
+        allowClear: true,
       },
     },
   ];
@@ -94,25 +104,30 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'id',
-      title: '编号',
+      title: '套餐编号',
+      minWidth: 100,
     },
     {
       field: 'name',
       title: '套餐名称',
+      minWidth: 150,
     },
     {
       field: 'payPrice',
       title: '支付金额',
-      formatter: 'formatAmount2',
+      minWidth: 120,
+      formatter: 'formatFenToYuanAmount',
     },
     {
       field: 'bonusPrice',
       title: '赠送金额',
-      formatter: 'formatAmount2',
+      minWidth: 120,
+      formatter: 'formatFenToYuanAmount',
     },
     {
       field: 'status',
       title: '状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -121,11 +136,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       title: '操作',
-      width: 130,
+      width: 160,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-antd/src/views/pay/wallet/rechargePackage/index.vue b/apps/web-antd/src/views/pay/wallet/rechargePackage/index.vue
index 61606b2a32eff84c93b21b0fc59e461896a40169..b9484e26675816ed032500169485628598c6cc24 100644
--- a/apps/web-antd/src/views/pay/wallet/rechargePackage/index.vue
+++ b/apps/web-antd/src/views/pay/wallet/rechargePackage/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { WalletRechargePackageApi } from '#/api/pay/wallet/rechargePackage';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 
@@ -7,8 +8,8 @@ import { message } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
-  deletePackage,
-  getPackagePage,
+  deleteWalletRechargePackage,
+  getWalletRechargePackagePage,
 } from '#/api/pay/wallet/rechargePackage';
 import { $t } from '#/locales';
 
@@ -21,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -31,22 +32,20 @@ function handleCreate() {
 }
 
 /** 编辑套餐 */
-function handleEdit(row: any) {
+function handleEdit(row: WalletRechargePackageApi.WalletRechargePackage) {
   formModalApi.setData(row).open();
 }
 
 /** 删除套餐 */
-async function handleDelete(row: any) {
+async function handleDelete(row: WalletRechargePackageApi.WalletRechargePackage) {
   const hideLoading = message.loading({
     content: $t('ui.actionMessage.deleting', [row.name]),
     duration: 0,
   });
   try {
-    await deletePackage(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    await deleteWalletRechargePackage(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -63,7 +62,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
-          return await getPackagePage({
+          return await getWalletRechargePackagePage({
             pageNo: page.currentPage,
             pageSize: page.pageSize,
             ...formValues,
@@ -73,18 +72,19 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
       search: true,
     },
-  } as VxeTableGridOptions<any>,
+  } as VxeTableGridOptions<WalletRechargePackageApi.WalletRechargePackage>,
 });
 </script>
 
 <template>
   <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="充值套餐列表">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-antd/src/views/pay/wallet/rechargePackage/modules/form.vue b/apps/web-antd/src/views/pay/wallet/rechargePackage/modules/form.vue
index 9ebbce0e1390f5c1fd096d0848b70142091e7366..29173c68978a532e855a512b9da0e6b2c28ce789 100644
--- a/apps/web-antd/src/views/pay/wallet/rechargePackage/modules/form.vue
+++ b/apps/web-antd/src/views/pay/wallet/rechargePackage/modules/form.vue
@@ -10,16 +10,16 @@ import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import {
-  createPackage,
-  getPackage,
-  updatePackage,
+  createWalletRechargePackage,
+  getWalletRechargePackage,
+  updateWalletRechargePackage,
 } from '#/api/pay/wallet/rechargePackage';
 import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
-const formData = ref<WalletRechargePackageApi.Package>();
+const formData = ref<WalletRechargePackageApi.WalletRechargePackage>();
 const getTitle = computed(() => {
   return formData.value?.id
     ? $t('ui.actionTitle.edit', ['充值套餐'])
@@ -32,7 +32,7 @@ const [Form, formApi] = useVbenForm({
       class: 'w-full',
     },
     formItemClass: 'col-span-2',
-    labelWidth: 120,
+    labelWidth: 100,
   },
   layout: 'horizontal',
   schema: useFormSchema(),
@@ -48,12 +48,14 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     // 提交表单
     const data =
-      (await formApi.getValues()) as WalletRechargePackageApi.Package;
+      (await formApi.getValues()) as WalletRechargePackageApi.WalletRechargePackage;
     try {
       // 转换金额单位
       data.payPrice = yuanToFen(data.payPrice);
       data.bonusPrice = yuanToFen(data.bonusPrice);
-      await (formData.value?.id ? updatePackage(data) : createPackage(data));
+      await (formData.value?.id
+        ? updateWalletRechargePackage(data)
+        : createWalletRechargePackage(data));
       // 关闭并提示
       await modalApi.close();
       emit('success');
@@ -68,13 +70,14 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<WalletRechargePackageApi.Package>();
+    const data =
+      modalApi.getData<WalletRechargePackageApi.WalletRechargePackage>();
     if (!data || !data.id) {
       return;
     }
     modalApi.lock();
     try {
-      formData.value = await getPackage(data.id);
+      formData.value = await getWalletRechargePackage(data.id);
       // 转换金额单位
       formData.value.payPrice = Number.parseFloat(
         fenToYuan(formData.value.payPrice),
@@ -92,7 +95,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-1/4">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/pay/wallet/transaction/data.ts b/apps/web-antd/src/views/pay/wallet/transaction/data.ts
deleted file mode 100644
index 2fe7a7279cddac22064da527da185e0b52905085..0000000000000000000000000000000000000000
--- a/apps/web-antd/src/views/pay/wallet/transaction/data.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-
-/** 列表的字段 */
-export function useGridColumns(): VxeTableGridOptions['columns'] {
-  return [
-    {
-      field: 'id',
-      title: '编号',
-      width: 80,
-    },
-    {
-      field: 'walletId',
-      title: '钱包编号',
-      width: 100,
-    },
-    {
-      field: 'title',
-      title: '关联业务标题',
-      width: 200,
-    },
-    {
-      field: 'price',
-      title: '交易金额',
-      width: 120,
-      formatter: ({ cellValue }) => `${cellValue / 100} 元`,
-    },
-    {
-      field: 'balance',
-      title: '钱包余额',
-      width: 120,
-      formatter: ({ cellValue }) => `${cellValue / 100} 元`,
-    },
-    {
-      field: 'createTime',
-      title: '交易时间',
-      width: 180,
-      formatter: 'formatDateTime',
-    },
-  ];
-}
diff --git a/apps/web-antd/src/views/pay/wallet/transaction/index.vue b/apps/web-antd/src/views/pay/wallet/transaction/index.vue
deleted file mode 100644
index 4116a8e78c677c5db69ffd81c2d6a0cf1cfa5033..0000000000000000000000000000000000000000
--- a/apps/web-antd/src/views/pay/wallet/transaction/index.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<script lang="ts" setup>
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-
-import { Page } from '@vben/common-ui';
-
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { getWallet } from '#/api/pay/wallet/balance';
-import { getTransactionPage } from '#/api/pay/wallet/transaction';
-
-import { useGridColumns } from './data';
-
-const props = defineProps({
-  walletId: {
-    type: Number,
-    required: false,
-    default: undefined,
-  },
-  userId: {
-    type: Number,
-    required: false,
-    default: undefined,
-  },
-});
-
-const [Grid] = useVbenVxeGrid({
-  gridOptions: {
-    columns: useGridColumns(),
-    height: 'auto',
-    keepSource: true,
-    proxyConfig: {
-      ajax: {
-        query: async ({ page }, formValues) => {
-          let walletId = props.walletId;
-          if (props.userId) {
-            const wallet = await getWallet({ userId: props.userId });
-            walletId = wallet.id;
-          }
-          return await getTransactionPage({
-            pageNo: page.currentPage,
-            pageSize: page.pageSize,
-            walletId,
-            ...formValues,
-          });
-        },
-      },
-    },
-    rowConfig: {
-      keyField: 'id',
-    },
-    toolbarConfig: {
-      refresh: true,
-    },
-  } as VxeTableGridOptions<any>,
-});
-</script>
-
-<template>
-  <Page auto-content-height>
-    <Grid table-title="钱包交易记录" />
-  </Page>
-</template>
diff --git a/apps/web-antd/src/views/system/dept/modules/form.vue b/apps/web-antd/src/views/system/dept/modules/form.vue
index 008a85d5647e9648a20c01be44891a7f5f261c08..07430494f0929721856713d99cb12f3e3d8fee52 100644
--- a/apps/web-antd/src/views/system/dept/modules/form.vue
+++ b/apps/web-antd/src/views/system/dept/modules/form.vue
@@ -69,9 +69,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDept(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/system/dict/modules/data-form.vue b/apps/web-antd/src/views/system/dict/modules/data-form.vue
index a0e44bff1b5a8159037ffe60ffbb294dedcfb606..0511d90c4d6260963d0c92fd93816ffbc7a19ed5 100644
--- a/apps/web-antd/src/views/system/dict/modules/data-form.vue
+++ b/apps/web-antd/src/views/system/dict/modules/data-form.vue
@@ -75,9 +75,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDictData(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/system/dict/modules/type-form.vue b/apps/web-antd/src/views/system/dict/modules/type-form.vue
index c055f880c98dc9064cd5cce5c3db9be7ea20dfc5..8de08d1206889f69d310bb30c10c26c5516da75e 100644
--- a/apps/web-antd/src/views/system/dict/modules/type-form.vue
+++ b/apps/web-antd/src/views/system/dict/modules/type-form.vue
@@ -71,9 +71,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDictType(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/system/menu/modules/form.vue b/apps/web-antd/src/views/system/menu/modules/form.vue
index e257fd26d855c16b9de7c4ffba1390d4326ee7b2..ae96622055ff61639cfd8f30c0a66976c924229a 100644
--- a/apps/web-antd/src/views/system/menu/modules/form.vue
+++ b/apps/web-antd/src/views/system/menu/modules/form.vue
@@ -69,9 +69,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getMenu(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/system/notice/modules/form.vue b/apps/web-antd/src/views/system/notice/modules/form.vue
index d15762e5760252f66cf2502881a4b5aa77b9b5d3..eac0238853b8a5685b2352ed472abd3627136da9 100644
--- a/apps/web-antd/src/views/system/notice/modules/form.vue
+++ b/apps/web-antd/src/views/system/notice/modules/form.vue
@@ -67,9 +67,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getNotice(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/adapter/vxe-table.ts b/apps/web-ele/src/adapter/vxe-table.ts
index c99686be5d2f0fc064652fab9f57faac8a4e8966..8dd26b32b1c2ee999a72993991ce17fcc574c306 100644
--- a/apps/web-ele/src/adapter/vxe-table.ts
+++ b/apps/web-ele/src/adapter/vxe-table.ts
@@ -152,6 +152,7 @@ setupVbenVxeTable({
       renderTableDefault({ attrs, props }, { column, row }) {
         const loadingKey = `__loading_${column.field}`;
         const finallyProps = {
+          inlinePrompt: true,
           activeText: $t('common.enabled'),
           inactiveText: $t('common.disabled'),
           activeValue: 1,
@@ -318,22 +319,25 @@ setupVbenVxeTable({
       },
     });
 
-    // add by 星语：数量格式化，例如说：金额
-    vxeUI.formats.add('formatNumber', {
+    // add by 星语：数量格式化，保留 3 位
+    vxeUI.formats.add('formatAmount3', {
       tableCellFormatMethod({ cellValue }) {
+        if (cellValue === null || cellValue === undefined) {
+          return '';
+        }
         return erpCountInputFormatter(cellValue);
       },
     });
-
+    // add by 星语：数量格式化，保留 2 位
     vxeUI.formats.add('formatAmount2', {
       tableCellFormatMethod({ cellValue }, digits = 2) {
-        return `${erpNumberFormatter(cellValue, digits)}元`;
+        return `${erpNumberFormatter(cellValue, digits)}`;
       },
     });
 
     vxeUI.formats.add('formatFenToYuanAmount', {
       tableCellFormatMethod({ cellValue }, digits = 2) {
-        return `${erpNumberFormatter(fenToYuan(cellValue), digits)}元`;
+        return `${erpNumberFormatter(fenToYuan(cellValue), digits)}`;
       },
     });
   },
diff --git a/apps/web-ele/src/api/pay/app/index.ts b/apps/web-ele/src/api/pay/app/index.ts
index d44e5ae2b09334ca02b1ecf01759f97794a445c3..081c7aa77defe18ae1d25d338424c5ece1d91b31 100644
--- a/apps/web-ele/src/api/pay/app/index.ts
+++ b/apps/web-ele/src/api/pay/app/index.ts
@@ -16,6 +16,7 @@ export namespace PayAppApi {
     merchantId: number;
     merchantName: string;
     createTime?: Date;
+    channelCodes?: string[];
   }
 
   /** 更新状态请求 */
@@ -24,20 +25,16 @@ export namespace PayAppApi {
     status: number;
   }
 
-  export interface AppPageReq extends PageParam {
+  export interface AppPageReqVO extends PageParam {
     name?: string;
+    appKey?: string;
     status?: number;
-    remark?: string;
-    payNotifyUrl?: string;
-    refundNotifyUrl?: string;
-    transferNotifyUrl?: string;
-    merchantName?: string;
     createTime?: Date[];
   }
 }
 
 /** 查询支付应用列表 */
-export function getAppPage(params: PayAppApi.AppPageReq) {
+export function getAppPage(params: PayAppApi.AppPageReqVO) {
   return requestClient.get<PageResult<PayAppApi.App>>('/pay/app/page', {
     params,
   });
@@ -59,7 +56,7 @@ export function updateApp(data: PayAppApi.App) {
 }
 
 /** 修改支付应用状态 */
-export function changeAppStatus(data: PayAppApi.UpdateStatusReq) {
+export function updateAppStatus(data: PayAppApi.UpdateStatusReq) {
   return requestClient.put('/pay/app/update-status', data);
 }
 
diff --git a/apps/web-ele/src/api/pay/demo/order/index.ts b/apps/web-ele/src/api/pay/demo/order/index.ts
index 63cb1396d8fa92e107450553b6cb691e534abfed..2623510593383e80a41b35153cd71cfb01623c29 100644
--- a/apps/web-ele/src/api/pay/demo/order/index.ts
+++ b/apps/web-ele/src/api/pay/demo/order/index.ts
@@ -20,7 +20,7 @@ export namespace DemoOrderApi {
     createTime?: Date;
   }
 
-  export interface OrderPageReq extends PageParam {
+  export interface OrderPageReqVO extends PageParam {
     spuId?: number;
     createTime?: Date[];
   }
@@ -32,7 +32,7 @@ export function createDemoOrder(data: DemoOrderApi.Order) {
 }
 
 /** 获得示例订单分页 */
-export function getDemoOrderPage(params: DemoOrderApi.OrderPageReq) {
+export function getDemoOrderPage(params: DemoOrderApi.OrderPageReqVO) {
   return requestClient.get<PageResult<DemoOrderApi.Order>>(
     '/pay/demo-order/page',
     {
diff --git a/apps/web-ele/src/api/pay/notify/index.ts b/apps/web-ele/src/api/pay/notify/index.ts
index b0b916ccb2ca18df68d20c61be3778b03baa599e..fe18ac03bdf873d01eed24372c41aacfc3311089 100644
--- a/apps/web-ele/src/api/pay/notify/index.ts
+++ b/apps/web-ele/src/api/pay/notify/index.ts
@@ -1,15 +1,52 @@
-import type { PageParam } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
+export namespace PayNotifyApi {
+  /** 支付通知任务 */
+  export interface NotifyTask {
+    id: number;
+    appId: number;
+    appName: string;
+    type: number;
+    dataId: number;
+    status: number;
+    merchantOrderId: string;
+    merchantRefundId?: string;
+    merchantTransferId?: string;
+    lastExecuteTime: Date;
+    nextNotifyTime: Date;
+    notifyTimes: number;
+    maxNotifyTimes: number;
+    createTime: Date;
+    updateTime: Date;
+    logs?: any[];
+  }
+
+  /** 支付通知任务分页请求 */
+  export interface NotifyTaskPageReqVO extends PageParam {
+    appId?: number;
+    type?: number;
+    dataId?: number;
+    status?: number;
+    merchantOrderId?: string;
+    merchantRefundId?: string;
+    merchantTransferId?: string;
+    createTime?: Date[];
+  }
+}
+
 /** 获得支付通知明细 */
 export function getNotifyTaskDetail(id: number) {
   return requestClient.get(`/pay/notify/get-detail?id=${id}`);
 }
 
 /** 获得支付通知分页 */
-export function getNotifyTaskPage(params: PageParam) {
-  return requestClient.get('/pay/notify/page', {
-    params,
-  });
+export function getNotifyTaskPage(params: PayNotifyApi.NotifyTaskPageReqVO) {
+  return requestClient.get<PageResult<PayNotifyApi.NotifyTask>>(
+    '/pay/notify/page',
+    {
+      params,
+    },
+  );
 }
diff --git a/apps/web-ele/src/api/pay/order/index.ts b/apps/web-ele/src/api/pay/order/index.ts
index aff890dfa70bba010d8e7081e484fa0a8299c083..44554919207b431da9dfa1a6ecbed3101fa7f1aa 100644
--- a/apps/web-ele/src/api/pay/order/index.ts
+++ b/apps/web-ele/src/api/pay/order/index.ts
@@ -40,60 +40,19 @@ export namespace PayOrderApi {
   }
 
   /** 支付订单分页请求 */
-  export interface OrderPageReq extends PageParam {
-    merchantId?: number;
+  export interface OrderPageReqVO extends PageParam {
     appId?: number;
-    channelId?: number;
     channelCode?: string;
     merchantOrderId?: string;
-    subject?: string;
-    body?: string;
-    notifyUrl?: string;
-    notifyStatus?: number;
-    amount?: number;
-    channelFeeRate?: number;
-    channelFeeAmount?: number;
-    status?: number;
-    expireTime?: Date[];
-    successTime?: Date[];
-    notifyTime?: Date[];
-    successExtensionId?: number;
-    refundStatus?: number;
-    refundTimes?: number;
-    channelUserId?: string;
     channelOrderNo?: string;
-    createTime?: Date[];
-  }
-
-  /** 支付订单导出请求 */
-  export interface OrderExportReq {
-    merchantId?: number;
-    appId?: number;
-    channelId?: number;
-    channelCode?: string;
-    merchantOrderId?: string;
-    subject?: string;
-    body?: string;
-    notifyUrl?: string;
-    notifyStatus?: number;
-    amount?: number;
-    channelFeeRate?: number;
-    channelFeeAmount?: number;
+    no?: string;
     status?: number;
-    expireTime?: Date[];
-    successTime?: Date[];
-    notifyTime?: Date[];
-    successExtensionId?: number;
-    refundStatus?: number;
-    refundTimes?: number;
-    channelUserId?: string;
-    channelOrderNo?: string;
     createTime?: Date[];
   }
 }
 
 /** 查询支付订单列表 */
-export function getOrderPage(params: PayOrderApi.OrderPageReq) {
+export function getOrderPage(params: PayOrderApi.OrderPageReqVO) {
   return requestClient.get<PageResult<PayOrderApi.Order>>('/pay/order/page', {
     params,
   });
@@ -120,6 +79,6 @@ export function submitOrder(data: any) {
 }
 
 /** 导出支付订单 */
-export function exportOrder(params: PayOrderApi.OrderExportReq) {
+export function exportOrder(params: any) {
   return requestClient.download('/pay/order/export-excel', { params });
 }
diff --git a/apps/web-ele/src/api/pay/refund/index.ts b/apps/web-ele/src/api/pay/refund/index.ts
index 44c36b7c6f35f148079ca6a23bb08c94573c2e74..bce2448bcf823f5832ac66f3ddb8e575974af17a 100644
--- a/apps/web-ele/src/api/pay/refund/index.ts
+++ b/apps/web-ele/src/api/pay/refund/index.ts
@@ -14,9 +14,12 @@ export namespace PayRefundApi {
     tradeNo: string;
     merchantOrderId: string;
     merchantRefundNo: string;
+    merchantRefundId: string;
     notifyUrl: string;
     notifyStatus: number;
     status: number;
+    payPrice: number;
+    refundPrice: number;
     type: number;
     payAmount: number;
     refundAmount: number;
@@ -35,36 +38,7 @@ export namespace PayRefundApi {
   }
 
   /** 退款订单分页请求 */
-  export interface RefundPageReq extends PageParam {
-    merchantId?: number;
-    appId?: number;
-    channelId?: number;
-    channelCode?: string;
-    orderId?: string;
-    tradeNo?: string;
-    merchantOrderId?: string;
-    merchantRefundNo?: string;
-    notifyUrl?: string;
-    notifyStatus?: number;
-    status?: number;
-    type?: number;
-    payAmount?: number;
-    refundAmount?: number;
-    reason?: string;
-    userIp?: string;
-    channelOrderNo?: string;
-    channelRefundNo?: string;
-    channelErrorCode?: string;
-    channelErrorMsg?: string;
-    channelExtras?: string;
-    expireTime?: Date[];
-    successTime?: Date[];
-    notifyTime?: Date[];
-    createTime?: Date[];
-  }
-
-  /** 退款订单导出请求 */
-  export interface RefundExportReq {
+  export interface RefundPageReqVO extends PageParam {
     merchantId?: number;
     appId?: number;
     channelId?: number;
@@ -94,7 +68,7 @@ export namespace PayRefundApi {
 }
 
 /** 查询退款订单列表 */
-export function getRefundPage(params: PayRefundApi.RefundPageReq) {
+export function getRefundPage(params: PayRefundApi.RefundPageReqVO) {
   return requestClient.get<PageResult<PayRefundApi.Refund>>(
     '/pay/refund/page',
     {
@@ -108,22 +82,7 @@ export function getRefund(id: number) {
   return requestClient.get<PayRefundApi.Refund>(`/pay/refund/get?id=${id}`);
 }
 
-/** 创建退款订单 */
-export function createRefund(data: PayRefundApi.Refund) {
-  return requestClient.post('/pay/refund/create', data);
-}
-
-/** 更新退款订单 */
-export function updateRefund(data: PayRefundApi.Refund) {
-  return requestClient.put('/pay/refund/update', data);
-}
-
-/** 删除退款订单 */
-export function deleteRefund(id: number) {
-  return requestClient.delete(`/pay/refund/delete?id=${id}`);
-}
-
 /** 导出退款订单 */
-export function exportRefund(params: PayRefundApi.RefundExportReq) {
+export function exportRefund(params: any) {
   return requestClient.download('/pay/refund/export-excel', { params });
 }
diff --git a/apps/web-ele/src/api/pay/transfer/index.ts b/apps/web-ele/src/api/pay/transfer/index.ts
index 4c588cb657bda24ae800a5086a19eb384cd9865f..75cd21153a2e48dc5cf67d1d80d1f8c52fb0b710 100644
--- a/apps/web-ele/src/api/pay/transfer/index.ts
+++ b/apps/web-ele/src/api/pay/transfer/index.ts
@@ -6,37 +6,42 @@ export namespace PayTransferApi {
   /** 转账单信息 */
   export interface Transfer {
     id: number;
+    no: string;
     appId: number;
+    appName: string;
     channelId: number;
     channelCode: string;
     merchantTransferId: string;
-    type: number;
+    channelTransferNo: string;
     price: number;
     subject: string;
     userName: string;
-    alipayLogonId: string;
-    openid: string;
+    userAccount: string;
+    userIp: string;
     status: number;
+    successTime: Date;
     createTime: Date;
+    updateTime: Date;
+    notifyUrl: string;
+    channelNotifyData: string;
   }
 
   /** 转账单分页请求 */
-  export interface TransferPageReq extends PageParam {
+  export interface TransferPageReqVO extends PageParam {
+    no?: string;
     appId?: number;
-    channelId?: number;
     channelCode?: string;
-    merchantTransferId?: string;
-    type?: number;
-    price?: number;
-    subject?: string;
-    userName?: string;
+    merchantOrderId?: string;
     status?: number;
+    userName?: string;
+    userAccount?: string;
+    channelTransferNo?: string;
     createTime?: Date[];
   }
 }
 
 /** 查询转账单列表 */
-export function getTransferPage(params: PayTransferApi.TransferPageReq) {
+export function getTransferPage(params: PayTransferApi.TransferPageReqVO) {
   return requestClient.get<PageResult<PayTransferApi.Transfer>>(
     '/pay/transfer/page',
     {
diff --git a/apps/web-ele/src/api/pay/wallet/balance/index.ts b/apps/web-ele/src/api/pay/wallet/balance/index.ts
index 71e8e76d609d8e214d9bc2c69b6a512c21967297..e3440f9117821268608ebf2f46223f1ae7269149 100644
--- a/apps/web-ele/src/api/pay/wallet/balance/index.ts
+++ b/apps/web-ele/src/api/pay/wallet/balance/index.ts
@@ -20,7 +20,7 @@ export namespace PayWalletApi {
   }
 
   /** 钱包分页请求 */
-  export interface WalletPageReq extends PageParam {
+  export interface WalletPageReqVO extends PageParam {
     userId?: number;
     userType?: number;
     balance?: number;
@@ -38,7 +38,7 @@ export function getWallet(params: PayWalletApi.PayWalletUserReq) {
 }
 
 /** 查询会员钱包列表 */
-export function getWalletPage(params: PayWalletApi.WalletPageReq) {
+export function getWalletPage(params: PayWalletApi.WalletPageReqVO) {
   return requestClient.get<PageResult<PayWalletApi.Wallet>>(
     '/pay/wallet/page',
     {
diff --git a/apps/web-ele/src/api/pay/wallet/rechargePackage/index.ts b/apps/web-ele/src/api/pay/wallet/rechargePackage/index.ts
index 32c3bbfaf008bcc27ca4fdc59dd1beccddd84ba5..7f8b5621fa06a6d79588672e240e3545ee90fca7 100644
--- a/apps/web-ele/src/api/pay/wallet/rechargePackage/index.ts
+++ b/apps/web-ele/src/api/pay/wallet/rechargePackage/index.ts
@@ -4,7 +4,7 @@ import { requestClient } from '#/api/request';
 
 export namespace WalletRechargePackageApi {
   /** 充值套餐信息 */
-  export interface Package {
+  export interface WalletRechargePackage {
     id?: number;
     name: string;
     payPrice: number;
@@ -14,33 +14,36 @@ export namespace WalletRechargePackageApi {
 }
 
 /** 查询充值套餐列表 */
-export function getPackagePage(params: PageParam) {
-  return requestClient.get<PageResult<WalletRechargePackageApi.Package>>(
-    '/pay/wallet-recharge-package/page',
-    {
-      params,
-    },
-  );
+export function getWalletRechargePackagePage(params: PageParam) {
+  return requestClient.get<
+    PageResult<WalletRechargePackageApi.WalletRechargePackage>
+  >('/pay/wallet-recharge-package/page', {
+    params,
+  });
 }
 
 /** 查询充值套餐详情 */
-export function getPackage(id: number) {
-  return requestClient.get<WalletRechargePackageApi.Package>(
+export function getWalletRechargePackage(id: number) {
+  return requestClient.get<WalletRechargePackageApi.WalletRechargePackage>(
     `/pay/wallet-recharge-package/get?id=${id}`,
   );
 }
 
 /** 新增充值套餐 */
-export function createPackage(data: WalletRechargePackageApi.Package) {
+export function createWalletRechargePackage(
+  data: WalletRechargePackageApi.WalletRechargePackage,
+) {
   return requestClient.post('/pay/wallet-recharge-package/create', data);
 }
 
 /** 修改充值套餐 */
-export function updatePackage(data: WalletRechargePackageApi.Package) {
+export function updateWalletRechargePackage(
+  data: WalletRechargePackageApi.WalletRechargePackage,
+) {
   return requestClient.put('/pay/wallet-recharge-package/update', data);
 }
 
 /** 删除充值套餐 */
-export function deletePackage(id: number) {
+export function deleteWalletRechargePackage(id: number) {
   return requestClient.delete(`/pay/wallet-recharge-package/delete?id=${id}`);
 }
diff --git a/apps/web-ele/src/components/upload/input-upload.vue b/apps/web-ele/src/components/upload/input-upload.vue
index c3a1ba96f318665c3930d8053d007179e9568864..0964acdb1e90c4c17743276dcfd9601d617cad4e 100644
--- a/apps/web-ele/src/components/upload/input-upload.vue
+++ b/apps/web-ele/src/components/upload/input-upload.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-// TODO @xingyu：这个组件，只有 pay 在用，和现有的 file-upload 和 image-upload 有点不一致。是不是可以考虑移除，只在 pay 那搞个复用的组件；
 import type { InputProps } from 'element-plus';
 
 import type { FileUploadProps } from './typing';
diff --git a/apps/web-ele/src/views/infra/demo/demo01/modules/form.vue b/apps/web-ele/src/views/infra/demo/demo01/modules/form.vue
index 548aac24d06bff72025ba5a9da4efe8d71469fc9..d97dd9c891b45c917899c8f50da8f8f1131a68c8 100644
--- a/apps/web-ele/src/views/infra/demo/demo01/modules/form.vue
+++ b/apps/web-ele/src/views/infra/demo/demo01/modules/form.vue
@@ -73,9 +73,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDemo01Contact(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/infra/demo/demo02/modules/form.vue b/apps/web-ele/src/views/infra/demo/demo02/modules/form.vue
index 2e7ff1dc93026ef9146101dcf00e53cfd32daf3c..2f4a581246621119f54e79022335abfdfc77bd07 100644
--- a/apps/web-ele/src/views/infra/demo/demo02/modules/form.vue
+++ b/apps/web-ele/src/views/infra/demo/demo02/modules/form.vue
@@ -76,9 +76,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDemo02Category(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/infra/demo/demo03/erp/modules/form.vue b/apps/web-ele/src/views/infra/demo/demo03/erp/modules/form.vue
index e56102da4efcff193d330ab0bb13d50a52231735..b0ad481d17d8af2b71082b4a6fab5e39eb6256bb 100644
--- a/apps/web-ele/src/views/infra/demo/demo03/erp/modules/form.vue
+++ b/apps/web-ele/src/views/infra/demo/demo03/erp/modules/form.vue
@@ -73,9 +73,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDemo03Student(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/product/property/modules/property-form.vue b/apps/web-ele/src/views/mall/product/property/modules/property-form.vue
index b81e016250e9c475b70982d190336a85c9d540d2..8bc468410298d1ef83391993c4884022ea9bd814 100644
--- a/apps/web-ele/src/views/mall/product/property/modules/property-form.vue
+++ b/apps/web-ele/src/views/mall/product/property/modules/property-form.vue
@@ -71,9 +71,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getProperty(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/product/property/modules/value-form.vue b/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
index 48f6db6ef7433213627865fa91df665d9c0d1f98..1be3dcf864052ad84fa394415c82d8c1bf66edd1 100644
--- a/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
+++ b/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
@@ -77,9 +77,7 @@ const [Modal, modalApi] = useVbenModal({
       try {
         formData.value = await getPropertyValue(data.id);
         // 设置到 values
-        if (formData.value) {
-          await formApi.setValues(formData.value);
-        }
+        await formApi.setValues(formData.value);
       } finally {
         modalApi.unlock();
       }
diff --git a/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue
index ba8f8f85843e02eb29e96de8d8e2dfe0f69f8706..7781fd5b9ace357a57d9b09c36241ffd5e0b3a2c 100644
--- a/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue
@@ -76,9 +76,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getCombinationActivity(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
index 7feafc1f43e779ad68fe4c4040da21576b3db4e4..c1b67fe6f8ad8e19b221b9612987938f5b72b530 100644
--- a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
@@ -81,9 +81,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDiscountActivity(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue b/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue
index 7004377d35e1e8875126a331d2e83af2fc7bd37d..e128ce9b8e25cabc3104e41e1e17abca268389bc 100644
--- a/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue
@@ -75,9 +75,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDiyPage(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue b/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue
index cb3e2af09dc040800a22b65a03e4f75b6f4815d5..886d3946e6526ee02a9a79e0c2ca881b3687c397 100644
--- a/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue
@@ -82,9 +82,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDiyTemplate(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/promotion/point/activity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/point/activity/modules/form.vue
index 3df1c2b5a68f1ff6635a09a8c418269552fc7396..5bded7559406f3e35e96205b7193ee2cc0334122 100644
--- a/apps/web-ele/src/views/mall/promotion/point/activity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/point/activity/modules/form.vue
@@ -81,9 +81,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getPointActivity(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
index 9e89c5a8f8fef0d0591868ec0bb43ed50997d78a..e1c74b702d0fe4855ceacd23b8bebb94be9f4a5b 100644
--- a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
@@ -79,9 +79,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getReward(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/pay/app/data.ts b/apps/web-ele/src/views/pay/app/data.ts
index e249539aa6da069bf605badd4df2d6a2a75bd2ba..b56df2b8b2235a8906f353a25cbd0253bb4a45d7 100644
--- a/apps/web-ele/src/views/pay/app/data.ts
+++ b/apps/web-ele/src/views/pay/app/data.ts
@@ -2,39 +2,50 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { PayAppApi } from '#/api/pay/app';
 
+import { h } from 'vue';
+
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
+import { z } from '#/adapter/form';
+import { InputUpload } from '#/components/upload';
+import { getRangePickerDefaultProps } from '#/utils';
+
+/** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
     {
-      component: 'Input',
       fieldName: 'name',
       label: '应用名',
+      component: 'Input',
       componentProps: {
         placeholder: '请输入应用名',
+        clearable: true,
       },
     },
     {
-      component: 'Select',
       fieldName: 'status',
       label: '开启状态',
+      component: 'Select',
       componentProps: {
         placeholder: '请选择开启状态',
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        clearable: true,
       },
     },
     {
-      component: 'RangePicker',
       fieldName: 'createTime',
       label: '创建时间',
+      component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始日期', '结束日期'],
+        ...getRangePickerDefaultProps(),
+        clearable: true,
       },
     },
   ];
 }
 
+/** 列表的字段 */
 export function useGridColumns<T = PayAppApi.App>(
   onStatusChange?: (
     newStatus: number,
@@ -42,26 +53,27 @@ export function useGridColumns<T = PayAppApi.App>(
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
-    { type: 'checkbox', width: 60 },
     {
-      title: '应用标识',
       field: 'appKey',
+      title: '应用标识',
+      minWidth: 40,
     },
     {
-      title: '应用名',
       field: 'name',
+      title: '应用名',
+      minWidth: 40,
     },
     {
       field: 'status',
       title: '状态',
       align: 'center',
+      minWidth: 40,
       cellRender: {
         attrs: { beforeChange: onStatusChange },
         name: 'CellSwitch',
         props: {
-          checkedValue: CommonStatusEnum.ENABLE,
-          unCheckedValue: CommonStatusEnum.DISABLE,
-          inlinePrompt: true,
+          activeValue: CommonStatusEnum.ENABLE,
+          inactiveValue: CommonStatusEnum.DISABLE,
         },
       },
     },
@@ -69,31 +81,32 @@ export function useGridColumns<T = PayAppApi.App>(
       title: '支付宝配置',
       children: [
         {
-          title: 'APP 支付',
+          title: 'APP',
           slots: {
             default: 'alipayAppConfig',
           },
         },
         {
-          title: 'PC 网站支付',
+          title: 'PC 网站',
           slots: {
             default: 'alipayPCConfig',
           },
         },
         {
-          title: 'WAP 网站支付',
+          title: 'WAP 网站',
           slots: {
             default: 'alipayWAPConfig',
           },
+          minWidth: 10,
         },
         {
-          title: '扫码支付',
+          title: '扫码',
           slots: {
             default: 'alipayQrConfig',
           },
         },
         {
-          title: '条码支付',
+          title: '条码',
           slots: {
             default: 'alipayBarConfig',
           },
@@ -104,37 +117,38 @@ export function useGridColumns<T = PayAppApi.App>(
       title: '微信配置',
       children: [
         {
-          title: '小程序支付',
+          title: '小程序',
           slots: {
             default: 'wxLiteConfig',
           },
         },
         {
-          title: 'JSAPI 支付',
+          title: 'JSAPI',
           slots: {
             default: 'wxPubConfig',
           },
         },
         {
-          title: 'APP 支付',
+          title: 'APP',
           slots: {
             default: 'wxAppConfig',
           },
         },
         {
-          title: 'Native 支付',
+          title: 'Native',
           slots: {
             default: 'wxNativeConfig',
           },
         },
         {
-          title: 'WAP 网站支付',
+          title: 'WAP 网站',
           slots: {
             default: 'wxWapConfig',
           },
+          minWidth: 10,
         },
         {
-          title: '条码支付',
+          title: '条码',
           slots: {
             default: 'wxBarConfig',
           },
@@ -157,28 +171,27 @@ export function useGridColumns<T = PayAppApi.App>(
     },
     {
       title: '操作',
-      width: 130,
+      width: 140,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
 
-/** 新增/修改的表单 */
-export function useFormSchema(): VbenFormSchema[] {
+/** 应用新增/修改的表单 */
+export function useAppFormSchema(): VbenFormSchema[] {
   return [
     {
-      label: '应用编号',
       fieldName: 'id',
       component: 'Input',
       dependencies: {
-        show: () => false,
         triggerFields: [''],
+        show: () => false,
       },
     },
     {
-      label: '应用名',
       fieldName: 'name',
+      label: '应用名',
       component: 'Input',
       rules: 'required',
       componentProps: {
@@ -186,8 +199,8 @@ export function useFormSchema(): VbenFormSchema[] {
       },
     },
     {
-      label: '应用标识',
       fieldName: 'appKey',
+      label: '应用标识',
       component: 'Input',
       rules: 'required',
       componentProps: {
@@ -195,17 +208,17 @@ export function useFormSchema(): VbenFormSchema[] {
       },
     },
     {
-      label: '开启状态',
       fieldName: 'status',
+      label: '开启状态',
       component: 'RadioGroup',
-      rules: 'required',
+      rules: z.number().default(CommonStatusEnum.ENABLE),
       componentProps: {
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
       },
     },
     {
-      label: '支付结果的回调地址',
       fieldName: 'orderNotifyUrl',
+      label: '支付结果的回调地址',
       component: 'Input',
       rules: 'required',
       componentProps: {
@@ -213,26 +226,25 @@ export function useFormSchema(): VbenFormSchema[] {
       },
     },
     {
-      label: '退款结果的回调地址',
       fieldName: 'refundNotifyUrl',
+      label: '退款结果的回调地址',
       component: 'Input',
       rules: 'required',
       componentProps: {
-        placeholder: '请输入支付结果的回调地址',
+        placeholder: '请输入退款结果的回调地址',
       },
     },
     {
-      label: '转账结果的回调地址',
       fieldName: 'transferNotifyUrl',
+      label: '转账结果的回调地址',
       component: 'Input',
-      rules: 'required',
       componentProps: {
         placeholder: '请输入转账结果的回调地址',
       },
     },
     {
-      label: '备注',
       fieldName: 'remark',
+      label: '备注',
       component: 'Textarea',
       componentProps: {
         rows: 3,
@@ -241,3 +253,408 @@ export function useFormSchema(): VbenFormSchema[] {
     },
   ];
 }
+
+/** 渠道新增/修改的表单 */
+export function useChannelFormSchema(formType: string = ''): VbenFormSchema[] {
+  const schema: VbenFormSchema[] = [];
+  // 添加通用字段
+  schema.push(
+    {
+      component: 'Input',
+      fieldName: 'id',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      label: '应用编号',
+      fieldName: 'appId',
+      component: 'Input',
+      dependencies: {
+        show: () => false,
+        triggerFields: [''],
+      },
+    },
+    {
+      label: '渠道编码',
+      fieldName: 'code',
+      component: 'Input',
+      dependencies: {
+        show: () => false,
+        triggerFields: [''],
+      },
+    },
+    {
+      label: '渠道费率',
+      fieldName: 'feeRate',
+      component: 'InputNumber',
+      rules: 'required',
+      componentProps: {
+        placeholder: '请输入渠道费率',
+        addonAfter: '%',
+      },
+      defaultValue: 0,
+    },
+    {
+      label: '渠道状态',
+      fieldName: 'status',
+      component: 'RadioGroup',
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+      },
+    },
+  );
+  // 根据类型添加特定字段
+  if (formType.includes('alipay_')) {
+    schema.push(
+      {
+        label: '开放平台 APPID',
+        fieldName: 'config.appId',
+        component: 'Input',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入开放平台 APPID',
+        },
+      },
+      {
+        label: '网关地址',
+        fieldName: 'config.serverUrl',
+        component: 'RadioGroup',
+        rules: 'required',
+        componentProps: {
+          options: [
+            {
+              value: 'https://openapi.alipay.com/gateway.do',
+              label: '线上环境',
+            },
+            {
+              value: 'https://openapi-sandbox.dl.alipaydev.com/gateway.do',
+              label: '沙箱环境',
+            },
+          ],
+        },
+      },
+      {
+        label: '算法类型',
+        fieldName: 'config.signType',
+        component: 'RadioGroup',
+        rules: 'required',
+        componentProps: {
+          options: [
+            {
+              value: 'RSA2',
+              label: 'RSA2',
+            },
+          ],
+        },
+        defaultValue: 'RSA2',
+      },
+      {
+        label: '公钥类型',
+        fieldName: 'config.mode',
+        component: 'RadioGroup',
+        rules: 'required',
+        componentProps: {
+          options: [
+            {
+              value: 1,
+              label: '公钥模式',
+            },
+            {
+              value: 2,
+              label: '证书模式',
+            },
+          ],
+        },
+      },
+      {
+        label: '应用私钥',
+        fieldName: 'config.privateKey',
+        component: 'Textarea',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入应用私钥',
+          rows: 3,
+        },
+      },
+      {
+        label: '支付宝公钥',
+        fieldName: 'config.alipayPublicKey',
+        component: 'Textarea',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入支付宝公钥',
+          rows: 3,
+        },
+        dependencies: {
+          show(values: any) {
+            return values?.config?.mode === 1;
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '商户公钥应用证书',
+        fieldName: 'config.appCertContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: { rows: 3, placeholder: '请上传商户公钥应用证书' },
+          fileUploadProps: {
+            accept: ['crt'],
+          },
+        }),
+        rules: 'required',
+        dependencies: {
+          show(values: any) {
+            return values?.config?.mode === 2;
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '支付宝公钥证书',
+        fieldName: 'config.alipayPublicCertContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: { rows: 3, placeholder: '请上传支付宝公钥证书' },
+          fileUploadProps: {
+            accept: ['crt'],
+          },
+        }),
+        rules: 'required',
+        dependencies: {
+          show(values: any) {
+            return values?.config?.mode === 2;
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '根证书',
+        fieldName: 'config.rootCertContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: { rows: 3, placeholder: '请上传根证书' },
+          fileUploadProps: {
+            accept: ['crt'],
+          },
+        }),
+        rules: 'required',
+        dependencies: {
+          show(values: any) {
+            return values?.config?.mode === 2;
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '接口内容加密方式',
+        fieldName: 'config.encryptType',
+        component: 'RadioGroup',
+        rules: 'required',
+        componentProps: {
+          options: [
+            {
+              value: 'NONE',
+              label: '无加密',
+            },
+            {
+              value: 'AES',
+              label: 'AES',
+            },
+          ],
+        },
+        defaultValue: 'NONE',
+      },
+      {
+        label: '接口内容加密密钥',
+        fieldName: 'config.encryptKey',
+        component: 'Input',
+        rules: 'required',
+        dependencies: {
+          show(values: any) {
+            return values?.config?.encryptType === 'AES';
+          },
+          triggerFields: ['config.encryptType', 'encryptType', 'config'],
+        },
+      },
+    );
+  } else if (formType.includes('wx_')) {
+    schema.push(
+      {
+        label: '微信 APPID',
+        fieldName: 'config.appId',
+        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/extend/merchant_appid/mapay_platform/account_manage]查看 APPID',
+        component: 'Input',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入微信 APPID',
+        },
+      },
+      {
+        label: '商户号',
+        fieldName: 'config.mchId',
+        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/extend/pay_setting]查看商户号',
+        component: 'Input',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入商户号',
+        },
+      },
+      {
+        label: 'API 版本',
+        fieldName: 'config.apiVersion',
+        component: 'RadioGroup',
+        rules: 'required',
+        componentProps: {
+          options: [
+            {
+              label: 'v2',
+              value: 'v2',
+            },
+            {
+              label: 'v3',
+              value: 'v3',
+            },
+          ],
+        },
+      },
+      {
+        label: '商户密钥',
+        fieldName: 'config.mchKey',
+        component: 'Input',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入商户密钥',
+        },
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v2';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: 'apiclient_cert.p12 证书',
+        fieldName: 'config.keyContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: {
+            rows: 3,
+            placeholder: '请上传 apiclient_cert.p12 证书',
+          },
+          fileUploadProps: {
+            accept: ['p12'],
+          },
+        }),
+        rules: 'required',
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v2';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: 'API V3 密钥',
+        fieldName: 'config.apiV3Key',
+        component: 'Input',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入 API V3 密钥',
+        },
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v3';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: 'apiclient_key.pem 证书',
+        fieldName: 'config.privateKeyContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: {
+            rows: 3,
+            placeholder: '请上传 apiclient_key.pem 证书',
+          },
+          fileUploadProps: {
+            accept: ['pem'],
+          },
+        }),
+        rules: 'required',
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v3';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '证书序列号',
+        fieldName: 'config.certSerialNo',
+        component: 'Input',
+        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/core/cert/api_cert#/api-cert-manage]查看证书序列号',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入证书序列号',
+        },
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v3';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: 'public_key.pem 证书',
+        fieldName: 'config.publicKeyContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: {
+            rows: 3,
+            placeholder: '请上传 public_key.pem 证书',
+          },
+          fileUploadProps: {
+            accept: ['pem'],
+          },
+        }),
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v3';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '公钥 ID',
+        fieldName: 'config.publicKeyId',
+        component: 'Input',
+        help: '微信支付公钥产品简介及使用说明[https://pay.weixin.qq.com/doc/v3/merchant/4012153196]',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入公钥 ID',
+        },
+        dependencies: {
+          show(values: any) {
+            return values?.config?.apiVersion === 'v3';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+    );
+  }
+  // 添加备注字段（所有类型都有）
+  schema.push({
+    label: '备注',
+    fieldName: 'remark',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入备注',
+    },
+  });
+  return schema;
+}
diff --git a/apps/web-ele/src/views/pay/app/index.vue b/apps/web-ele/src/views/pay/app/index.vue
index db4bd9980ba6ac95cb0f377920e5948a4cd822ef..6dfe7f8e5912888c95439c289b312ee398989b5d 100644
--- a/apps/web-ele/src/views/pay/app/index.vue
+++ b/apps/web-ele/src/views/pay/app/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { PayAppApi } from '#/api/pay/app/index';
+import type { ActionItem, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayAppApi } from '#/api/pay/app';
 
 import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { CommonStatusEnum, PayChannelEnum } from '@vben/constants';
@@ -8,50 +8,58 @@ import { CommonStatusEnum, PayChannelEnum } from '@vben/constants';
 import { ElLoading, ElMessage } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { changeAppStatus, deleteApp, getAppPage } from '#/api/pay/app/index';
+import { deleteApp, getAppPage, updateAppStatus } from '#/api/pay/app';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import appFrom from './modules/app-form.vue';
-import channelFrom from './modules/channel-form.vue';
+import AppForm from './modules/app-form.vue';
+import ChannelForm from './modules/channel-form.vue';
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
 const [AppFormModal, appFormModalApi] = useVbenModal({
-  connectedComponent: appFrom,
+  connectedComponent: AppForm,
   destroyOnClose: true,
 });
 
 const [ChannelFormModal, channelFormModalApi] = useVbenModal({
-  connectedComponent: channelFrom,
+  connectedComponent: ChannelForm,
   destroyOnClose: true,
 });
 
+/** 创建应用 */
 function handleCreate() {
   appFormModalApi.setData(null).open();
 }
 
+/** 编辑应用 */
 function handleEdit(row: PayAppApi.App) {
   appFormModalApi.setData({ id: row.id }).open();
 }
 
+/** 创建/编辑渠道 */
+async function handleChannelForm(row: PayAppApi.App, payCode: string) {
+  channelFormModalApi.setData({ appId: row.id, code: payCode }).open();
+}
+
+/** 删除应用 */
 async function handleDelete(row: PayAppApi.App) {
   const loadingInstance = ElLoading.service({
     text: $t('ui.actionMessage.deleting', [row.name]),
   });
   try {
-    await deleteApp(row.id as number);
+    await deleteApp(row.id!);
     ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
-    onRefresh();
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
 }
 
-/** 更新状态 */
+/** 更新应用状态 */
 async function handleStatusChange(
   newStatus: number,
   row: PayAppApi.App,
@@ -63,8 +71,8 @@ async function handleStatusChange(
     })
       .then(async () => {
         // 更新状态
-        const res = await changeAppStatus({
-          id: row.id as number,
+        const res = await updateAppStatus({
+          id: row.id!,
           status: newStatus,
         });
         if (res) {
@@ -81,21 +89,20 @@ async function handleStatusChange(
   });
 }
 
-/**
- * 根据渠道编码判断渠道列表中是否存在
- *
- * @param channels 渠道列表
- * @param channelCode 渠道编码
- */
-function isChannelExists(channels: string[], channelCode: string) {
-  if (!channels) {
-    return false;
-  }
-  return channels.includes(channelCode);
-}
-
-async function openChannelForm(row: PayAppApi.App, payCode: string) {
-  channelFormModalApi.setData({ id: row.id, payCode }).open();
+/** 生成渠道配置按钮 */
+function createChannelConfigAction(
+  row: PayAppApi.App,
+  channelCode: string,
+): ActionItem[] {
+  const exists = row.channelCodes?.includes(channelCode);
+  return [
+    {
+      type: exists ? 'primary' : 'danger',
+      size: 'small',
+      icon: exists ? 'lucide:check' : 'lucide:x',
+      onClick: handleChannelForm.bind(null, row, channelCode),
+    },
+  ];
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -119,6 +126,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -134,10 +142,10 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <DocAlert title="支付功能开启" url="https://doc.iocoder.cn/pay/build/" />
     </template>
 
-    <AppFormModal @success="onRefresh" />
-    <ChannelFormModal @success="onRefresh" />
+    <AppFormModal @success="handleRefresh" />
+    <ChannelFormModal @success="handleRefresh" />
 
-    <Grid>
+    <Grid table-title="应用列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
@@ -156,16 +164,16 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               label: $t('common.edit'),
-              link: true,
               type: 'primary',
+              link: true,
               icon: ACTION_ICON.EDIT,
               auth: ['pay:app:update'],
               onClick: handleEdit.bind(null, row),
             },
             {
               label: $t('common.delete'),
-              link: true,
               type: 'danger',
+              link: true,
               icon: ACTION_ICON.DELETE,
               auth: ['pay:app:delete'],
               popConfirm: {
@@ -177,349 +185,80 @@ const [Grid, gridApi] = useVbenVxeGrid({
         />
       </template>
       <template #alipayAppConfig="{ row }">
-        <!-- TODO @xingyu：channelCodes 爆红 -->
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_APP.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_APP.code,
-              )
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_APP.code,
-              ),
-            },
-          ]"
+          :actions="
+            createChannelConfigAction(row, PayChannelEnum.ALIPAY_APP.code)
+          "
         />
       </template>
       <template #alipayPCConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_PC.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_APP.code,
-              )
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_PC.code,
-              ),
-            },
-          ]"
+          :actions="
+            createChannelConfigAction(row, PayChannelEnum.ALIPAY_PC.code)
+          "
         />
       </template>
       <template #alipayWAPConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_WAP.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_APP.code,
-              )
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_WAP.code,
-              ),
-            },
-          ]"
+          :actions="
+            createChannelConfigAction(row, PayChannelEnum.ALIPAY_WAP.code)
+          "
         />
       </template>
       <template #alipayQrConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_QR.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_APP.code,
-              )
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_QR.code,
-              ),
-            },
-          ]"
+          :actions="
+            createChannelConfigAction(row, PayChannelEnum.ALIPAY_QR.code)
+          "
         />
       </template>
       <template #alipayBarConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_BAR.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_APP.code,
-              )
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_BAR.code,
-              ),
-            },
-          ]"
+          :actions="
+            createChannelConfigAction(row, PayChannelEnum.ALIPAY_BAR.code)
+          "
         />
       </template>
       <template #wxLiteConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_LITE.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_LITE.code,
-              )
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_LITE.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.WX_LITE.code)"
         />
       </template>
       <template #wxPubConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_PUB.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_PUB.code,
-              )
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_PUB.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.WX_PUB.code)"
         />
       </template>
       <template #wxAppConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_APP.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_APP.code,
-              )
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_APP.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.WX_APP.code)"
         />
       </template>
       <template #wxNativeConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_NATIVE.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_NATIVE.code,
-              )
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_NATIVE.code,
-              ),
-            },
-          ]"
+          :actions="
+            createChannelConfigAction(row, PayChannelEnum.WX_NATIVE.code)
+          "
         />
       </template>
       <template #wxWapConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_WAP.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_WAP.code,
-              )
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_WAP.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.WX_WAP.code)"
         />
       </template>
       <template #wxBarConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_BAR.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_BAR.code,
-              )
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_BAR.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.WX_BAR.code)"
         />
       </template>
       <template #walletConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WALLET.code,
-              )
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WALLET.code,
-              )
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WALLET.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.WALLET.code)"
         />
       </template>
       <template #mockConfig="{ row }">
         <TableAction
-          :actions="[
-            {
-              size: 'small',
-              icon: isChannelExists(row.channelCodes, PayChannelEnum.MOCK.code)
-                ? 'lucide:check'
-                : 'lucide:x',
-              type: !isChannelExists(row.channelCodes, PayChannelEnum.MOCK.code)
-                ? 'danger'
-                : 'primary',
-              circle: true,
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.MOCK.code,
-              ),
-            },
-          ]"
+          :actions="createChannelConfigAction(row, PayChannelEnum.MOCK.code)"
         />
       </template>
     </Grid>
diff --git a/apps/web-ele/src/views/pay/app/modules/app-form.vue b/apps/web-ele/src/views/pay/app/modules/app-form.vue
index 4d94195828cb277e435218a29a30bac3982a82cb..0f41f2c0d457ec2090354d36a4f947379b207878 100644
--- a/apps/web-ele/src/views/pay/app/modules/app-form.vue
+++ b/apps/web-ele/src/views/pay/app/modules/app-form.vue
@@ -11,14 +11,14 @@ import { ElMessage } from 'element-plus';
 import { useVbenForm } from '#/adapter/form';
 import { createApp, getApp, updateApp } from '#/api/pay/app';
 
-import { useFormSchema } from '../data';
+import { useAppFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
 const formData = ref<PayAppApi.App>();
 const title = 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({
@@ -30,7 +30,7 @@ const [Form, formApi] = useVbenForm({
     labelWidth: 160,
   },
   layout: 'horizontal',
-  schema: useFormSchema(),
+  schema: useAppFormSchema(),
   showDefaultActions: false,
 });
 
@@ -53,7 +53,7 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.unlock();
     }
   },
-  onOpenChange: async (isOpen) => {
+  async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
       return;
@@ -77,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({
 });
 </script>
 <template>
-  <Modal :close-on-click-modal="false" :title="title" class="w-2/5">
+  <Modal :title="title" class="w-2/5">
     <Form />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/pay/app/modules/channel-form.vue b/apps/web-ele/src/views/pay/app/modules/channel-form.vue
index 2b82bc8b7082ed37e6de590be03223bac6d5b2ca..70706929306614865fa6b33f347cc73e9b558956 100644
--- a/apps/web-ele/src/views/pay/app/modules/channel-form.vue
+++ b/apps/web-ele/src/views/pay/app/modules/channel-form.vue
@@ -12,15 +12,14 @@ import { ElMessage } from 'element-plus';
 import { useVbenForm } from '#/adapter/form';
 import { createChannel, getChannel, updateChannel } from '#/api/pay/channel';
 
-import { channelSchema } from './data';
+import { useChannelFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
 const formData = ref<any>();
-const formType = ref<string>('');
 const title = computed(() => {
   return formData.value?.id === 0
-    ? $t('ui.actionTitle.create', '应用')
-    : $t('ui.actionTitle.edit', '应用');
+    ? $t('ui.actionTitle.create', ['渠道'])
+    : $t('ui.actionTitle.edit', ['渠道']);
 });
 
 const [Form, formApi] = useVbenForm({
@@ -44,17 +43,9 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as PayChannelApi.Channel;
-    // 只保留表单中实际存在的字段，且值不为 undefined
-    const data2 = Object.fromEntries(
-      Object.entries(data).filter(([key, value]) => {
-        // 检查字段是否在表单中存在，且值不为 undefined
-        return key in data && value !== undefined;
-      }),
-    );
-    const data3 = { ...formData.value, ...data2 };
-    data3.config = JSON.stringify(data3.config);
+    data.config = JSON.stringify(data.config);
     try {
-      await (data3.id ? updateChannel(data3) : createChannel(data3));
+      await (data.id ? updateChannel(data) : createChannel(data));
       // 关闭并提示
       await modalApi.close();
       emit('success');
@@ -63,94 +54,75 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.unlock();
     }
   },
-  onOpenChange: async (isOpen) => {
+  async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
       return;
     }
     // 加载数据
-    const { id, payCode } = modalApi.getData() as {
-      id?: number;
-      payCode?: string;
+    const { appId, code } = modalApi.getData() as {
+      appId?: number;
+      code?: string;
     };
-    if (!id || !payCode) {
+    if (!appId || !code) {
       return;
     }
     modalApi.lock();
-    formType.value = payCode;
-    if (payCode.includes('alipay_')) {
-      formData.value = {
-        appId: id,
-        code: payCode,
-        status: CommonStatusEnum.ENABLE,
-        remark: '',
-        feeRate: null,
-        config: {
-          appId: '',
-          serverUrl: null,
-          signType: 'RSA2',
-          mode: null,
-          privateKey: '',
-          alipayPublicKey: '',
-          appCertContent: '',
-          alipayPublicCertContent: '',
-          rootCertContent: '',
-          encryptType: '',
-          encryptKey: '',
-        },
+    formData.value = {
+      appId,
+      code,
+      status: CommonStatusEnum.ENABLE,
+      remark: '',
+      feeRate: 0,
+      config: {},
+    };
+    if (code.includes('alipay_')) {
+      formData.value.config = {
+        appId: undefined,
+        serverUrl: undefined,
+        signType: 'RSA2',
+        mode: undefined,
+        privateKey: undefined,
+        alipayPublicKey: undefined,
+        appCertContent: undefined,
+        alipayPublicCertContent: undefined,
+        rootCertContent: undefined,
+        encryptType: undefined,
+        encryptKey: undefined,
       };
-    } else if (payCode.includes('mock')) {
-      formData.value = {
-        appId: id,
-        code: payCode,
-        status: CommonStatusEnum.ENABLE,
-        remark: '',
-        feeRate: 0,
-        config: {
-          name: 'mock-conf',
-        },
+    } else if (code.includes('mock')) {
+      formData.value.config = {
+        name: 'mock-conf',
       };
-    } else if (payCode.includes('wallet')) {
-      formData.value = {
-        appId: id,
-        code: payCode,
-        status: CommonStatusEnum.ENABLE,
-        remark: '',
-        feeRate: 0,
+    } else if (code.includes('wallet')) {
+      formData.value.config = {
         config: {
-          name: 'mock-conf',
+          name: 'wallet-conf',
         },
       };
-    } else if (payCode.includes('wx')) {
-      formData.value = {
-        appId: id,
-        code: payCode,
-        status: CommonStatusEnum.ENABLE,
-        feeRate: undefined,
-        remark: '',
-        config: {
-          appId: '',
-          mchId: '',
-          apiVersion: '',
-          mchKey: '',
-          keyContent: '',
-          privateKeyContent: '',
-          certSerialNo: '',
-          apiV3Key: '',
-          publicKeyContent: '',
-          publicKeyId: '',
-        },
+    } else if (code.includes('wx')) {
+      formData.value.config = {
+        appId: undefined,
+        mchId: undefined,
+        apiVersion: undefined,
+        mchKey: undefined,
+        keyContent: undefined,
+        privateKeyContent: undefined,
+        certSerialNo: undefined,
+        apiV3Key: undefined,
+        publicKeyContent: undefined,
+        publicKeyId: undefined,
       };
     }
 
     try {
-      const res = await getChannel(id, payCode);
-      formData.value = {
-        ...res,
-        config: {
-          ...JSON.parse(res.config),
-        },
-      };
+      const res = await getChannel(appId, code);
+      if (res) {
+        formData.value = {
+          ...res,
+          config: JSON.parse(res.config),
+        };
+      }
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
@@ -161,7 +133,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal :close-on-click-modal="false" :title="title" class="w-2/5">
-    <Form :schema="channelSchema(formType)" />
+  <Modal :title="title" class="w-2/5">
+    <Form :schema="useChannelFormSchema(formData?.code)" />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/pay/app/modules/data.ts b/apps/web-ele/src/views/pay/app/modules/data.ts
deleted file mode 100644
index 59c9b4a0a0224cd8b069226439702e877ca1e535..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/pay/app/modules/data.ts
+++ /dev/null
@@ -1,492 +0,0 @@
-import type { VbenFormSchema } from '#/adapter/form';
-
-import { h } from 'vue';
-
-import { DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
-
-import { InputUpload } from '#/components/upload';
-
-export function channelSchema(formType: string): VbenFormSchema[] {
-  if (formType.includes('alipay_')) {
-    return [
-      {
-        label: '应用编号',
-        fieldName: 'appId',
-        component: 'Input',
-        dependencies: {
-          show: () => false,
-          triggerFields: [''],
-        },
-      },
-      {
-        label: '渠道费率',
-        fieldName: 'feeRate',
-        component: 'InputNumber',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入渠道费率',
-          addonAfter: '%',
-        },
-        defaultValue: 0,
-      },
-      {
-        label: '开放平台 APPID',
-        fieldName: 'config.appId',
-        component: 'Input',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入开放平台 APPID',
-        },
-      },
-      {
-        label: '渠道状态',
-        fieldName: 'status',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        },
-        defaultValue: 0,
-      },
-      {
-        label: '网关地址',
-        fieldName: 'config.serverUrl',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: [
-            {
-              value: 'https://openapi.alipay.com/gateway.do',
-              label: '线上环境',
-            },
-            {
-              value: 'https://openapi-sandbox.dl.alipaydev.com/gateway.do',
-              label: '沙箱环境',
-            },
-          ],
-        },
-      },
-      {
-        label: '算法类型',
-        fieldName: 'config.signType',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: [
-            {
-              value: 'RSA2',
-              label: 'RSA2',
-            },
-          ],
-        },
-        defaultValue: 'RSA2',
-      },
-      {
-        label: '公钥类型',
-        fieldName: 'config.mode',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: [
-            {
-              value: 1,
-              label: '公钥模式',
-            },
-            {
-              value: 2,
-              label: '证书模式',
-            },
-          ],
-        },
-      },
-      {
-        label: '应用私钥',
-        fieldName: 'config.privateKey',
-        component: 'Textarea',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入应用私钥',
-          rows: 8,
-        },
-      },
-      {
-        label: '支付宝公钥',
-        fieldName: 'config.alipayPublicKey',
-        component: 'Textarea',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入支付宝公钥',
-          rows: 8,
-        },
-        dependencies: {
-          show(values) {
-            return values?.config?.mode === 1;
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '商户公钥应用证书',
-        fieldName: 'config.appCertContent',
-        component: h(InputUpload, {
-          inputType: 'textarea',
-          textareaProps: { rows: 8, placeholder: '请上传商户公钥应用证书' },
-          fileUploadProps: {
-            accept: ['crt'],
-          },
-        }),
-        rules: 'required',
-        dependencies: {
-          show(values) {
-            return values?.config?.mode === 2;
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '支付宝公钥证书',
-        fieldName: 'config.alipayPublicCertContent',
-        component: h(InputUpload, {
-          inputType: 'textarea',
-          textareaProps: { rows: 8, placeholder: '请上传支付宝公钥证书' },
-          fileUploadProps: {
-            accept: ['crt'],
-          },
-        }),
-        rules: 'required',
-        dependencies: {
-          show(values) {
-            return values?.config?.mode === 2;
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '根证书',
-        fieldName: 'config.rootCertContent',
-        component: h(InputUpload, {
-          inputType: 'textarea',
-          textareaProps: { rows: 8, placeholder: '请上传根证书' },
-          fileUploadProps: {
-            accept: ['crt'],
-          },
-        }),
-        rules: 'required',
-        dependencies: {
-          show(values) {
-            return values?.config?.mode === 2;
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '接口内容加密方式',
-        fieldName: 'config.encryptType',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: [
-            {
-              value: 'NONE',
-              label: '无加密',
-            },
-            {
-              value: 'AES',
-              label: 'AES',
-            },
-          ],
-        },
-        defaultValue: 'NONE',
-      },
-      {
-        label: '接口内容加密密钥',
-        fieldName: 'config.encryptKey',
-        component: 'Input',
-        rules: 'required',
-        dependencies: {
-          show(values) {
-            return values?.config?.encryptType === 'AES';
-          },
-          triggerFields: ['config.encryptType', 'encryptType', 'config'],
-        },
-      },
-      {
-        label: '备注',
-        fieldName: 'remark',
-        component: 'Input',
-        componentProps: {
-          placeholder: '请输入备注',
-        },
-      },
-    ];
-  } else if (formType.includes('mock') || formType.includes('wallet')) {
-    return [
-      {
-        label: '应用编号',
-        fieldName: 'appId',
-        component: 'Input',
-        dependencies: {
-          show: () => false,
-          triggerFields: [''],
-        },
-      },
-      {
-        label: '渠道状态',
-        fieldName: 'status',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        },
-        defaultValue: 0,
-      },
-      {
-        label: '渠道编码',
-        fieldName: 'code',
-        component: 'Input',
-        dependencies: {
-          show: () => false,
-          triggerFields: [''],
-        },
-      },
-      {
-        label: '渠道费率',
-        fieldName: 'feeRate',
-        component: 'InputNumber',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入渠道费率',
-          addonAfter: '%',
-        },
-        defaultValue: 0,
-        dependencies: {
-          show: () => false,
-          triggerFields: [''],
-        },
-      },
-      {
-        label: '备注',
-        fieldName: 'remark',
-        component: 'Input',
-        componentProps: {
-          placeholder: '请输入备注',
-        },
-      },
-    ];
-  } else if (formType.includes('wx')) {
-    return [
-      {
-        label: '应用编号',
-        fieldName: 'appId',
-        component: 'Input',
-        dependencies: {
-          show: () => false,
-          triggerFields: [''],
-        },
-      },
-      {
-        label: '渠道编码',
-        fieldName: 'code',
-        component: 'Input',
-        dependencies: {
-          show: () => false,
-          triggerFields: [''],
-        },
-      },
-      {
-        label: '渠道费率',
-        fieldName: 'feeRate',
-        component: 'InputNumber',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入渠道费率',
-          addonAfter: '%',
-        },
-        defaultValue: 0,
-      },
-      {
-        label: '微信 APPID',
-        fieldName: 'config.appId',
-        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/extend/merchant_appid/mapay_platform/account_manage]查看 APPID',
-        component: 'Input',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入微信 APPID',
-        },
-      },
-      {
-        label: '商户号',
-        fieldName: 'config.mchId',
-        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/extend/pay_setting]查看商户号',
-        component: 'Input',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入商户号',
-        },
-      },
-      {
-        label: '渠道状态',
-        fieldName: 'status',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        },
-        defaultValue: 0,
-      },
-      {
-        label: 'API 版本',
-        fieldName: 'config.apiVersion',
-        component: 'RadioGroup',
-        rules: 'required',
-        componentProps: {
-          options: [
-            {
-              label: 'v2',
-              value: 'v2',
-            },
-            {
-              label: 'v3',
-              value: 'v3',
-            },
-          ],
-        },
-      },
-      {
-        label: '商户密钥',
-        fieldName: 'config.mchKey',
-        component: 'Input',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入商户密钥',
-        },
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v2';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: 'apiclient_cert.p12 证书',
-        fieldName: 'config.keyContent',
-        component: h(InputUpload, {
-          inputType: 'textarea',
-          textareaProps: {
-            rows: 8,
-            placeholder: '请上传 apiclient_cert.p12 证书',
-          },
-          fileUploadProps: {
-            accept: ['p12'],
-          },
-        }),
-        rules: 'required',
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v2';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: 'API V3 密钥',
-        fieldName: 'config.apiV3Key',
-        component: 'Input',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入 API V3 密钥',
-        },
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v3';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: 'apiclient_key.pem 证书',
-        fieldName: 'config.privateKeyContent',
-        component: h(InputUpload, {
-          inputType: 'textarea',
-          textareaProps: {
-            rows: 8,
-            placeholder: '请上传 apiclient_key.pem 证书',
-          },
-          fileUploadProps: {
-            accept: ['pem'],
-          },
-        }),
-        rules: 'required',
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v3';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '证书序列号',
-        fieldName: 'config.certSerialNo',
-        component: 'Input',
-        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/core/cert/api_cert#/api-cert-manage]查看证书序列号',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入证书序列号',
-        },
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v3';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: 'public_key.pem 证书',
-        fieldName: 'config.publicKeyContent',
-        component: h(InputUpload, {
-          inputType: 'textarea',
-          textareaProps: {
-            rows: 8,
-            placeholder: '请上传 public_key.pem 证书',
-          },
-          fileUploadProps: {
-            accept: ['pem'],
-          },
-        }),
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v3';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '公钥 ID',
-        fieldName: 'config.publicKeyId',
-        component: 'Input',
-        help: '微信支付公钥产品简介及使用说明[https://pay.weixin.qq.com/doc/v3/merchant/4012153196]',
-        rules: 'required',
-        componentProps: {
-          placeholder: '请输入公钥 ID',
-        },
-        dependencies: {
-          show(values) {
-            return values?.config?.apiVersion === 'v3';
-          },
-          triggerFields: ['config.mode', 'mode', 'config'],
-        },
-      },
-      {
-        label: '备注',
-        fieldName: 'remark',
-        component: 'Input',
-        componentProps: {
-          placeholder: '请输入备注',
-        },
-      },
-    ];
-  } else {
-    return [];
-  }
-}
diff --git a/apps/web-ele/src/views/pay/cashier/data.ts b/apps/web-ele/src/views/pay/cashier/data.ts
index 0918a6f100e7a3678f5ea65017d6b757b41db162..eb0cec95711dc2a692ba5fbfe083074e609346e3 100644
--- a/apps/web-ele/src/views/pay/cashier/data.ts
+++ b/apps/web-ele/src/views/pay/cashier/data.ts
@@ -40,6 +40,7 @@ export const channelsAlipay = [
     code: 'alipay_bar',
   },
 ];
+
 export const channelsWechat = [
   {
     name: '微信公众号支付',
@@ -67,6 +68,7 @@ export const channelsWechat = [
     code: 'wx_bar',
   },
 ];
+
 export const channelsMock = [
   {
     name: '钱包支付',
diff --git a/apps/web-ele/src/views/pay/cashier/index.vue b/apps/web-ele/src/views/pay/cashier/index.vue
index 7a338652fa698dcacbbc90e134eec6a42f9e7acc..9eec0d73dbb9a8bd6e776878ddac6c48a2cb6197 100644
--- a/apps/web-ele/src/views/pay/cashier/index.vue
+++ b/apps/web-ele/src/views/pay/cashier/index.vue
@@ -28,22 +28,21 @@ import { channelsAlipay, channelsMock, channelsWechat } from './data';
 
 defineOptions({ name: 'PayCashier' });
 
-const [Modal, modalApi] = useVbenModal({
-  showConfirmButton: false,
-  destroyOnClose: true,
-});
-
 const route = useRoute();
-const { push } = useRouter(); // 路由
+const { push } = useRouter();
 const { closeCurrentTab } = useTabs();
 
 const id = ref(); // 支付单号
 const title = ref('支付订单');
 const returnUrl = ref<string>(); // 支付完的回调地址
-
 const payOrder = ref<PayOrderApi.Order>();
 const interval = ref<any>(undefined); // 定时任务，轮询是否完成支付
 
+const [Modal, modalApi] = useVbenModal({
+  showConfirmButton: false,
+  destroyOnClose: true,
+});
+
 /** 展示形式：二维码 */
 const qrCode = ref({
   url: '',
@@ -87,9 +86,11 @@ async function getDetail() {
     goReturnUrl('close');
     return;
   }
+  // 2. 正常展示支付信息
   payOrder.value = res;
 }
 
+/** 处理支付 */
 function handlePay(channelCode: string) {
   switch (channelCode) {
     // 条形码支付，需要特殊处理
@@ -129,6 +130,7 @@ function handlePay(channelCode: string) {
   }
 }
 
+/** 提交支付 */
 async function submit(channelCode: string) {
   try {
     const submitParam = {
@@ -165,9 +167,7 @@ async function submit(channelCode: string) {
 
     // 打开轮询任务
     createQueryInterval();
-  } finally {
-    // message.success('支付成功！')
-  }
+  } finally {}
 }
 
 /** 构建提交支付的额外参数 */
@@ -291,10 +291,12 @@ function goReturnUrl(payResult: string) {
   }
 }
 
+/** 页面加载时，获取支付信息 */
 onMounted(async () => {
   await getDetail();
 });
 
+/** 页面卸载时，清理定时任务 */
 onBeforeUnmount(() => {
   clearQueryInterval();
 });
diff --git a/apps/web-ele/src/views/pay/demo/order/data.ts b/apps/web-ele/src/views/pay/demo/order/data.ts
index 5434f3b7b55efa05aa62ef801fe150554ad7e8c2..9f4b30aa7045ccdec5b08b9eb3c01f2212c176cf 100644
--- a/apps/web-ele/src/views/pay/demo/order/data.ts
+++ b/apps/web-ele/src/views/pay/demo/order/data.ts
@@ -2,32 +2,35 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { DICT_TYPE } from '@vben/constants';
+import { formatDateTime } from '@vben/utils';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
     {
-      component: 'Input',
       fieldName: 'id',
+      component: 'Input',
       dependencies: {
         triggerFields: [''],
         show: () => false,
       },
     },
     {
-      component: 'Select',
       fieldName: 'spuId',
       label: '商品',
-      rules: 'required',
+      component: 'Select',
       componentProps: {
         options: [
-          { label: '华为手机 --- 1.00元', value: 1, price: 1 },
-          { label: '小米电视 --- 10.00元', value: 2, price: 10 },
-          { label: '苹果手表 --- 100.00元', value: 3, price: 100 },
-          { label: '华硕笔记本 --- 1000.00元', value: 4, price: 1000 },
-          { label: '蔚来汽车 --- 200000.00元', value: 5, price: 200_000 },
+          { label: '华为手机 --- 1.00元', value: 1 },
+          { label: '小米电视 --- 10.00元', value: 2 },
+          { label: '苹果手表 --- 100.00元', value: 3 },
+          { label: '华硕笔记本 --- 1000.00元', value: 4 },
+          { label: '蔚来汽车 --- 200000.00元', value: 5 },
         ],
+        placeholder: '请选择下单商品',
+        allowClear: true,
       },
+      rules: 'required',
     },
   ];
 }
@@ -38,37 +41,45 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '订单编号',
+      minWidth: 100,
     },
     {
       field: 'userId',
       title: '用户编号',
+      minWidth: 100,
     },
     {
       field: 'spuName',
       title: '商品名字',
+      minWidth: 150,
     },
     {
       field: 'price',
       title: '支付价格',
-      formatter: 'formatFenToYuanAmount',
+      minWidth: 100,
+      formatter: 'formatAmount2',
     },
     {
       field: 'refundPrice',
       title: '退款金额',
-      formatter: 'formatFenToYuanAmount',
+      minWidth: 100,
+      formatter: 'formatAmount2',
     },
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'payOrderId',
       title: '支付单号',
+      minWidth: 120,
     },
     {
       field: 'payStatus',
       title: '是否支付',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
@@ -77,16 +88,26 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'payTime',
       title: '支付时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'refundTime',
       title: '退款时间',
-      slots: { default: 'refundTime' },
+      minWidth: 180,
+      formatter: ({ cellValue, row }) => {
+        if (cellValue) {
+          return formatDateTime(cellValue);
+        }
+        if (row.payRefundId) {
+          return '退款中，等待退款结果';
+        }
+        return '';
+      },
     },
     {
       title: '操作',
-      width: 200,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-ele/src/views/pay/demo/order/index.vue b/apps/web-ele/src/views/pay/demo/order/index.vue
index 31725cb571ae1942f31d3171a1b52bca3863e564..cbfee2b122b48c4a4606ac90023c5ecc82561ee7 100644
--- a/apps/web-ele/src/views/pay/demo/order/index.vue
+++ b/apps/web-ele/src/views/pay/demo/order/index.vue
@@ -5,13 +5,11 @@ import type { DemoOrderApi } from '#/api/pay/demo/order';
 import { useRouter } from 'vue-router';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
-import { formatDateTime } from '@vben/utils';
 
 import { ElLoading, ElMessage } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getDemoOrderPage, refundDemoOrder } from '#/api/pay/demo/order';
-import { $t } from '#/locales';
 
 import { useGridColumns } from './data';
 import Form from './modules/form.vue';
@@ -24,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({
 const router = useRouter();
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -51,8 +49,8 @@ async function handleRefund(row: DemoOrderApi.Order) {
   });
   try {
     await refundDemoOrder(row.id as number);
-    ElMessage.success('退款成功');
-    onRefresh();
+    ElMessage.success('发起退款成功！');
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
@@ -76,10 +74,10 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
-      search: true,
     },
   } as VxeTableGridOptions<DemoOrderApi.Order>,
 });
@@ -106,13 +104,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
 
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="示例订单列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
             {
-              label: $t('ui.actionTitle.create', ['示例订单']),
+              label: '发起订单',
               type: 'primary',
               icon: ACTION_ICON.ADD,
               onClick: handleCreate,
@@ -120,10 +118,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
           ]"
         />
       </template>
-      <template #refundTime="{ row }">
-        <span v-if="row.refundTime">{{ formatDateTime(row.refundTime) }}</span>
-        <span v-else-if="row.payRefundId">退款中，等待退款结果</span>
-      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[
@@ -131,6 +125,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: '前往支付',
               type: 'primary',
               link: true,
+              icon: ACTION_ICON.ADD,
               ifShow: !row.payStatus,
               onClick: handlePay.bind(null, row),
             },
@@ -138,6 +133,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: '发起退款',
               type: 'danger',
               link: true,
+              icon: ACTION_ICON.EDIT,
               ifShow: row.payStatus && !row.payRefundId,
               popConfirm: {
                 title: '确定发起退款吗？',
diff --git a/apps/web-ele/src/views/pay/demo/order/modules/form.vue b/apps/web-ele/src/views/pay/demo/order/modules/form.vue
index 9820b29882d8d9d8ca9a09030761d6ba1e5e451a..36b1b9d9b0a805e7a9bd9f72bf6c022abfd56957 100644
--- a/apps/web-ele/src/views/pay/demo/order/modules/form.vue
+++ b/apps/web-ele/src/views/pay/demo/order/modules/form.vue
@@ -49,7 +49,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="$t('ui.actionTitle.create', ['退款订单'])">
+  <Modal class="w-1/4" title="发起订单">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/pay/demo/withdraw/data.ts b/apps/web-ele/src/views/pay/demo/withdraw/data.ts
index 643bb59686ce9fcd74eadd317ba55a9585978f92..8b2c1b547031abeb858d1e373c02d6af0917da52 100644
--- a/apps/web-ele/src/views/pay/demo/withdraw/data.ts
+++ b/apps/web-ele/src/views/pay/demo/withdraw/data.ts
@@ -7,34 +7,38 @@ import { DICT_TYPE } from '@vben/constants';
 export function useFormSchema(): VbenFormSchema[] {
   return [
     {
-      component: 'Input',
       fieldName: 'id',
+      component: 'Input',
       dependencies: {
         triggerFields: [''],
         show: () => false,
       },
     },
     {
-      component: 'Input',
       fieldName: 'subject',
       label: '提现标题',
+      component: 'Input',
       rules: 'required',
+      componentProps: {
+        placeholder: '请输入提现标题',
+      },
     },
     {
-      component: 'InputNumber',
       fieldName: 'price',
       label: '提现金额',
+      component: 'InputNumber',
       rules: 'required',
       componentProps: {
         min: 1,
         precision: 2,
         step: 0.01,
+        placeholder: '请输入提现金额',
       },
     },
     {
-      component: 'Select',
       fieldName: 'type',
       label: '提现类型',
+      component: 'Select',
       rules: 'required',
       componentProps: {
         options: [
@@ -42,19 +46,46 @@ export function useFormSchema(): VbenFormSchema[] {
           { label: '微信余额', value: 2 },
           { label: '钱包余额', value: 3 },
         ],
+        placeholder: '请选择提现类型',
       },
     },
     {
+      fieldName: 'userAccount',
+      label: '收款人账号',
       component: 'Input',
-      fieldName: 'userName',
-      label: '收款人姓名',
       rules: 'required',
+      dependencies: {
+        triggerFields: ['type'],
+        componentProps: (values) => {
+          const type = values.type;
+          let placeholder = '请输入收款人账号';
+          switch (type) {
+            case 1: {
+              placeholder = '请输入支付宝账号';
+              break;
+            }
+            case 2: {
+              placeholder = '请输入微信 openid';
+              break;
+            }
+            case 3: {
+              placeholder = '请输入钱包编号';
+              break;
+            }
+          }
+          return {
+            placeholder,
+          };
+        },
+      },
     },
     {
+      fieldName: 'userName',
+      label: '收款人姓名',
       component: 'Input',
-      fieldName: 'userAccount',
-      label: '收款人账号',
-      rules: 'required',
+      componentProps: {
+        placeholder: '请输入收款人姓名',
+      },
     },
   ];
 }
@@ -65,41 +96,50 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '提现单编号',
+      minWidth: 100,
     },
     {
       field: 'subject',
       title: '提现标题',
+      minWidth: 150,
     },
     {
       field: 'type',
       title: '提现类型',
+      minWidth: 100,
       slots: { default: 'type' },
     },
     {
       field: 'price',
       title: '提现金额',
-      formatter: 'formatFenToYuanAmount',
+      minWidth: 100,
+      formatter: 'formatAmount2',
     },
     {
       field: 'userName',
       title: '收款人姓名',
+      minWidth: 120,
     },
     {
       field: 'userAccount',
       title: '收款人账号',
+      minWidth: 150,
     },
     {
       field: 'status',
       title: '提现状态',
+      minWidth: 100,
       slots: { default: 'status' },
     },
     {
       field: 'payTransferId',
       title: '转账单号',
+      minWidth: 120,
     },
     {
       field: 'transferChannelCode',
       title: '转账渠道',
+      minWidth: 130,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_CHANNEL_CODE },
@@ -108,15 +148,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'transferTime',
       title: '转账时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'transferErrorMsg',
       title: '转账失败原因',
+      minWidth: 150,
     },
     {
       title: '操作',
-      width: 130,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-ele/src/views/pay/demo/withdraw/index.vue b/apps/web-ele/src/views/pay/demo/withdraw/index.vue
index 9173e10685c84cee52a0f4f928c984e921fe3b5f..6357705d8193cd35708d3e037a525a582efd03e4 100644
--- a/apps/web-ele/src/views/pay/demo/withdraw/index.vue
+++ b/apps/web-ele/src/views/pay/demo/withdraw/index.vue
@@ -12,7 +12,6 @@ import {
   getDemoWithdrawPage,
   transferDemoWithdraw,
 } from '#/api/pay/demo/withdraw';
-import { $t } from '#/locales';
 
 import { useGridColumns } from './data';
 import Form from './modules/form.vue';
@@ -23,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -40,7 +39,7 @@ async function handleTransfer(row: DemoWithdrawApi.Withdraw) {
   try {
     const payTransferId = await transferDemoWithdraw(row.id as number);
     ElMessage.success(`转账提交成功，转账单号：${payTransferId}`);
-    onRefresh();
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
@@ -64,6 +63,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -86,7 +86,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
 
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="示例提现单列表">
       <template #toolbar-tools>
         <TableAction
@@ -125,13 +125,15 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: '发起转账',
               type: 'primary',
               link: true,
+              icon: ACTION_ICON.ADD,
               ifShow: row.status === 0 && !row.payTransferId,
               onClick: handleTransfer.bind(null, row),
             },
             {
               label: '重新转账',
-              type: 'primary',
+              type: 'danger',
               link: true,
+              icon: ACTION_ICON.EDIT,
               ifShow: row.status === 20,
               onClick: handleTransfer.bind(null, row),
             },
diff --git a/apps/web-ele/src/views/pay/demo/withdraw/modules/form.vue b/apps/web-ele/src/views/pay/demo/withdraw/modules/form.vue
index dae1422c2c4b5f436cbbff0fbd92bf3fd9d4671f..2370988da46eea80512442fc17c80f4dccb61df8 100644
--- a/apps/web-ele/src/views/pay/demo/withdraw/modules/form.vue
+++ b/apps/web-ele/src/views/pay/demo/withdraw/modules/form.vue
@@ -49,7 +49,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="$t('ui.actionTitle.create', ['示例提现单'])">
+  <Modal class="w-1/4" :title="$t('ui.actionTitle.create', ['示例提现单'])">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/pay/notify/data.ts b/apps/web-ele/src/views/pay/notify/data.ts
index f3c548728b2f68b1be2c1e12a0fe70b15a7d939f..3ab7a0b383ced041f41b62f5b59e51ac9433ea79 100644
--- a/apps/web-ele/src/views/pay/notify/data.ts
+++ b/apps/web-ele/src/views/pay/notify/data.ts
@@ -1,14 +1,19 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayNotifyApi } from '#/api/pay/notify';
+import type { DescriptionItemSchema } from '#/components/description';
+
+import { h } from 'vue';
 
-import { getAppList } from '#/api/pay/app';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { formatDateTime } from '@vben/utils';
 
+import { getAppList } from '#/api/pay/app';
+import { DictTag } from '#/components/dict-tag';
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
-// TODO @霖：缺少 placeholder
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
     {
@@ -24,7 +29,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
           }));
         },
         autoSelect: 'first',
-        placeholder: '请选择数据源',
+        placeholder: '请选择应用编号',
       },
     },
     {
@@ -34,12 +39,17 @@ export function useGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         clearable: true,
         options: getDictOptions(DICT_TYPE.PAY_NOTIFY_TYPE, 'number'),
+        placeholder: '请选择通知类型',
       },
     },
     {
       fieldName: 'dataId',
       label: '关联编号',
       component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入关联编号',
+      },
     },
     {
       fieldName: 'status',
@@ -48,12 +58,35 @@ export function useGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         clearable: true,
         options: getDictOptions(DICT_TYPE.PAY_NOTIFY_STATUS, 'number'),
+        placeholder: '请选择通知状态',
       },
     },
     {
       fieldName: 'merchantOrderId',
       label: '商户订单编号',
       component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入商户订单编号',
+      },
+    },
+    {
+      fieldName: 'merchantRefundId',
+      label: '商户退款编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入商户退款编号',
+      },
+    },
+    {
+      fieldName: 'merchantTransferId',
+      label: '商户转账编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入商户转账编号',
+      },
     },
     {
       fieldName: 'createTime',
@@ -62,6 +95,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         ...getRangePickerDefaultProps(),
         clearable: true,
+        placeholder: ['开始日期', '结束日期'],
       },
     },
   ];
@@ -73,18 +107,25 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '任务编号',
+      minWidth: 100,
     },
     {
       field: 'appName',
-      title: '应用编号',
+      title: '应用名称',
+      minWidth: 150,
     },
     {
-      field: 'merchantOrderId',
-      title: '商户订单编号',
+      field: 'merchantInfo',
+      title: '商户单信息',
+      minWidth: 240,
+      slots: {
+        default: 'merchantInfo',
+      },
     },
     {
       field: 'type',
       title: '通知类型',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_NOTIFY_TYPE },
@@ -93,10 +134,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'dataId',
       title: '关联编号',
+      minWidth: 120,
     },
     {
       field: 'status',
       title: '通知状态',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_NOTIFY_STATUS },
@@ -105,23 +148,20 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'lastExecuteTime',
       title: '最后通知时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'nextNotifyTime',
       title: '下次通知时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'notifyTimes',
       title: '通知次数',
-      cellRender: {
-        name: 'CellTag',
-        props: {
-          type: 'success',
-          content: '{notifyTimes} / {maxNotifyTimes}',
-        },
-      },
+      minWidth: 120,
+      formatter: ({ row }) => `${row.notifyTimes} / ${row.maxNotifyTimes}`,
     },
     {
       title: '操作',
@@ -132,41 +172,110 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
   ];
 }
 
-/** 详情列表的字段 */
-export const detailColumns = [
-  {
-    title: '日志编号',
-    dataIndex: 'id',
-    key: 'id',
-    width: 120,
-    ellipsis: false,
-  },
-  {
-    title: '通知状态',
-    dataIndex: 'status',
-    key: 'status',
-    width: 120,
-    ellipsis: false,
-  },
-  {
-    title: '通知次数',
-    dataIndex: 'notifyTimes',
-    key: 'notifyTimes',
-    width: 120,
-    ellipsis: false,
-  },
-  {
-    title: '通知时间',
-    dataIndex: 'lastExecuteTime',
-    key: 'lastExecuteTime',
-    width: 120,
-    ellipsis: false,
-  },
-  {
-    title: '响应结果',
-    dataIndex: 'response',
-    key: 'response',
-    width: 120,
-    ellipsis: false,
-  },
-];
+/** 详情的字段 */
+export function useDetailSchema(): DescriptionItemSchema[] {
+  return [
+    {
+      field: 'appId',
+      label: '应用编号',
+    },
+    {
+      field: 'appName',
+      label: '应用名称',
+    },
+    {
+      field: 'type',
+      label: '通知类型',
+      content: (data: PayNotifyApi.NotifyTask) =>
+        h(DictTag, {
+          type: DICT_TYPE.PAY_NOTIFY_TYPE,
+          value: data?.type,
+        }),
+    },
+    {
+      field: 'dataId',
+      label: '关联编号',
+    },
+    {
+      field: 'status',
+      label: '通知状态',
+      content: (data: PayNotifyApi.NotifyTask) =>
+        h(DictTag, {
+          type: DICT_TYPE.PAY_NOTIFY_STATUS,
+          value: data?.status,
+        }),
+    },
+    {
+      field: 'merchantOrderId',
+      label: '商户订单编号',
+    },
+    {
+      field: 'lastExecuteTime',
+      label: '最后通知时间',
+      content: (data: PayNotifyApi.NotifyTask) =>
+        formatDateTime(data?.lastExecuteTime) as string,
+    },
+    {
+      field: 'nextNotifyTime',
+      label: '下次通知时间',
+      content: (data: PayNotifyApi.NotifyTask) =>
+        formatDateTime(data?.nextNotifyTime) as string,
+    },
+    {
+      field: 'notifyTimes',
+      label: '通知次数',
+    },
+    {
+      field: 'maxNotifyTimes',
+      label: '最大通知次数',
+    },
+    {
+      field: 'createTime',
+      label: '创建时间',
+      content: (data: PayNotifyApi.NotifyTask) =>
+        formatDateTime(data?.createTime) as string,
+    },
+    {
+      field: 'updateTime',
+      label: '更新时间',
+      content: (data: PayNotifyApi.NotifyTask) =>
+        formatDateTime(data?.updateTime) as string,
+    },
+  ];
+}
+
+/** 详情的日志字段 */
+export function useDetailLogColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '日志编号',
+      minWidth: 120,
+    },
+    {
+      field: 'status',
+      title: '通知状态',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.PAY_NOTIFY_STATUS },
+      },
+    },
+    {
+      field: 'notifyTimes',
+      title: '通知次数',
+      minWidth: 120,
+    },
+    {
+      field: 'createTime',
+      title: '通知时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'response',
+      title: '响应结果',
+      minWidth: 200,
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/pay/notify/index.vue b/apps/web-ele/src/views/pay/notify/index.vue
index 983b94433d34d6d2a4472d42c4cb3a8867d7d093..9821fb9ff4b07338c55d89f06543c5db0acb1db9 100644
--- a/apps/web-ele/src/views/pay/notify/index.vue
+++ b/apps/web-ele/src/views/pay/notify/index.vue
@@ -1,9 +1,12 @@
 <script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayNotifyApi } from '#/api/pay/notify';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
+import { ElTag } from 'element-plus';
+
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getNotifyTaskPage } from '#/api/pay/notify';
 
@@ -16,12 +19,12 @@ const [DetailModal, detailModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
 /** 查看详情 */
-function handleDetail(row: any) {
+function handleDetail(row: PayNotifyApi.NotifyTask) {
   detailModalApi.setData(row).open();
 }
 
@@ -30,6 +33,9 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
+    cellConfig: {
+      height: 80,
+    },
     columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
@@ -46,12 +52,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
       search: true,
     },
-  } as VxeTableGridOptions<any>,
+  } as VxeTableGridOptions<PayNotifyApi.NotifyTask>,
 });
 </script>
 <template>
@@ -60,8 +67,24 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <DocAlert title="支付功能开启" url="https://doc.iocoder.cn/pay/build/" />
     </template>
 
-    <DetailModal @success="onRefresh" />
-    <Grid table-title="支付通知列表">
+    <DetailModal @success="handleRefresh" />
+    <Grid table-title="通知列表">
+      <template #merchantInfo="{ row }">
+        <div class="flex flex-col gap-1 text-left">
+          <p class="text-sm" v-if="row.merchantOrderId">
+            <ElTag size="small" type="primary">商户订单编号</ElTag>
+            {{ row.merchantOrderId }}
+          </p>
+          <p class="text-sm" v-if="row.merchantRefundId">
+            <ElTag size="small" type="warning">商户退款编号</ElTag>
+            {{ row.merchantRefundId }}
+          </p>
+          <p class="text-sm" v-if="row.merchantTransferId">
+            <ElTag size="small" type="success">商户转账编号</ElTag>
+            {{ row.merchantTransferId }}
+          </p>
+        </div>
+      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[
diff --git a/apps/web-ele/src/views/pay/notify/modules/detail.vue b/apps/web-ele/src/views/pay/notify/modules/detail.vue
index ad4577093a1c2c2a4b50ddc9e26fa705ea2c71aa..26bc4a7479004489251daa621bd634c8e89c1c6a 100644
--- a/apps/web-ele/src/views/pay/notify/modules/detail.vue
+++ b/apps/web-ele/src/views/pay/notify/modules/detail.vue
@@ -1,24 +1,51 @@
 <script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayNotifyApi } from '#/api/pay/notify';
+
 import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
 
-import {
-  ElDescriptions,
-  ElDescriptionsItem,
-  ElDivider,
-  ElTable,
-  ElTag,
-} from 'element-plus';
+import { ElDivider } from 'element-plus';
 
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getNotifyTaskDetail } from '#/api/pay/notify';
-import { DictTag } from '#/components/dict-tag';
+import { useDescription } from '#/components/description';
+
+import { useDetailLogColumns, useDetailSchema } from '../data';
+
+const formData = ref<PayNotifyApi.NotifyTask>();
 
-import { detailColumns } from '../data';
+const [Description] = useDescription({
+  componentProps: {
+    border: true,
+    column: 2,
+    direction: 'horizontal',
+    labelWidth: 140,
+    title: '',
+    extra: '',
+  },
+  schema: useDetailSchema(),
+});
 
-const formData = ref();
+const [LogGrid, logGridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useDetailLogColumns(),
+    height: 'auto',
+    keepSource: true,
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    pagerConfig: {
+      enabled: false,
+    },
+    toolbarConfig: {
+      enabled: true,
+      refresh: true,
+    },
+  } as VxeTableGridOptions,
+});
 
 const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
@@ -27,13 +54,14 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData();
+    const data = modalApi.getData<PayNotifyApi.NotifyTask>();
     if (!data || !data.id) {
       return;
     }
     modalApi.lock();
     try {
       formData.value = await getNotifyTaskDetail(data.id);
+      logGridApi.grid?.reloadData(formData.value?.logs || []);
     } finally {
       modalApi.unlock();
     }
@@ -48,60 +76,10 @@ const [Modal, modalApi] = useVbenModal({
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <ElDescriptions border :column="2" class="mx-4">
-      <ElDescriptionsItem label="商户订单编号">
-        <ElTag>{{ formData?.merchantOrderId }}</ElTag>
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="通知状态">
-        <DictTag
-          :type="DICT_TYPE.PAY_NOTIFY_STATUS"
-          :value="formData?.status"
-        />
-      </ElDescriptionsItem>
-
-      <ElDescriptionsItem label="应用编号">
-        {{ formData?.appId }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="应用名称">
-        {{ formData?.appName }}
-      </ElDescriptionsItem>
-
-      <ElDescriptionsItem label="关联编号">
-        {{ formData?.dataId }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="通知类型">
-        <DictTag :type="DICT_TYPE.PAY_NOTIFY_TYPE" :value="formData?.type" />
-      </ElDescriptionsItem>
-
-      <ElDescriptionsItem label="通知次数">
-        {{ formData?.notifyTimes }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="最大通知次数">
-        {{ formData?.maxNotifyTimes }}
-      </ElDescriptionsItem>
-
-      <ElDescriptionsItem label="最后通知时间">
-        {{ formatDateTime(formData?.lastExecuteTime || '') }}
-      </ElDescriptionsItem>
-
-      <ElDescriptionsItem label="创建时间">
-        {{ formatDateTime(formData?.createTime || '') }}
-      </ElDescriptionsItem>
-      <ElDescriptionsItem label="更新时间">
-        {{ formatDateTime(formData?.updateTime || '') }}
-      </ElDescriptionsItem>
-    </ElDescriptions>
+    <Description :data="formData" />
 
     <ElDivider />
 
-    <ElDescriptions border :column="1" class="mx-4">
-      <ElDescriptionsItem label="回调日志">
-        <ElTable
-          v-if="formData"
-          :data-source="formData.logs"
-          :columns="detailColumns"
-        />
-      </ElDescriptionsItem>
-    </ElDescriptions>
+    <LogGrid table-title="支付通知列表" />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/pay/order/data.ts b/apps/web-ele/src/views/pay/order/data.ts
index 9762b149c1065bc9a761517dd9178a94f8a941c4..259137ef4bcc01d6dc64082e7d4268cda326a8f7 100644
--- a/apps/web-ele/src/views/pay/order/data.ts
+++ b/apps/web-ele/src/views/pay/order/data.ts
@@ -12,66 +12,74 @@ import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
 import { ElTag } from 'element-plus';
 
 import { DictTag } from '#/components/dict-tag';
+import { getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
     {
-      component: 'Input',
       fieldName: 'appId',
       label: '应用编号',
+      component: 'Input',
       componentProps: {
+        clearable: true,
         placeholder: '请输入应用编号',
       },
     },
     {
-      component: 'Select',
       fieldName: 'channelCode',
       label: '支付渠道',
+      component: 'Select',
       componentProps: {
-        placeholder: '请选择开启状态',
+        clearable: true,
+        placeholder: '请选择支付渠道',
         options: getDictOptions(DICT_TYPE.PAY_CHANNEL_CODE, 'string'),
       },
     },
     {
-      component: 'Input',
       fieldName: 'merchantOrderId',
       label: '商户单号',
+      component: 'Input',
       componentProps: {
+        clearable: true,
         placeholder: '请输入商户单号',
       },
     },
     {
-      component: 'Input',
       fieldName: 'no',
       label: '支付单号',
+      component: 'Input',
       componentProps: {
+        clearable: true,
         placeholder: '请输入支付单号',
       },
     },
     {
-      component: 'Input',
       fieldName: 'channelOrderNo',
       label: '渠道单号',
+      component: 'Input',
       componentProps: {
+        clearable: true,
         placeholder: '请输入渠道单号',
       },
     },
     {
-      component: 'Select',
       fieldName: 'status',
       label: '支付状态',
+      component: 'Select',
       componentProps: {
+        clearable: true,
         placeholder: '请选择支付状态',
         options: getDictOptions(DICT_TYPE.PAY_ORDER_STATUS, 'number'),
       },
     },
     {
-      component: 'RangePicker',
       fieldName: 'createTime',
       label: '创建时间',
+      component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始日期', '结束日期'],
+        ...getRangePickerDefaultProps(),
+        clearable: true,
       },
     },
   ];
@@ -80,65 +88,74 @@ export function useGridFormSchema(): VbenFormSchema[] {
 /** 列表的字段 */
 export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
-    { type: 'checkbox', width: 60 },
     {
-      title: '编号',
       field: 'id',
+      title: '编号',
+      minWidth: 100,
     },
     {
-      title: '支付金额',
       field: 'price',
-      formatter: 'formatFenToYuanAmount',
+      title: '支付金额',
+      minWidth: 120,
+      formatter: 'formatAmount2',
     },
     {
-      title: '退款金额',
       field: 'refundPrice',
-      formatter: 'formatFenToYuanAmount',
+      title: '退款金额',
+      minWidth: 120,
+      formatter: 'formatAmount2',
     },
     {
-      title: '手续金额',
       field: 'channelFeePrice',
-      formatter: 'formatFenToYuanAmount',
+      title: '手续金额',
+      minWidth: 120,
+      formatter: 'formatAmount2',
     },
     {
-      title: '订单号',
       field: 'no',
+      title: '订单号',
+      minWidth: 240,
       slots: {
         default: 'no',
       },
     },
     {
-      title: '支付状态',
       field: 'status',
+      title: '支付状态',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_ORDER_STATUS },
       },
     },
     {
-      title: '支付渠道',
       field: 'channelCode',
+      title: '支付渠道',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_CHANNEL_CODE },
       },
     },
     {
-      title: '支付时间',
       field: 'successTime',
+      title: '支付时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
-      title: '支付应用',
       field: 'appName',
+      title: '支付应用',
+      minWidth: 150,
     },
     {
-      title: '商品标题',
       field: 'subject',
+      title: '商品标题',
+      minWidth: 200,
     },
     {
       title: '操作',
-      width: 100,
+      width: 80,
       fixed: 'right',
       slots: { default: 'actions' },
     },
@@ -167,7 +184,7 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'status',
       label: '支付状态',
-      content: (data: PayOrderApi.Order) =>
+      content: (data: any) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_ORDER_STATUS,
           value: data?.status,
@@ -240,7 +257,9 @@ export function useDetailSchema(): DescriptionItemSchema[] {
       field: 'channelOrderNo',
       label: '渠道单号',
       content: (data: PayOrderApi.Order) =>
-        h(ElTag, { color: 'green' }, () => data?.channelOrderNo || ''),
+        data?.channelOrderNo
+          ? h(ElTag, { color: 'green' }, () => data.channelOrderNo)
+          : '',
     },
     {
       field: 'channelUserId',
diff --git a/apps/web-ele/src/views/pay/order/index.vue b/apps/web-ele/src/views/pay/order/index.vue
index f849cf620dda1631d4d6996310ca83ceba005997..adf9818d3c56f8d8bf90ac42963d0fd78283dd61 100644
--- a/apps/web-ele/src/views/pay/order/index.vue
+++ b/apps/web-ele/src/views/pay/order/index.vue
@@ -3,11 +3,13 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { PayOrderApi } from '#/api/pay/order';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { ElTag } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { getOrderPage } from '#/api/pay/order';
+import { exportOrder, getOrderPage } from '#/api/pay/order';
+import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Detail from './modules/detail.vue';
@@ -18,10 +20,16 @@ const [DetailModal, detailModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
+/** 导出支付订单 */
+async function handleExport() {
+  const data = await exportOrder(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '支付订单.xls', source: data });
+}
+
 /** 查看详情 */
 function handleDetail(row: PayOrderApi.Order) {
   detailModalApi.setData(row).open();
@@ -30,7 +38,6 @@ function handleDetail(row: PayOrderApi.Order) {
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
-    collapsed: false,
   },
   gridOptions: {
     cellConfig: {
@@ -52,9 +59,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
-      isCurrent: true,
       isHover: true,
-      resizable: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -80,8 +85,21 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/pay/wx-lite-pay-demo/"
       />
     </template>
-    <DetailModal @success="onRefresh" />
+    <DetailModal @success="handleRefresh" />
     <Grid table-title="支付订单列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.export', ['支付订单']),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['pay:order:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[
diff --git a/apps/web-ele/src/views/pay/order/modules/detail.vue b/apps/web-ele/src/views/pay/order/modules/detail.vue
index 22c1b9fd4e9bbc8e199bbad76faf927737cbea1b..7f52112ee8e8a76ce4b873326d5bf1941c4b0bac 100644
--- a/apps/web-ele/src/views/pay/order/modules/detail.vue
+++ b/apps/web-ele/src/views/pay/order/modules/detail.vue
@@ -1,33 +1,33 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import type { PayOrderApi } from '#/api/pay/order';
 
 import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
-import { getOrder } from '#/api/pay/order';
+import { getOrderDetail } from '#/api/pay/order';
 import { useDescription } from '#/components/description';
 
 import { useDetailSchema } from '../data';
 
-const detailData = ref<PayOrderApi.Order>();
+const formData = ref<PayOrderApi.Order>();
 
-const [Description] = useDescription({
+const [Descriptions] = useDescription({
   componentProps: {
-    border: false,
+    border: true,
     column: 2,
     direction: 'horizontal',
+    labelWidth: 140,
     title: '',
-    labelWidth: 200,
     extra: '',
   },
   schema: useDetailSchema(),
 });
 
 const [Modal, modalApi] = useVbenModal({
-  onOpenChange: async (isOpen) => {
+  async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      detailData.value = undefined;
+      formData.value = undefined;
       return;
     }
     // 加载数据
@@ -37,7 +37,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      detailData.value = await getOrder(data.id);
+      formData.value = await getOrderDetail(data.id);
     } finally {
       modalApi.unlock();
     }
@@ -51,6 +51,6 @@ const [Modal, modalApi] = useVbenModal({
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <Description :data="detailData" />
+    <Descriptions :data="formData" />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/pay/refund/data.ts b/apps/web-ele/src/views/pay/refund/data.ts
index 1a07548b47f2e72c2c3f62a001d0637a89ed296d..db140679f6353246d05b46fe03659409cb6ee068 100644
--- a/apps/web-ele/src/views/pay/refund/data.ts
+++ b/apps/web-ele/src/views/pay/refund/data.ts
@@ -1,18 +1,17 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayRefundApi } from '#/api/pay/refund';
 import type { DescriptionItemSchema } from '#/components/description';
 
 import { h } from 'vue';
 
-import { fenToYuan, formatDateTime } from '@vben/utils';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
 
 import { ElTag } from 'element-plus';
 
-import { getAppList } from '#/api/pay/app';
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
-
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
@@ -21,17 +20,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
     {
       fieldName: 'appId',
       label: '应用编号',
-      component: 'ApiSelect',
+      component: 'Input',
       componentProps: {
-        api: async () => {
-          const data = await getAppList();
-          return data.map((item) => ({
-            label: item.name,
-            value: item.id,
-          }));
-        },
-        autoSelect: 'first',
-        placeholder: '请选择数据源',
+        clearable: true,
+        placeholder: '请输入应用编号',
       },
     },
     {
@@ -40,28 +32,45 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         clearable: true,
+        placeholder: '请选择退款渠道',
         options: getDictOptions(DICT_TYPE.PAY_CHANNEL_CODE, 'string'),
       },
     },
     {
       fieldName: 'merchantOrderId',
-      label: '商户支付单号',
+      label: '商户单号',
       component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入商户单号',
+      },
     },
     {
       fieldName: 'merchantRefundId',
-      label: '商户退款单号',
+      label: '退款单号',
       component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入退款单号',
+      },
     },
     {
       fieldName: 'channelOrderNo',
-      label: '渠道支付单号',
+      label: '渠道单号',
       component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入渠道单号',
+      },
     },
     {
       fieldName: 'channelRefundNo',
       label: '渠道退款单号',
       component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入渠道退款单号',
+      },
     },
     {
       fieldName: 'status',
@@ -69,6 +78,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         clearable: true,
+        placeholder: '请选择退款状态',
         options: getDictOptions(DICT_TYPE.PAY_REFUND_STATUS, 'number'),
       },
     },
@@ -90,81 +100,99 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '编号',
-    },
-    {
-      field: 'merchantRefundId',
-      title: '退款订单号',
-    },
-    {
-      field: 'channelRefundNo',
-      title: '渠道退款单号',
+      minWidth: 100,
     },
     {
       field: 'payPrice',
       title: '支付金额',
-      formatter: 'formatFenToYuanAmount',
+      minWidth: 120,
+      formatter: 'formatAmount2',
     },
     {
       field: 'refundPrice',
       title: '退款金额',
-      formatter: 'formatFenToYuanAmount',
+      minWidth: 120,
+      formatter: 'formatAmount2',
+    },
+    {
+      field: 'merchantRefundId',
+      title: '退款单号',
+      minWidth: 240,
+      slots: {
+        default: 'no',
+      },
     },
     {
       field: 'status',
       title: '退款状态',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_REFUND_STATUS },
       },
     },
+    {
+      field: 'channelCode',
+      title: '退款渠道',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.PAY_CHANNEL_CODE },
+      },
+    },
+    {
+      field: 'successTime',
+      title: '退款时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
+    {
+      field: 'reason',
+      title: '退款原因',
+      minWidth: 200,
+    },
     {
       title: '操作',
-      width: 100,
+      width: 80,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
 
-/** 详情页的字段 */
-export function useBaseDetailSchema(): DescriptionItemSchema[] {
+/** 详情的字段 */
+export function useDetailSchema(): DescriptionItemSchema[] {
   return [
+    // 基本信息部分
     {
       field: 'merchantRefundId',
       label: '商户退款单号',
-      content: (data) =>
-        h(ElTag, {}, () => {
-          return data?.merchantRefundId || '-';
-        }),
+      content: (data: PayRefundApi.Refund) =>
+        h(ElTag, {}, () => data?.merchantRefundId || '-'),
     },
     {
       field: 'channelRefundNo',
       label: '渠道退款单号',
-      content: (data) =>
-        h(ElTag, {}, () => {
-          return data?.channelRefundNo || '-';
-        }),
+      content: (data: PayRefundApi.Refund) =>
+        h(ElTag, { type: 'success' }, () => data?.channelRefundNo || '-'),
     },
     {
       field: 'merchantOrderId',
       label: '商户支付单号',
-      content: (data) =>
-        h(ElTag, {}, () => {
-          return data?.merchantOrderId || '-';
-        }),
+      content: (data: PayRefundApi.Refund) =>
+        h(ElTag, {}, () => data?.merchantOrderId || '-'),
     },
     {
       field: 'channelOrderNo',
       label: '渠道支付单号',
-      content: (data) =>
-        h(ElTag, {}, () => {
-          return data?.channelOrderNo || '-';
-        }),
+      content: (data: PayRefundApi.Refund) =>
+        h(ElTag, { type: 'success' }, () => data?.channelOrderNo || '-'),
     },
     {
       field: 'appId',
@@ -177,23 +205,27 @@ export function useBaseDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'payPrice',
       label: '支付金额',
-      content: (data) =>
-        h(ElTag, { color: 'success' }, () => {
-          return fenToYuan(data.payPrice || 0);
-        }),
+      content: (data: PayRefundApi.Refund) =>
+        h(
+          ElTag,
+          { type: 'success' },
+          () => `￥${erpPriceInputFormatter(data?.payPrice || 0)}`,
+        ),
     },
     {
       field: 'refundPrice',
       label: '退款金额',
-      content: (data) =>
-        h(ElTag, { color: 'red' }, () => {
-          return fenToYuan(data.refundPrice || 0);
-        }),
+      content: (data: PayRefundApi.Refund) =>
+        h(
+          ElTag,
+          { type: 'danger' },
+          () => `￥${erpPriceInputFormatter(data?.refundPrice || 0)}`,
+        ),
     },
     {
       field: 'status',
       label: '退款状态',
-      content: (data) =>
+      content: (data: any) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_REFUND_STATUS,
           value: data?.status,
@@ -202,28 +234,26 @@ export function useBaseDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'successTime',
       label: '退款时间',
-      content: (data) => formatDateTime(data.successTime) as string,
+      content: (data: PayRefundApi.Refund) =>
+        formatDateTime(data?.successTime) as string,
     },
     {
       field: 'createTime',
       label: '创建时间',
-      content: (data) => formatDateTime(data.createTime) as string,
+      content: (data: PayRefundApi.Refund) =>
+        formatDateTime(data?.createTime) as string,
     },
     {
       field: 'updateTime',
       label: '更新时间',
-      content: (data) => formatDateTime(data.updateTime) as string,
+      content: (data: PayRefundApi.Refund) =>
+        formatDateTime(data?.updateTime) as string,
     },
-  ];
-}
-
-/** 详情页的字段 */
-export function useChannelDetailSchema(): DescriptionItemSchema[] {
-  return [
+    // 渠道信息部分
     {
       field: 'channelCode',
       label: '退款渠道',
-      content: (data) =>
+      content: (data: PayRefundApi.Refund) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_CHANNEL_CODE,
           value: data?.channelCode,
@@ -241,6 +271,7 @@ export function useChannelDetailSchema(): DescriptionItemSchema[] {
       field: 'notifyUrl',
       label: '通知 URL',
     },
+    // 错误信息部分
     {
       field: 'channelErrorCode',
       label: '渠道错误码',
diff --git a/apps/web-ele/src/views/pay/refund/index.vue b/apps/web-ele/src/views/pay/refund/index.vue
index 0f6bad3c31dd17a6f906d189b4e9a32cbec77a7b..c363ec21d8981a68ab5ed638fefb6da91eff7439 100644
--- a/apps/web-ele/src/views/pay/refund/index.vue
+++ b/apps/web-ele/src/views/pay/refund/index.vue
@@ -1,35 +1,38 @@
 <script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayRefundApi } from '#/api/pay/refund';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
+import { ElTag } from 'element-plus';
+
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import * as RefundApi from '#/api/pay/refund';
+import { exportRefund, getRefundPage } from '#/api/pay/refund';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Detail from './modules/detail.vue';
 
-const [RefundDetailModal, refundDetailModalApi] = useVbenModal({
+const [DetailModal, detailModalApi] = useVbenModal({
   connectedComponent: Detail,
   destroyOnClose: true,
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 导出表格 */
+/** 导出退款订单 */
 async function handleExport() {
-  const data = await RefundApi.exportRefund(await gridApi.formApi.getValues());
-  downloadFileFromBlobPart({ fileName: '支付退款.xls', source: data });
+  const data = await exportRefund(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '退款订单.xls', source: data });
 }
 
 /** 查看详情 */
-function handleDetail(row: any) {
-  refundDetailModalApi.setData(row).open();
+function handleDetail(row: PayRefundApi.Refund) {
+  detailModalApi.setData(row).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -37,13 +40,16 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
+    cellConfig: {
+      height: 80,
+    },
     columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
-          return await RefundApi.getRefundPage({
+          return await getRefundPage({
             pageNo: page.currentPage,
             pageSize: page.pageSize,
             ...formValues,
@@ -53,12 +59,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
       search: true,
     },
-  } as VxeTableGridOptions<any>,
+  } as VxeTableGridOptions<PayRefundApi.Refund>,
 });
 </script>
 <template>
@@ -69,16 +76,16 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/pay/refund-demo/"
       />
     </template>
-    <RefundDetailModal @success="onRefresh" />
+    <DetailModal @success="handleRefresh" />
     <Grid table-title="支付退款列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
             {
-              label: $t('ui.actionTitle.export'),
+              label: $t('ui.actionTitle.export', ['退款订单']),
               type: 'primary',
               icon: ACTION_ICON.DOWNLOAD,
-              auth: ['pay:refund:query'],
+              auth: ['pay:refund:export'],
               onClick: handleExport,
             },
           ]"
@@ -98,6 +105,22 @@ const [Grid, gridApi] = useVbenVxeGrid({
           ]"
         />
       </template>
+      <template #no="{ row }">
+        <div class="flex flex-col gap-1 text-left">
+          <p class="text-sm">
+            <ElTag size="small" type="primary"> 商户</ElTag>
+            {{ row.merchantOrderId }}
+          </p>
+          <p class="text-sm" v-if="row.merchantRefundId">
+            <ElTag size="small" type="warning">退款</ElTag>
+            {{ row.merchantRefundId }}
+          </p>
+          <p class="text-sm" v-if="row.channelRefundNo">
+            <ElTag size="small" type="success">渠道</ElTag>
+            {{ row.channelRefundNo }}
+          </p>
+        </div>
+      </template>
     </Grid>
   </Page>
 </template>
diff --git a/apps/web-ele/src/views/pay/refund/modules/detail.vue b/apps/web-ele/src/views/pay/refund/modules/detail.vue
index 226d7bf3b8cf36beea3808a5798e95567bc19a99..1f3e380cbcb726cfd613455031a0a6f5a4e43922 100644
--- a/apps/web-ele/src/views/pay/refund/modules/detail.vue
+++ b/apps/web-ele/src/views/pay/refund/modules/detail.vue
@@ -5,37 +5,23 @@ import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
-import { ElDivider } from 'element-plus';
-
 import { getRefund } from '#/api/pay/refund';
 import { useDescription } from '#/components/description';
 
-import { useBaseDetailSchema, useChannelDetailSchema } from '../data';
+import { useDetailSchema } from '../data';
 
 const formData = ref<PayRefundApi.Refund>();
 
-const [BaseDescription] = useDescription({
-  componentProps: {
-    border: false,
-    column: 2,
-    direction: 'horizontal',
-    title: '',
-    labelWidth: 200,
-    extra: '',
-  },
-  schema: useBaseDetailSchema(),
-});
-
-const [ChannelDescription] = useDescription({
+const [Descriptions] = useDescription({
   componentProps: {
-    border: false,
+    border: true,
     column: 2,
     direction: 'horizontal',
+    labelWidth: 140,
     title: '',
-    labelWidth: 200,
     extra: '',
   },
-  schema: useChannelDetailSchema(),
+  schema: useDetailSchema(),
 });
 
 const [Modal, modalApi] = useVbenModal({
@@ -66,8 +52,6 @@ const [Modal, modalApi] = useVbenModal({
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <BaseDescription :data="formData" />
-    <ElDivider />
-    <ChannelDescription :data="formData" />
+    <Descriptions :data="formData" />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/pay/transfer/data.ts b/apps/web-ele/src/views/pay/transfer/data.ts
index 730ca4a08418f91cc1877bdfeda2b78cddc96ef3..3ddbb0ea4590a8bf2d0150d3cb78083533da7557 100644
--- a/apps/web-ele/src/views/pay/transfer/data.ts
+++ b/apps/web-ele/src/views/pay/transfer/data.ts
@@ -1,17 +1,17 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { PayTransferApi } from '#/api/pay/transfer';
 import type { DescriptionItemSchema } from '#/components/description';
 
 import { h } from 'vue';
 
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
 import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
 
 import { ElTag } from 'element-plus';
 
 import { DictTag } from '#/components/dict-tag';
-import { DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
-
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
@@ -75,7 +75,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       },
     },
     {
-      fieldName: 'accountNo',
+      fieldName: 'userAccount',
       label: '收款人账号',
       component: 'Input',
       componentProps: {
@@ -110,96 +110,95 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '编号',
-    },
-    {
-      field: 'createTime',
-      title: '创建时间',
-      formatter: 'formatDateTime',
-    },
-    {
-      field: 'appName',
-      title: '支付应用',
+      minWidth: 100,
     },
     {
       field: 'price',
       title: '转账金额',
-      formatter: 'formatFenToYuanAmount',
+      minWidth: 120,
+      formatter: 'formatAmount2',
     },
     {
-      field: 'status',
-      title: '转账状态',
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.PAY_TRANSFER_STATUS },
+      field: 'merchantTransferId',
+      title: '转账单号',
+      minWidth: 350,
+      slots: {
+        default: 'no',
       },
     },
     {
-      field: 'type',
-      title: '类型',
+      field: 'status',
+      title: '转账状态',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
-        props: { type: DICT_TYPE.PAY_TRANSFER_TYPE },
+        props: { type: DICT_TYPE.PAY_TRANSFER_STATUS },
       },
     },
     {
       field: 'channelCode',
-      title: '支付渠道',
+      title: '转账渠道',
+      minWidth: 140,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.PAY_CHANNEL_CODE },
       },
     },
     {
-      field: 'merchantTransferId',
-      title: '商户单号',
+      field: 'createTime',
+      title: '创建时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
     },
     {
-      field: 'channelTransferNo',
-      title: '渠道单号',
+      field: 'successTime',
+      title: '转账时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'subject',
+      title: '转账标题',
+      minWidth: 150,
+    },
+    {
+      field: 'appName',
+      title: '支付应用',
+      minWidth: 150,
     },
     {
       field: 'userName',
       title: '收款人姓名',
+      minWidth: 150,
     },
     {
-      field: 'accountNo',
-      title: '收款人账号',
+      field: 'userAccount',
+      title: '收款账号',
+      minWidth: 200,
     },
     {
       title: '操作',
-      width: 120,
+      width: 80,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
 
-/** 详情的配置 */
+/** 详情的字段 */
 export function useDetailSchema(): DescriptionItemSchema[] {
   return [
-    {
-      field: 'id',
-      label: '编号',
-    },
     {
       field: 'merchantTransferId',
       label: '商户单号',
-      content: (data) => {
-        return h(ElTag, {
-          color: 'blue',
-          content: data?.merchantTransferId,
-        });
-      },
+      content: (data: PayTransferApi.Transfer) =>
+        h(ElTag, {}, () => data?.merchantTransferId),
     },
     {
       field: 'no',
       label: '转账单号',
-      content: (data) => {
-        return h(ElTag, {
-          color: 'blue',
-          content: data?.no,
-        });
-      },
+      content: (data: PayTransferApi.Transfer) =>
+        h(ElTag, { color: 'orange' }, () => data?.no),
     },
     {
       field: 'appId',
@@ -208,7 +207,7 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'status',
       label: '转账状态',
-      content: (data) =>
+      content: (data: any) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_TRANSFER_STATUS,
           value: data?.status,
@@ -217,22 +216,24 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'price',
       label: '转账金额',
-      content: (data) => {
-        return h(ElTag, {
-          color: 'blue',
-          content: `￥${erpPriceInputFormatter(data?.price)}`,
-        });
-      },
+      content: (data: PayTransferApi.Transfer) =>
+        h(
+          ElTag,
+          { color: 'success' },
+          () => `￥${erpPriceInputFormatter(data?.price || 0)}`,
+        ),
     },
     {
       field: 'successTime',
       label: '转账时间',
-      content: (data) => formatDateTime(data?.successTime) as string,
+      content: (data: PayTransferApi.Transfer) =>
+        formatDateTime(data?.successTime) as string,
     },
     {
       field: 'createTime',
       label: '创建时间',
-      content: (data) => formatDateTime(data?.createTime) as string,
+      content: (data: PayTransferApi.Transfer) =>
+        formatDateTime(data?.createTime) as string,
     },
     {
       field: 'userName',
@@ -245,25 +246,23 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     {
       field: 'channelCode',
       label: '支付渠道',
-      content: (data) =>
+      content: (data: PayTransferApi.Transfer) =>
         h(DictTag, {
           type: DICT_TYPE.PAY_CHANNEL_CODE,
           value: data?.channelCode,
         }),
     },
     {
-      field: 'channelCode',
+      field: 'userIp',
       label: '支付 IP',
     },
     {
       field: 'channelTransferNo',
       label: '渠道单号',
-      content: (data) => {
-        return h(ElTag, {
-          color: 'blue',
-          content: data?.channelTransferNo,
-        });
-      },
+      content: (data: PayTransferApi.Transfer) =>
+        data?.channelTransferNo
+          ? h(ElTag, { color: 'success' }, () => data.channelTransferNo)
+          : '',
     },
     {
       field: 'notifyUrl',
diff --git a/apps/web-ele/src/views/pay/transfer/index.vue b/apps/web-ele/src/views/pay/transfer/index.vue
index 9f50fd85705df0733439c6f1254fcfa739d9bfe7..e93f0c2d1f82eb304232457159b0f823ee67f5f6 100644
--- a/apps/web-ele/src/views/pay/transfer/index.vue
+++ b/apps/web-ele/src/views/pay/transfer/index.vue
@@ -5,6 +5,8 @@ import type { PayTransferApi } from '#/api/pay/transfer';
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
+import { ElTag } from 'element-plus';
+
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { exportTransfer, getTransferPage } from '#/api/pay/transfer';
 import { $t } from '#/locales';
@@ -18,11 +20,11 @@ const [DetailModal, detailModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 导出表格 */
+/** 导出转账单 */
 async function handleExport() {
   const data = await exportTransfer(await gridApi.formApi.getValues());
   downloadFileFromBlobPart({ fileName: '转账单.xls', source: data });
@@ -38,6 +40,9 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
+    cellConfig: {
+      height: 80,
+    },
     columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
@@ -54,6 +59,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -69,13 +75,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <DocAlert title="转账管理" url="https://doc.iocoder.cn/pay/transfer/" />
     </template>
 
-    <DetailModal @success="onRefresh" />
+    <DetailModal @success="handleRefresh" />
     <Grid table-title="转账单列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
             {
-              label: $t('ui.actionTitle.export'),
+              label: $t('ui.actionTitle.export', ['转账单']),
               type: 'primary',
               icon: ACTION_ICON.DOWNLOAD,
               auth: ['pay:transfer:export'],
@@ -98,6 +104,21 @@ const [Grid, gridApi] = useVbenVxeGrid({
           ]"
         />
       </template>
+      <template #no="{ row }">
+        <div class="flex flex-col gap-1 text-left">
+          <p class="text-sm">
+            <ElTag size="small" type="primary"> 商户</ElTag>
+            {{ row.merchantTransferId }}
+          </p>
+          <p class="text-sm" v-if="row.no">
+            <ElTag size="small" type="warning">转账</ElTag> {{ row.no }}
+          </p>
+          <p class="text-sm" v-if="row.channelTransferNo">
+            <ElTag size="small" type="success">渠道</ElTag>
+            {{ row.channelTransferNo }}
+          </p>
+        </div>
+      </template>
     </Grid>
   </Page>
 </template>
diff --git a/apps/web-ele/src/views/pay/transfer/modules/detail.vue b/apps/web-ele/src/views/pay/transfer/modules/detail.vue
index 79868c1948039a5287baffedd8408a71291b2409..301f7aea11208aa400c6e1f18bfe13ba4d837765 100644
--- a/apps/web-ele/src/views/pay/transfer/modules/detail.vue
+++ b/apps/web-ele/src/views/pay/transfer/modules/detail.vue
@@ -12,6 +12,18 @@ import { useDetailSchema } from '../data';
 
 const formData = ref<PayTransferApi.Transfer>();
 
+const [Descriptions] = useDescription({
+  componentProps: {
+    border: true,
+    column: 2,
+    direction: 'horizontal',
+    labelWidth: 140,
+    title: '',
+    extra: '',
+  },
+  schema: useDetailSchema(),
+});
+
 const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
@@ -31,18 +43,6 @@ const [Modal, modalApi] = useVbenModal({
     }
   },
 });
-
-const [Description] = useDescription({
-  componentProps: {
-    title: '基本信息',
-    border: false,
-    column: 2,
-    direction: 'horizontal',
-    labelWidth: 200,
-    extra: '',
-  },
-  schema: useDetailSchema(),
-});
 </script>
 
 <template>
@@ -52,6 +52,6 @@ const [Description] = useDescription({
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <Description :data="formData" />
+    <Descriptions :data="formData" />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/pay/wallet/balance/data.ts b/apps/web-ele/src/views/pay/wallet/balance/data.ts
index 20801edf19a9e9e6c8f5649c77764c2142f951f4..89684b3276625e3dcdc11b05cbd285de65583f73 100644
--- a/apps/web-ele/src/views/pay/wallet/balance/data.ts
+++ b/apps/web-ele/src/views/pay/wallet/balance/data.ts
@@ -1,6 +1,7 @@
-import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
+import type { VxeTableGridOptions as VxeTableGridOptionsLegacy } from '@vben/plugins/vxe-table';
 
 import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -8,13 +9,16 @@ import { getDictOptions } from '@vben/hooks';
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 列表的搜索表单 */
-// TODO @霖：少了 placeholder
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
     {
       fieldName: 'userId',
       label: '用户编号',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入用户编号',
+        clearable: true,
+      },
     },
     {
       fieldName: 'userType',
@@ -22,6 +26,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         options: getDictOptions(DICT_TYPE.USER_TYPE, 'number'),
+        placeholder: '请选择用户类型',
+        clearable: true,
       },
     },
     {
@@ -29,27 +35,30 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '创建时间',
       component: 'RangePicker',
       componentProps: {
-        clearable: true,
         ...getRangePickerDefaultProps(),
+        clearable: true,
       },
     },
   ];
 }
 
 /** 列表的字段 */
-export function useGridColumns(): VxeTableGridOptions['columns'] {
+export function useGridColumns(): VxeTableGridOptionsLegacy['columns'] {
   return [
     {
       title: '编号',
       field: 'id',
+      minWidth: 100,
     },
     {
       title: '用户编号',
       field: 'userId',
+      minWidth: 120,
     },
     {
       title: '用户类型',
       field: 'userType',
+      minWidth: 120,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.USER_TYPE },
@@ -58,33 +67,73 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       title: '余额',
       field: 'balance',
-      formatter: 'formatFenToYuanAmount',
+      minWidth: 120,
+      formatter: 'formatAmount2',
     },
     {
       title: '累计支出',
       field: 'totalExpense',
-      formatter: 'formatFenToYuanAmount',
+      minWidth: 120,
+      formatter: 'formatAmount2',
     },
     {
       title: '累计充值',
       field: 'totalRecharge',
-      formatter: 'formatFenToYuanAmount',
+      minWidth: 120,
+      formatter: 'formatAmount2',
     },
     {
       title: '冻结金额',
       field: 'freezePrice',
-      formatter: 'formatFenToYuanAmount',
+      minWidth: 120,
+      formatter: 'formatAmount2',
     },
     {
       title: '创建时间',
       field: 'createTime',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       title: '操作',
       field: 'actions',
+      width: 80,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
+
+/** 钱包交易记录列表字段 */
+export function useTransactionGridColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '编号',
+      minWidth: 100,
+    },
+    {
+      field: 'title',
+      title: '关联业务标题',
+      minWidth: 200,
+    },
+    {
+      field: 'price',
+      title: '交易金额',
+      minWidth: 120,
+      formatter: 'formatAmount2',
+    },
+    {
+      field: 'balance',
+      title: '钱包余额',
+      minWidth: 120,
+      formatter: 'formatAmount2',
+    },
+    {
+      field: 'createTime',
+      title: '交易时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/pay/wallet/balance/index.vue b/apps/web-ele/src/views/pay/wallet/balance/index.vue
index 735c58c5908765120a78ce6eb75d420c3e9cf2fc..7235632bd72f27fb504bab937d5056ce37c1b501 100644
--- a/apps/web-ele/src/views/pay/wallet/balance/index.vue
+++ b/apps/web-ele/src/views/pay/wallet/balance/index.vue
@@ -9,20 +9,21 @@ import { getWalletPage } from '#/api/pay/wallet/balance';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import WalletDetail from './modules/detail.vue';
+import Detail from './modules/detail.vue';
+
+const [DetailModal, detailModalApi] = useVbenModal({
+  connectedComponent: Detail,
+  destroyOnClose: true,
+});
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-const [WalletModal, walletModalApi] = useVbenModal({
-  connectedComponent: WalletDetail,
-  destroyOnClose: true,
-});
-
+/** 查看钱包 */
 function handleDetail(row: Required<PayWalletApi.Wallet>) {
-  walletModalApi.setData(row).open();
+  detailModalApi.setData(row).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -46,6 +47,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -61,8 +63,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <DocAlert title="钱包余额" url="https://doc.iocoder.cn/pay/build/" />
     </template>
 
-    <WalletModal @reload="onRefresh" />
-
+    <DetailModal @reload="handleRefresh" />
     <Grid>
       <template #actions="{ row }">
         <TableAction
diff --git a/apps/web-ele/src/views/pay/wallet/balance/modules/detail.vue b/apps/web-ele/src/views/pay/wallet/balance/modules/detail.vue
index 4579d132008507ecdbc7e9ae768ec02e2a8a452c..38b83ba046fa355de35adc00d0fc6d29afe7b2cd 100644
--- a/apps/web-ele/src/views/pay/wallet/balance/modules/detail.vue
+++ b/apps/web-ele/src/views/pay/wallet/balance/modules/detail.vue
@@ -1,13 +1,40 @@
 <script setup lang="ts">
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { PayWalletApi } from '#/api/pay/wallet/balance';
+import type { WalletTransactionApi } from '#/api/pay/wallet/transaction';
 
-import { ref } from 'vue';
+import { Page, useVbenModal } from '@vben/common-ui';
 
-import { useVbenModal } from '@vben/common-ui';
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getTransactionPage } from '#/api/pay/wallet/transaction';
 
-import WalletTransactionList from '../../transaction/index.vue';
+import { useTransactionGridColumns } from '../data';
 
-const walletId = ref(0);
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useTransactionGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          return await getTransactionPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            walletId: modalApi.getData<PayWalletApi.Wallet>().id,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      enabled: false,
+    },
+  } as VxeTableGridOptions<WalletTransactionApi.Transaction>,
+});
 
 const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
@@ -15,13 +42,9 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<PayWalletApi.Wallet>();
-    if (!data || !data.id) {
-      return;
-    }
     modalApi.lock();
     try {
-      walletId.value = data.id;
+      await gridApi.query();
     } finally {
       modalApi.unlock();
     }
@@ -31,10 +54,12 @@ const [Modal, modalApi] = useVbenModal({
 <template>
   <Modal
     title="钱包交易记录"
-    class="w-2/5"
+    class="w-1/2"
     :show-cancel-button="false"
     :show-confirm-button="false"
   >
-    <WalletTransactionList :wallet-id="walletId" />
+    <Page auto-content-height>
+      <Grid />
+    </Page>
   </Modal>
-</template>
+</template>
\ No newline at end of file
diff --git a/apps/web-ele/src/views/pay/wallet/rechargePackage/data.ts b/apps/web-ele/src/views/pay/wallet/rechargePackage/data.ts
index f6fa96ec04f6f1d051da956028b19c40ddfd8389..57cfbee8a7f88ea22028bcb21f70526662f16e67 100644
--- a/apps/web-ele/src/views/pay/wallet/rechargePackage/data.ts
+++ b/apps/web-ele/src/views/pay/wallet/rechargePackage/data.ts
@@ -1,50 +1,66 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
+import { z } from '#/adapter/form';
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
     {
       fieldName: 'name',
-      label: '套餐名',
+      label: '套餐名称',
       component: 'Input',
       rules: 'required',
+      componentProps: {
+        placeholder: '请输入套餐名称',
+      },
     },
     {
       fieldName: 'payPrice',
       label: '支付金额(元)',
       component: 'InputNumber',
-      rules: 'required',
+      rules: z.number().min(0, '支付金额不能小于0'),
       componentProps: {
         min: 0,
         precision: 2,
         step: 0.01,
+        placeholder: '请输入支付金额',
       },
     },
     {
       fieldName: 'bonusPrice',
       label: '赠送金额(元)',
       component: 'InputNumber',
-      rules: 'required',
+      rules: z.number().min(0, '赠送金额不能小于0'),
       componentProps: {
         min: 0,
         precision: 2,
         step: 0.01,
+        placeholder: '请输入赠送金额',
       },
     },
     {
       fieldName: 'status',
       label: '开启状态',
       component: 'RadioGroup',
-      rules: 'required',
       componentProps: {
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        buttonStyle: 'solid',
+        optionType: 'button',
       },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
     },
   ];
 }
@@ -56,14 +72,19 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '套餐名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入套餐名称',
+        clearable: true,
+      },
     },
     {
       fieldName: 'status',
       label: '状态',
       component: 'Select',
       componentProps: {
-        clearable: true,
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择状态',
+        clearable: true,
       },
     },
     {
@@ -71,8 +92,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '创建时间',
       component: 'RangePicker',
       componentProps: {
-        clearable: true,
         ...getRangePickerDefaultProps(),
+        clearable: true,
       },
     },
   ];
@@ -83,25 +104,30 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'id',
-      title: '编号',
+      title: '套餐编号',
+      minWidth: 100,
     },
     {
       field: 'name',
       title: '套餐名称',
+      minWidth: 150,
     },
     {
       field: 'payPrice',
       title: '支付金额',
+      minWidth: 120,
       formatter: 'formatFenToYuanAmount',
     },
     {
       field: 'bonusPrice',
       title: '赠送金额',
+      minWidth: 120,
       formatter: 'formatFenToYuanAmount',
     },
     {
       field: 'status',
       title: '状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -110,11 +136,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       title: '操作',
-      width: 130,
+      width: 160,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-ele/src/views/pay/wallet/rechargePackage/index.vue b/apps/web-ele/src/views/pay/wallet/rechargePackage/index.vue
index 3f079aad9242fd8b606742fdd66e1d21e5e5d006..f533bb5337b487ca4ff12b54486febd6fea71dbc 100644
--- a/apps/web-ele/src/views/pay/wallet/rechargePackage/index.vue
+++ b/apps/web-ele/src/views/pay/wallet/rechargePackage/index.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { WalletRechargePackageApi } from '#/api/pay/wallet/rechargePackage';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 
@@ -7,8 +8,8 @@ import { ElLoading, ElMessage } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
-  deletePackage,
-  getPackagePage,
+  deleteWalletRechargePackage,
+  getWalletRechargePackagePage,
 } from '#/api/pay/wallet/rechargePackage';
 import { $t } from '#/locales';
 
@@ -21,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -31,19 +32,19 @@ function handleCreate() {
 }
 
 /** 编辑套餐 */
-function handleEdit(row: any) {
+function handleEdit(row: WalletRechargePackageApi.WalletRechargePackage) {
   formModalApi.setData(row).open();
 }
 
 /** 删除套餐 */
-async function handleDelete(row: any) {
+async function handleDelete(row: WalletRechargePackageApi.WalletRechargePackage) {
   const loadingInstance = ElLoading.service({
     text: $t('ui.actionMessage.deleting', [row.name]),
   });
   try {
-    await deletePackage(row.id as number);
+    await deleteWalletRechargePackage(row.id!);
     ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
-    onRefresh();
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
@@ -60,7 +61,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
-          return await getPackagePage({
+          return await getWalletRechargePackagePage({
             pageNo: page.currentPage,
             pageSize: page.pageSize,
             ...formValues,
@@ -70,18 +71,19 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
       search: true,
     },
-  } as VxeTableGridOptions<any>,
+  } as VxeTableGridOptions<WalletRechargePackageApi.WalletRechargePackage>,
 });
 </script>
 
 <template>
   <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="充值套餐列表">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-ele/src/views/pay/wallet/rechargePackage/modules/form.vue b/apps/web-ele/src/views/pay/wallet/rechargePackage/modules/form.vue
index 1a582c258ca0994856f85eec00ea5b455e231acc..2e1243c5ee8f58ea46db2d04e1ffde9d1a4751cd 100644
--- a/apps/web-ele/src/views/pay/wallet/rechargePackage/modules/form.vue
+++ b/apps/web-ele/src/views/pay/wallet/rechargePackage/modules/form.vue
@@ -10,16 +10,16 @@ import { ElMessage } from 'element-plus';
 
 import { useVbenForm } from '#/adapter/form';
 import {
-  createPackage,
-  getPackage,
-  updatePackage,
+  createWalletRechargePackage,
+  getWalletRechargePackage,
+  updateWalletRechargePackage,
 } from '#/api/pay/wallet/rechargePackage';
 import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
-const formData = ref<WalletRechargePackageApi.Package>();
+const formData = ref<WalletRechargePackageApi.WalletRechargePackage>();
 const getTitle = computed(() => {
   return formData.value?.id
     ? $t('ui.actionTitle.edit', ['充值套餐'])
@@ -32,7 +32,7 @@ const [Form, formApi] = useVbenForm({
       class: 'w-full',
     },
     formItemClass: 'col-span-2',
-    labelWidth: 120,
+    labelWidth: 100,
   },
   layout: 'horizontal',
   schema: useFormSchema(),
@@ -48,12 +48,14 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     // 提交表单
     const data =
-      (await formApi.getValues()) as WalletRechargePackageApi.Package;
+      (await formApi.getValues()) as WalletRechargePackageApi.WalletRechargePackage;
     try {
       // 转换金额单位
       data.payPrice = yuanToFen(data.payPrice);
       data.bonusPrice = yuanToFen(data.bonusPrice);
-      await (formData.value?.id ? updatePackage(data) : createPackage(data));
+      await (formData.value?.id
+        ? updateWalletRechargePackage(data)
+        : createWalletRechargePackage(data));
       // 关闭并提示
       await modalApi.close();
       emit('success');
@@ -68,13 +70,14 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<WalletRechargePackageApi.Package>();
+    const data =
+      modalApi.getData<WalletRechargePackageApi.WalletRechargePackage>();
     if (!data || !data.id) {
       return;
     }
     modalApi.lock();
     try {
-      formData.value = await getPackage(data.id);
+      formData.value = await getWalletRechargePackage(data.id);
       // 转换金额单位
       formData.value.payPrice = Number.parseFloat(
         fenToYuan(formData.value.payPrice),
@@ -92,7 +95,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-1/4">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/pay/wallet/transaction/data.ts b/apps/web-ele/src/views/pay/wallet/transaction/data.ts
deleted file mode 100644
index 2fe7a7279cddac22064da527da185e0b52905085..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/pay/wallet/transaction/data.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-
-/** 列表的字段 */
-export function useGridColumns(): VxeTableGridOptions['columns'] {
-  return [
-    {
-      field: 'id',
-      title: '编号',
-      width: 80,
-    },
-    {
-      field: 'walletId',
-      title: '钱包编号',
-      width: 100,
-    },
-    {
-      field: 'title',
-      title: '关联业务标题',
-      width: 200,
-    },
-    {
-      field: 'price',
-      title: '交易金额',
-      width: 120,
-      formatter: ({ cellValue }) => `${cellValue / 100} 元`,
-    },
-    {
-      field: 'balance',
-      title: '钱包余额',
-      width: 120,
-      formatter: ({ cellValue }) => `${cellValue / 100} 元`,
-    },
-    {
-      field: 'createTime',
-      title: '交易时间',
-      width: 180,
-      formatter: 'formatDateTime',
-    },
-  ];
-}
diff --git a/apps/web-ele/src/views/pay/wallet/transaction/index.vue b/apps/web-ele/src/views/pay/wallet/transaction/index.vue
deleted file mode 100644
index d2aa3a5e663ce6b10ce7d3856ddca299d25d7335..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/pay/wallet/transaction/index.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<script lang="ts" setup>
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-
-import { Page } from '@vben/common-ui';
-
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { getWallet } from '#/api/pay/wallet/balance';
-import { getTransactionPage } from '#/api/pay/wallet/transaction';
-
-import { useGridColumns } from './data';
-
-const props = defineProps({
-  walletId: {
-    type: Number,
-    required: false,
-    default: undefined,
-  },
-  userId: {
-    type: Number,
-    required: false,
-    default: undefined,
-  },
-});
-
-const [Grid] = useVbenVxeGrid({
-  gridOptions: {
-    columns: useGridColumns(),
-    height: 'auto',
-    keepSource: true,
-    proxyConfig: {
-      ajax: {
-        query: async ({ page }, formValues) => {
-          let walletId = props.walletId;
-          if (props.userId) {
-            const wallet = await getWallet({ userId: props.userId });
-            walletId = wallet.id;
-          }
-          return await getTransactionPage({
-            pageNo: page.currentPage,
-            pageSize: page.pageSize,
-            walletId,
-            ...formValues,
-          });
-        },
-      },
-    },
-    rowConfig: {
-      keyField: 'id',
-    },
-    toolbarConfig: {
-      refresh: true,
-    },
-  } as VxeTableGridOptions<any>,
-});
-</script>
-
-<template>
-  <Page auto-content-height>
-    <Grid />
-  </Page>
-</template>
diff --git a/apps/web-ele/src/views/system/dept/modules/form.vue b/apps/web-ele/src/views/system/dept/modules/form.vue
index cf8aa2a13bb1bf4a8655736041c092d2c7fab352..b0136188b9a88eadc599689dfeb1b41c4a0b3f7a 100644
--- a/apps/web-ele/src/views/system/dept/modules/form.vue
+++ b/apps/web-ele/src/views/system/dept/modules/form.vue
@@ -69,9 +69,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDept(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/system/dict/modules/data-form.vue b/apps/web-ele/src/views/system/dict/modules/data-form.vue
index b518e4496fbc425b9c72376db0709ece33c1b6b6..6f320308815860622d82bf0ba72bbd1d4ee4aa6e 100644
--- a/apps/web-ele/src/views/system/dict/modules/data-form.vue
+++ b/apps/web-ele/src/views/system/dict/modules/data-form.vue
@@ -75,9 +75,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDictData(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/system/dict/modules/type-form.vue b/apps/web-ele/src/views/system/dict/modules/type-form.vue
index 5c9591c7867ad13ea9d698fdee151d89561a9f49..5e7cce34c1d1e46083ebf5caa20f9d8097d1c66a 100644
--- a/apps/web-ele/src/views/system/dict/modules/type-form.vue
+++ b/apps/web-ele/src/views/system/dict/modules/type-form.vue
@@ -71,9 +71,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDictType(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/system/menu/modules/form.vue b/apps/web-ele/src/views/system/menu/modules/form.vue
index 0662193ea3f640d6cb9bce4c86f8915fd907b4de..9a91c16f58b53d2e202640df6b0a6f7e13945d1f 100644
--- a/apps/web-ele/src/views/system/menu/modules/form.vue
+++ b/apps/web-ele/src/views/system/menu/modules/form.vue
@@ -69,9 +69,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getMenu(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/system/notice/modules/form.vue b/apps/web-ele/src/views/system/notice/modules/form.vue
index 1b8c8d6b695be4f3f725697a248a1b6c819348ec..f00a4972d074790c5e1672a79c416f68b4ab41aa 100644
--- a/apps/web-ele/src/views/system/notice/modules/form.vue
+++ b/apps/web-ele/src/views/system/notice/modules/form.vue
@@ -67,9 +67,7 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getNotice(data.id);
       // 设置到 values
-      if (formData.value) {
-        await formApi.setValues(formData.value);
-      }
+      await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
     }
diff --git a/packages/@core/ui-kit/form-ui/src/form-api.ts b/packages/@core/ui-kit/form-ui/src/form-api.ts
index 1c4a76004440a7b3f003b9748e8bd534b94153c5..4b51404c52ec0f9eaae47641f2485505907ffd7a 100644
--- a/packages/@core/ui-kit/form-ui/src/form-api.ts
+++ b/packages/@core/ui-kit/form-ui/src/form-api.ts
@@ -289,6 +289,18 @@ export class FormApi {
     }
   }
 
+  /**
+   * 设置表单禁用状态：用于非 Modal 中使用 Form 时，需要 Form 自己控制禁用状态
+   * @author 芋道源码
+   * @param disabled 是否禁用
+   */
+  setDisabled(disabled: boolean) {
+    this.setState((prev) => ({
+      ...prev,
+      commonConfig: { ...prev.commonConfig, disabled },
+    }));
+  }
+
   async setFieldValue(field: string, value: any, shouldValidate?: boolean) {
     const form = await this.getForm();
     form.setFieldValue(field, value, shouldValidate);