From 33ef5825b079ee5049905a6926410979275baabe Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Mon, 9 Jun 2025 08:22:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(approval):=20=E6=B7=BB=E5=8A=A0=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=92=8C=E5=AE=A1=E6=89=B9=E7=B1=BB=E5=9E=8B=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在审批列表和类型定义中添加企业微信corpid字段和审批类型字段，以支持多租户和不同类型的审批流程
---
 src/common/apis/approval/type.ts | 25 ++++++++++++++++++++++++-
 src/pages/approval/list.vue      |  7 ++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/common/apis/approval/type.ts b/src/common/apis/approval/type.ts
index fb8c327..731ed09 100644
--- a/src/common/apis/approval/type.ts
+++ b/src/common/apis/approval/type.ts
@@ -25,6 +25,8 @@ export interface SearchApiReturnApprovalQuery {
   status?: number
   startTime?: string
   endTime?: string
+  approvalType?: number
+  corpid?: string
 }
 
 export interface ApiResponsePageData<T> {
@@ -37,16 +39,31 @@ export interface ApiResponsePageData<T> {
 }
 
 export interface ReturnApprovalEntity {
+  /** 审批编号 */
   approvalId: number
+  /** 关联订单ID */
   orderId: number
+  /** 关联商品ID */
   goodsId: number
   /** 关联订单商品ID */
   orderGoodsId: number
+  /** 外部归属类型的商品ID */
+  externalGoodsId?: number
+  /** 外部归属类型的审批ID */
+  externalApprovalId?: number
+  /** 企业微信id */
+  corpid?: string
+  /** 申请数量 */
+  applyQuantity?: number
+  /** 审批类型（0为借还柜 1为固资通） */
+  approvalType?: number
+  /** 申请说明 */
+  applyRemark?: string
   /** 归还数量 */
   returnQuantity: number
   /** 商品单价 */
   goodsPrice: number
-  status: number
+  /** 退还金额 */
   returnAmount: number
   /** 归还图片路径数组 */
   returnImages: string
@@ -56,6 +73,10 @@ export interface ReturnApprovalEntity {
   returnRemark: string
   /** 审核说明 */
   auditRemark: string
+  /** 审批状态(1待审核 2已通过 3已驳回) */
+  status: number
+  /** 审批时间 */
+  approvalTime?: string
   createTime: string
   updateTime: string
   /** 商品名称 */
@@ -72,6 +93,8 @@ export interface ReturnApprovalEntity {
   isInternal: number
   /** 审核人姓名 */
   auditName: string
+  /** 支付方式 */
+  paymentMethod?: string
 }
 
 export type SubmitApprovalResponseData = ApiResponseMsgData<{
diff --git a/src/pages/approval/list.vue b/src/pages/approval/list.vue
index 87b2bed..dfee47c 100644
--- a/src/pages/approval/list.vue
+++ b/src/pages/approval/list.vue
@@ -59,11 +59,15 @@ import { getApprovalListApi } from '@/common/apis/approval'
 import type { SearchApiReturnApprovalQuery, ReturnApprovalEntity } from '@/common/apis/approval/type'
 import type { PickerConfirmEventParams } from 'vant/es';
 import { useApprovalStore } from '@/pinia/stores/approval';
+import { useWxStore } from '@/pinia/stores/wx';
 
-const router = useRouter()
+const router = useRouter();
+const wxStore = useWxStore();
 
 // 搜索参数
 const searchParams = reactive<SearchApiReturnApprovalQuery>({
+    corpid: wxStore.corpid,
+    approvalType: 0,
     pageNum: 1,
     pageSize: 10,
 })
@@ -158,6 +162,7 @@ const handleReset = () => {
 // 加载数据
 const onLoad = async () => {
     try {
+        searchParams.corpid = wxStore.corpid;
         const { data } = await getApprovalListApi(searchParams)
         list.value.push(...data.rows)
         loading.value = false