From 37b09f37ebdbce28146021f22826065b0ad01fc3 Mon Sep 17 00:00:00 2001
From: liyinglin <liyl@langye.net>
Date: Thu, 4 Jan 2024 16:19:22 +0800
Subject: [PATCH] 1

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

diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index e04abd8..85fa95f 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@@ -35,6 +35,7 @@ class OrdersController extends CommonController
         }
         $project_id = request()->project_id ?? $projects->first()->id;
         $project = Project::find($project_id);
+        $status = $request->get('status', 20);
 
         $month = request()->month ?? date("Y-m");
         $months = (new StatisticsController())->_getMonths();
@@ -101,7 +102,15 @@ class OrdersController extends CommonController
             $factors = json_decode($order->factors, true);
             $order->department = (collect($factors)->where('factor_name', '所在科室')->first()['factor_item_name']) ?? '';
         }
-        return view($this->bladePath . ".index", compact("data", "project_id", "month", "project","hushizhang"));
+
+        // 订单状态
+        $order_status_list = [
+            '0' => '待确认',
+            '10' => '待指派',
+            '20' => '进行中',
+            '100' => '已完成'
+        ];
+        return view($this->bladePath . ".index", compact("status", "data", "project_id", "month", "project", "hushizhang", "order_status_list"));
     }
 
     public function changeItem(Request $request)
diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index 184d866..750e481 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -26,6 +26,14 @@
                                         value="{{ sprintf("%02d",$i)}}" @if(sprintf("%02d",$i) == request()->date) {{ "selected" }}@endif>{{sprintf("%02d",$i)}}</option>
                                 @endfor
                             </select>
+
+                            <select class="form-control mr-1" name="status" onchange="$(this).closest('form').submit()">
+                                @foreach($order_status_list as $key=>$mm)
+                                    <option value="{{$key}}" @if($key == $status) {{ "selected" }}@endif>{{$mm}}</option>
+                                @endforeach
+                            </select>
+
+
                             <input class="form-control" type="text" name="keyword" value="{{ request()->keyword }}"
                                    placeholder="订单编号/联系人/联系电话">