From a4107e212aeda22afeb41c169f4c407bef70d4a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 23 Jul 2026 07:51:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(shopOrder):=20=E6=8C=89=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AD=9B=E9=80=89=E7=8A=B6=E6=80=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 搜索组件增加 statusFilter 属性以支持导出时传入筛选状态
- 在 shopOrder 页面通过计算属性传递当前标签的筛选状态给搜索组件
- 导出时订单列表请求中带入当前标签对应的筛选状态，避免混入其它状态订单
- 优化导出功能的状态一致性，提升使用体验
---
 src/views/shop/shopOrder/components/search.vue |  4 +++-
 src/views/shop/shopOrder/index.vue             | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/views/shop/shopOrder/components/search.vue b/src/views/shop/shopOrder/components/search.vue
index 512ac64..3f0ed0d 100644
--- a/src/views/shop/shopOrder/components/search.vue
+++ b/src/views/shop/shopOrder/components/search.vue
@@ -104,6 +104,8 @@ const props = withDefaults(
   defineProps<{
     // 选中的订单
     selection?: ShopOrder[];
+    // 当前列表标签对应的筛选状态（如待发货=1），导出时一并带入
+    statusFilter?: number;
   }>(),
   {}
 );
@@ -253,7 +255,7 @@ const handleExport = async () => {
     ]
   ];
 
-  await listShopOrder(where)
+  await listShopOrder({ ...where, statusFilter: props.statusFilter })
     .then((list) => {
       orders.value = list;
       list?.forEach((d: ShopOrder) => {
diff --git a/src/views/shop/shopOrder/index.vue b/src/views/shop/shopOrder/index.vue
index 0f91ed1..7db1b28 100644
--- a/src/views/shop/shopOrder/index.vue
+++ b/src/views/shop/shopOrder/index.vue
@@ -1,10 +1,11 @@
 <template>
   <a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
     <a-card style="margin-bottom: 20px">
-      <search
-        @search="reload"
-        :selection="selection"
-        @add="openEdit"
+    <search
+      @search="reload"
+      :selection="selection"
+      :status-filter="statusFilterForExport"
+      @add="openEdit"
         @remove="removeBatch"
         @batchMove="openMove"
       />
@@ -390,7 +391,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref, onMounted, onActivated } from 'vue';
+  import { createVNode, ref, onMounted, onActivated, computed } from 'vue';
   import { useRoute } from 'vue-router';
   import type { EleProTable } from 'ele-admin-pro';
   import type {
@@ -487,6 +488,11 @@
     return filterMap[key];
   };
 
+  // 导出时跟随当前标签的筛选状态（如「待发货」=1），避免导出混入其它状态的订单
+  const statusFilterForExport = computed(() =>
+    getStatusFilterByTab(activeKey.value)
+  );
+
   // 表格数据源
   const datasource: DatasourceFunction = ({
     page,