From fa5beaa4238ef063b5a59ebf23b08f27594bccc6 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Tue, 24 Jun 2025 17:54:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=B9=B6=E7=A7=BB=E9=99=A4=E9=87=8D=E7=BD=AE=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在订单查询接口和页面中添加退款状态字段，支持按退款状态筛选订单
移除两个页面中的重置按钮以简化界面操作
---
 src/api/shop/order.ts             |  6 ++++++
 src/views/shop/approval/index.vue |  3 ---
 src/views/shop/order/index.vue    | 10 +++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/api/shop/order.ts b/src/api/shop/order.ts
index 8b95aea..f45ae3b 100644
--- a/src/api/shop/order.ts
+++ b/src/api/shop/order.ts
@@ -40,6 +40,12 @@ export interface OrderQuery extends BasePageQuery {
  * wechat-微信支付 | balance-借呗支付
  */
   paymentMethod?: string;
+  /**
+   * 退款状态
+   * @remarks
+   * 0-未退款 | 1-已退款
+   */
+  returnStatus?: number;
 }
 
 export interface OrderDTO {
diff --git a/src/views/shop/approval/index.vue b/src/views/shop/approval/index.vue
index 513f05d..9563ec3 100644
--- a/src/views/shop/approval/index.vue
+++ b/src/views/shop/approval/index.vue
@@ -168,9 +168,6 @@ getList();
         <el-button type="primary" :icon="useRenderIcon(Search)" @click="onSearch" class="mr-2">
           搜索
         </el-button>
-        <el-button :icon="useRenderIcon(Refresh)" @click="resetForm" class="mr-2">
-          重置
-        </el-button>
         <el-button type="success" :loading="exportLoading" :icon="useRenderIcon('vscode-icons:file-type-excel2')"
           @click="handleExport">
           导出Excel
diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue
index 33798e1..3d31ccb 100644
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@@ -28,6 +28,7 @@ const searchFormParams = ref<OrderQuery>({
   startTime: "",
   endTime: "",
   payTime: "",
+  returnStatus: null,
 });
 
 const pagination = ref({
@@ -166,6 +167,12 @@ getList();
             <el-option label="已退款" :value="4" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="returnStatus">
+          <el-select v-model="searchFormParams.returnStatus" 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" />
@@ -178,9 +185,6 @@ getList();
           <el-button type="primary" :icon="useRenderIcon(Search)" @click="onSearch" style="margin-right: 10px;">
             搜索
           </el-button>
-          <el-button :icon="useRenderIcon(Refresh)" @click="resetForm" style="margin-right: 10px;">
-            重置
-          </el-button>
           <el-button type="success" :loading="exportLoading" :icon="useRenderIcon('vscode-icons:file-type-excel2')"
             @click="handleExport">
             导出Excel