feat：【antd】【erp 系统】统一审批接口的写法与调用

apps/web-antd/src/api/erp/finance/account/index.ts

@@ -51,6 +51,7 @@ export function updateAccount(data: ErpAccountApi.Account) {
 }
 
 /** 修改结算账户默认状态 */
+// TODO @芋艿：这里有少迁移的
 export function updateAccountDefaultStatus(id: number, defaultStatus: boolean) {
   return requestClient.put('/erp/account/update-default-status', null, {
     params: { id, defaultStatus },

apps/web-antd/src/api/erp/finance/payment/index.ts

@@ -51,17 +51,9 @@ namespace ErpFinancePaymentApi {
     remark?: string;
     bizNo?: string;
   }
-
-  /** 付款单状态更新参数 */
-  export interface FinancePaymentStatusParams {
-    id: number;
-    status: number;
-  }
 }
 
-/**
+/** 查询付款单分页 */
- * 查询付款单分页
- */
 export function getFinancePaymentPage(
   params: ErpFinancePaymentApi.FinancePaymentPageParams,
 ) {
@@ -73,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(id: number, status: number) {
- */
-export function updateFinancePaymentStatus(
-  params: ErpFinancePaymentApi.FinancePaymentStatusParams,
-) {
   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: {
@@ -122,9 +102,7 @@ export function deleteFinancePayment(ids: number[]) {
   });
 }
 
-/**
+/** 导出付款单 Excel */
- * 导出付款单 Excel
- */
 export function exportFinancePayment(
   params: ErpFinancePaymentApi.FinancePaymentPageParams,
 ) {

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;
-  }
+    remark?: string;
-
+    bizNo?: string;
-  /** 收款单状态更新参数 */
-  export interface FinanceReceiptStatusParams {
-    id: number;
-    status: number;
   }
 }
 
-/**
+/** 查询收款单分页 */
- * 查询收款单分页
- */
 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(id: number, status: number) {
- */
-export function updateFinanceReceiptStatus(
-  params: ErpFinanceReceiptApi.FinanceReceiptStatusParams,
-) {
   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,
 ) {

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(
+export function updateSaleReturnStatus(id: number, status: number) {
-  params: ErpSaleReturnApi.SaleReturnStatusParams,
-) {
   return requestClient.put('/erp/sale-return/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 

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(
+export function updateStockCheckStatus(id: number, status: number) {
-  params: ErpStockCheckApi.StockCheckStatusParams,
-) {
   return requestClient.put('/erp/stock-check/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 

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 },
   });
 }
 

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(
+export function updateStockMoveStatus(id: number, status: number) {
-  params: ErpStockMoveApi.StockMoveStatusParams,
-) {
   return requestClient.put('/erp/stock-move/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 

apps/web-antd/src/api/erp/stock/out/index.ts

@@ -40,13 +40,6 @@ export namespace ErpStockOutApi {
     status?: number;
   }
 
-  /** 其它出库单状态更新参数 */
-  export interface StockOutStatusParams {
-    id: number;
-    status: number;
-  }
-}
-
 /**
  * 查询其它出库单分页
  */
@@ -85,11 +78,9 @@ export function updateStockOut(data: ErpStockOutApi.StockOut) {
 /**
  * 更新其它出库单的状态
  */
-export function updateStockOutStatus(
+export function updateStockOutStatus(id: number, status: number) {
-  params: ErpStockOutApi.StockOutStatusParams,
-) {
   return requestClient.put('/erp/stock-out/update-status', null, {
-    params,
+    params: { id, status },
   });
 }
 

apps/web-antd/src/views/erp/stock/check/index.vue

@@ -75,7 +75,7 @@ async function handleUpdateStatus(
     duration: 0,
   });
   try {
-    await updateStockCheckStatus({ id: row.id!, status });
+    await updateStockCheckStatus(row.id!, status);
     message.success(`${status === 20 ? '审批' : '反审批'}成功`);
     handleRefresh();
   } finally {

apps/web-antd/src/views/erp/stock/in/index.vue

@@ -72,7 +72,7 @@ async function handleUpdateStatus(row: ErpStockInApi.StockIn, status: number) {
     duration: 0,
   });
   try {
-    await updateStockInStatus({ id: row.id!, status });
+    await updateStockInStatus(row.id!, status);
     message.success(`${status === 20 ? '审批' : '反审批'}成功`);
     handleRefresh();
   } finally {

apps/web-antd/src/views/erp/stock/move/index.vue

@@ -75,7 +75,7 @@ async function handleUpdateStatus(
     duration: 0,
   });
   try {
-    await updateStockMoveStatus({ id: row.id!, status });
+    await updateStockMoveStatus(row.id!, status);
     message.success(`${status === 20 ? '审批' : '反审批'}成功`);
     handleRefresh();
   } finally {

apps/web-antd/src/views/erp/stock/out/index.vue

@@ -75,7 +75,7 @@ async function handleUpdateStatus(
     duration: 0,
   });
   try {
-    await updateStockOutStatus({ id: row.id!, status });
+    await updateStockOutStatus(row.id!, status);
     message.success(`${status === 20 ? '审批' : '反审批'}成功`);
     handleRefresh();
   } finally {