From 4a36ce9c1c99dd083cc2ba09896649b2a49558b9 Mon Sep 17 00:00:00 2001
From: HUANGBANGLIN <kj11553253@gmail.com>
Date: Fri, 3 Oct 2025 16:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E5=8D=95=E8=B5=84=E6=96=99=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8C=82=E5=8D=95=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E6=8C=82=E5=8D=95?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/App_Code/api/guadanOrderController.cs |  5 +++++
 web/admin/guadan/index.aspx               | 19 +++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/web/App_Code/api/guadanOrderController.cs b/web/App_Code/api/guadanOrderController.cs
index 497ce3d..cad6711 100644
--- a/web/App_Code/api/guadanOrderController.cs
+++ b/web/App_Code/api/guadanOrderController.cs
@@ -24,6 +24,10 @@ public class guadanOrderController : ApiController
         var query = _db.GuaDanOrder
             .Where(a => a.IsCancel == false)
             .Where(a => a.IsDeleted == false);
+        if(!string.IsNullOrEmpty(search.guaDanOrderNo))
+        {
+            query = query.Where(order => order.GuaDanOrderNo == search.guaDanOrderNo);
+        }
         if (search.guadanUser != null)
         {
             query = query.Where(order => order.BookerName == search.guadanUser);
@@ -280,6 +284,7 @@ public class guadanOrderController : ApiController
         public string guadanUser { get; set; }
         public int page { get; set; } = 1;
         public int pageSize { get; set; } = 10;
+        public string guaDanOrderNo { get; set; } = null;
     }
 
 }
\ No newline at end of file
diff --git a/web/admin/guadan/index.aspx b/web/admin/guadan/index.aspx
index eed7e59..de33440 100644
--- a/web/admin/guadan/index.aspx
+++ b/web/admin/guadan/index.aspx
@@ -7,6 +7,8 @@
         <a href="create.aspx" class="btn btn-primary" >新建掛單</a>
     </nav>
     <div class="d-flex align-items-center gap-3">
+      <label class="mb-0">掛單單號</label>
+      <input class="form-control w-auto" style="width:150px;" v-model="search.guaDanOrderNo" />
       <label class="mb-0">掛單登記人</label>
       <input class="form-control w-auto" style="width:150px;" v-model="search.guadanUser" />
 
@@ -77,7 +79,7 @@
                 @input="options.page = parseInt($event, 10)"
             ></v-text-field>
         </v-col>
-        <!-- 每页条数选择 -->
+        <!-- 每頁條數選擇 -->
         <v-col cols="12" md="1">
             <v-select
                 v-model="options.itemsPerPage"
@@ -111,7 +113,8 @@
                 return {
                     items: [],
                     headers: [
-                        { text: '登记挂单莲友', value: 'bookerName' },
+                        { text: '登記掛單蓮友', value: 'bookerName' },
+                        { text: '掛單單號', value: 'guaDanOrderNo'},
                         { text: '起始日期', value: 'start_date', align: 'center' },
                         { text: '結束日期', value: 'end_date', align: 'center' },
                         { text: '掛單人數', value: 'guest_count' },
@@ -130,6 +133,7 @@
                         startDate: null,
                         endDate: null,
                         guadanUser: null,
+                        guaDanOrderNo: null,
                     },
                     total: 0,
                     loading: false,
@@ -146,6 +150,12 @@
                     };
                 },
                 handleSearch() {
+
+                    let orderNo = this.search.guaDanOrderNo;
+                    if (orderNo) {
+                        orderNo = orderNo.replace(/\s+/g, '');
+                        this.search.guaDanOrderNo = orderNo;
+                    }
                     const val = this.search.guadanUser;
 
                     // 驗證是否包含空格
@@ -169,6 +179,7 @@
                     this.search.startDate = null;
                     this.search.endDate = null;
                     this.search.guadanUser = null;
+                    this.search.guaDanOrderNo = null;
                     this.resetTableOptions();
                 },
                 getGuadanOrder() {
@@ -177,6 +188,7 @@
                         startDate: this.search.startDate,
                         endDate: this.search.endDate,
                         guadanUser: this.search.guadanUser,
+                        guaDanOrderNo: this.search.guaDanOrderNo,
                         page: this.options.page,
                         pageSize: this.options.itemsPerPage
                     })
@@ -230,5 +242,4 @@
             }
         });
     </script>
-</asp:Content>
-
+</asp:Content>
\ No newline at end of file