From a16d127512307d880f37d8a778a5365c529e96e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=92?= <van666666@foxmail.com>
Date: Mon, 3 Nov 2025 10:51:10 +0800
Subject: [PATCH] 1

---
 src/components/ListLayout/index.vue    |  1 +
 src/views/system/jdorder/orderList.vue | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/ListLayout/index.vue b/src/components/ListLayout/index.vue
index a27489e..793156b 100644
--- a/src/components/ListLayout/index.vue
+++ b/src/components/ListLayout/index.vue
@@ -54,6 +54,7 @@ export default {
   overflow: auto;
   padding: 0 20px;
   background: #fff;
+  min-height: 0; /* 确保 flex 子元素可以收缩 */
 }
 
 /* 固定分页区域 */
diff --git a/src/views/system/jdorder/orderList.vue b/src/views/system/jdorder/orderList.vue
index 58ac32c..9547d41 100644
--- a/src/views/system/jdorder/orderList.vue
+++ b/src/views/system/jdorder/orderList.vue
@@ -37,6 +37,9 @@
               @change="handleDateRangeChange"
             />
           </el-form-item>
+          <el-form-item label="完成日期">
+            <el-checkbox v-model="queryParams.hasFinishTime" @change="handleQuery">仅显示已完成订单</el-checkbox>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">搜索</el-button>
             <el-button size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -184,7 +187,8 @@ export default {
         beginTime: null,
         endTime: null,
         orderBy: 'create_time',
-        isAsc: 'desc'
+        isAsc: 'desc',
+        hasFinishTime: false
       }
     }
   },
@@ -281,7 +285,10 @@ export default {
         address: undefined,
         status: undefined,
         beginTime: null,
-        endTime: null
+        endTime: null,
+        orderBy: 'create_time',
+        isAsc: 'desc',
+        hasFinishTime: false
       }
       // 重置排序为默认降序
       this.queryParams.orderBy = 'create_time'