From 97e375468d25ed54ee60731e6b1350fb4330676c Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 12 Mar 2026 18:50:09 +0800
Subject: [PATCH 1/3] update

---
 app/Http/Controllers/Admin/OrdersController.php | 5 +++++
 resources/views/admin/orders/index.blade.php    | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index 5f1fae6..dbbad20 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@@ -90,6 +90,11 @@ class OrdersController extends CommonController
         }
         $this->model = $this->model->where("project_id", $project_id);
 
+        // 订单号搜索（精确或模糊）
+        if ($request->filled('order_no')) {
+            $this->model = $this->model->where("serial", "like", "%" . trim($request->order_no) . "%");
+        }
+
         if ($request->keyword) {
             $this->model = $this->model->where(function ($query) use ($request) {
                 $query->where("serial", "like", "%" . $request->keyword . "%")
diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index c191036..87c24b3 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -46,9 +46,10 @@
                                 @endforeach
                             </select>
 
-
+                            <input class="form-control mr-1" type="text" name="order_no" value="{{ request()->order_no }}"
+                                placeholder="订单号" style="width: 140px;">
                             <input class="form-control" type="text" name="keyword" value="{{ request()->keyword }}"
-                                placeholder="订单编号/联系人/联系电话">
+                                placeholder="联系人/联系电话">
                             @if(\App\Models\CommonModel::checkExport())
                                 <button class="btn btn-primary ml-1" type="button" onclick="doExport(this)">导出</button>
                             @endif

From f529a8153133666bb76fb7c2f23864204aeeadbf Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 12 Mar 2026 18:53:07 +0800
Subject: [PATCH 2/3] update

---
 resources/views/admin/orders/index.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index 87c24b3..2bc46ad 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -48,8 +48,9 @@
 
                             <input class="form-control mr-1" type="text" name="order_no" value="{{ request()->order_no }}"
                                 placeholder="订单号" style="width: 140px;">
-                            <input class="form-control" type="text" name="keyword" value="{{ request()->keyword }}"
+                            <input class="form-control mr-1" type="text" name="keyword" value="{{ request()->keyword }}"
                                 placeholder="联系人/联系电话">
+                            <button class="btn btn-primary mr-1" type="submit">搜索</button>
                             @if(\App\Models\CommonModel::checkExport())
                                 <button class="btn btn-primary ml-1" type="button" onclick="doExport(this)">导出</button>
                             @endif

From 24491c9c64f8d25110832dda9d994d2b082a951c Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 12 Mar 2026 18:54:48 +0800
Subject: [PATCH 3/3] update

---
 app/Http/Controllers/Admin/OrdersController.php | 5 -----
 resources/views/admin/orders/index.blade.php    | 8 +++-----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index dbbad20..5f1fae6 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@@ -90,11 +90,6 @@ class OrdersController extends CommonController
         }
         $this->model = $this->model->where("project_id", $project_id);
 
-        // 订单号搜索（精确或模糊）
-        if ($request->filled('order_no')) {
-            $this->model = $this->model->where("serial", "like", "%" . trim($request->order_no) . "%");
-        }
-
         if ($request->keyword) {
             $this->model = $this->model->where(function ($query) use ($request) {
                 $query->where("serial", "like", "%" . $request->keyword . "%")
diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index 2bc46ad..c191036 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -46,11 +46,9 @@
                                 @endforeach
                             </select>
 
-                            <input class="form-control mr-1" type="text" name="order_no" value="{{ request()->order_no }}"
-                                placeholder="订单号" style="width: 140px;">
-                            <input class="form-control mr-1" type="text" name="keyword" value="{{ request()->keyword }}"
-                                placeholder="联系人/联系电话">
-                            <button class="btn btn-primary mr-1" type="submit">搜索</button>
+
+                            <input class="form-control" type="text" name="keyword" value="{{ request()->keyword }}"
+                                placeholder="订单编号/联系人/联系电话">
                             @if(\App\Models\CommonModel::checkExport())
                                 <button class="btn btn-primary ml-1" type="button" onclick="doExport(this)">导出</button>
                             @endif