From 877fa5f1db036b8b2f13fc2ce5a24c39aa5a42a1 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Sat, 14 Jun 2025 11:41:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=AE=A1=E6=89=B9):=20=E5=9C=A8=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E5=AE=A1=E6=89=B9=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=92=8C=E9=A1=B5=E9=9D=A2=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加审批类型字段以区分借还柜和固资通的审批流程，默认值为0（借还柜）
---
 src/api/shop/approval.ts          | 6 ++++++
 src/views/shop/approval/index.vue | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/api/shop/approval.ts b/src/api/shop/approval.ts
index b48e054..d60fc4f 100644
--- a/src/api/shop/approval.ts
+++ b/src/api/shop/approval.ts
@@ -12,6 +12,12 @@ export interface SearchReturnApprovalQuery extends BasePageQuery {
  * wechat-微信支付 | balance-余额支付
  */
   paymentMethod?: string;
+  /**
+   * 审批类型
+   * @remarks
+   * 0为借还柜 1为固资通
+   */
+  approvalType: number;
 }
 
 /** 退货审批DTO */
diff --git a/src/views/shop/approval/index.vue b/src/views/shop/approval/index.vue
index d8abef7..dfe0aa4 100644
--- a/src/views/shop/approval/index.vue
+++ b/src/views/shop/approval/index.vue
@@ -23,7 +23,8 @@ const searchFormParams = ref<SearchReturnApprovalQuery>({
   goodsId: null,
   status: null,
   approvalTime: null,
-  paymentMethod: null
+  paymentMethod: null,
+  approvalType: 0
 });
 
 // 分页参数
@@ -151,6 +152,12 @@ getList();
           <el-option label="已驳回" :value="3" />
         </el-select>
       </el-form-item>
+      <el-form-item prop="approvalType">
+        <el-select v-model="searchFormParams.approvalType" placeholder="请选择审批类型" clearable class="!w-[180px]">
+          <el-option label="借还柜" :value="0" />
+          <el-option label="固资通" :value="1" />
+        </el-select>
+      </el-form-item>
       <el-form-item prop="paymentMethod">
         <el-select v-model="searchFormParams.paymentMethod" placeholder="请选择支付方式" clearable class="!w-[180px]">
           <el-option label="微信支付" value="wechat" />