From 86110c794d5156328fe27d6601579befd6ede02b Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 26 Dec 2024 10:16:13 +0800
Subject: [PATCH 1/8] update

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

diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index e1cb3b3..aad8f7b 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@@ -37,6 +37,14 @@ class OrdersController extends CommonController
         $project_id = request()->project_id ?? $projects->first()->id;
         $project = Project::find($project_id);
         $status = $request->get('status', 20);
+        $building_id = $request->get('building_id');
+        $area_id = $request->get('area_id');
+
+        // 楼栋
+        $buildings = Building::where('project_id', $project_id)->get();
+        // 病区
+        $areas = Area::where('project_id', $project_id)->get();
+
 
         $month = request()->month ?? '全部';
         $months = (new OrdersController())->_getMonths();
@@ -92,7 +100,7 @@ class OrdersController extends CommonController
                 "bed" => function ($query) {
                     $query->with(["room", "building", "area"]);
                 }
-            ])->where('status',$status)
+            ])->where('status', $status)
             ->orderBy("id", "desc");
 
         if (request()->is_export) {
@@ -118,7 +126,7 @@ class OrdersController extends CommonController
             '20' => '进行中',
             '100' => '已完成'
         ];
-        return view($this->bladePath . ".index", compact("status", "data", "project_id", "month", "project", "hushizhang", "yuanfang", "order_status_list"));
+        return view($this->bladePath . ".index", compact('buildings', 'areas', "status", "data", "project_id", "month", "project", "hushizhang", "yuanfang", "order_status_list"));
     }
 
     public function _getMonths()
@@ -262,11 +270,11 @@ class OrdersController extends CommonController
                 }
             })->where('admin_id', $user->id)->pluck('area_id');
         }
-        $data = Area::where(function ($query) use ($areaId,$building_id) {
+        $data = Area::where(function ($query) use ($areaId, $building_id) {
             if ($areaId) {
                 $query->whereIn('area.id', $areaId);
             }
-            if($building_id){
+            if ($building_id) {
                 $query->where('building_id', $building_id);
             }
         })->with(['project',
@@ -295,8 +303,8 @@ class OrdersController extends CommonController
             $data = $data->toArray();
         }
         // 获取楼栋
-        $buildings = Building::where('project_id',$project_id)->where('project_id', $project_id)->get();
-        return view($this->bladePath . ".artboard", compact("data", "projects", "project_id","buildings","building_id"));
+        $buildings = Building::where('project_id', $project_id)->where('project_id', $project_id)->get();
+        return view($this->bladePath . ".artboard", compact("data", "projects", "project_id", "buildings", "building_id"));
 
     }
 
diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index 409e907..1142631 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -15,6 +15,20 @@
                                         value="{{$pp->id}}" @if($pp->id == $project_id) {{ "selected" }}@endif>{{$pp->name}}</option>
                                 @endforeach
                             </select>
+                            <select class="form-control mr-1" name="building_id"
+                                    onchange="$(this).closest('form').submit()">
+                                @foreach($buildings as $pp)
+                                    <option
+                                        value="{{$pp->id}}" @if($pp->id == $building_id) {{ "selected" }}@endif>{{$pp->name}}</option>
+                                @endforeach
+                            </select>
+                            <select class="form-control mr-1" name="building_id"
+                                    onchange="$(this).closest('form').submit()">
+                                @foreach($areas as $pp)
+                                    <option
+                                        value="{{$pp->id}}" @if($pp->id == $area_id) {{ "selected" }}@endif>{{$pp->name}}</option>
+                                @endforeach
+                            </select>
                             <select class="form-control mr-1" name="month" onchange="$(this).closest('form').submit()">
                                 @foreach($months as $mm)
                                     <option value="{{$mm}}" @if($mm == $month) {{ "selected" }}@endif>{{$mm}}</option>
@@ -49,7 +63,7 @@
                             <th>所属项目/医院</th>
                             <th>所在楼栋</th>
                             <th>所在病区</th>
-                            <th>客户科室</th>
+{{--                            <th>客户科室</th>--}}
                             <th>客户姓名</th>
                             <th>客户余额</th>
                             <th>联系电话</th>
@@ -73,7 +87,7 @@
                                 <td>{{ $row->project->name }}</td>
                                 <td>{{ $row->bed->building->name }}</td>
                                 <td>{{ $row->bed->area->name }}</td>
-                                <td>{{ $row->department }}</td>
+{{--                                <td>{{ $row->department }}</td>--}}
                                 <td>{{ $row->customer->name ?: $row->patient->name }}</td>
                                 <td>{{ $row->customer->balance }}</td>
                                 <td>{{ $row->customer->mobile }}</td>

From 62b4969fd240f0bba696718e7864e7eea4cfdf41 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 26 Dec 2024 10:17:35 +0800
Subject: [PATCH 2/8] update

---
 app/Http/Controllers/Admin/OrdersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index aad8f7b..db1777c 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@@ -126,7 +126,7 @@ class OrdersController extends CommonController
             '20' => '进行中',
             '100' => '已完成'
         ];
-        return view($this->bladePath . ".index", compact('buildings', 'areas', "status", "data", "project_id", "month", "project", "hushizhang", "yuanfang", "order_status_list"));
+        return view($this->bladePath . ".index", compact('area_id','building_id','buildings', 'areas', "status", "data", "project_id", "month", "project", "hushizhang", "yuanfang", "order_status_list"));
     }
 
     public function _getMonths()

From 414cf3f387db600984aed58d83e5cd89227c3420 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 26 Dec 2024 10:18:50 +0800
Subject: [PATCH 3/8] update

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

diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index 1142631..641c102 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -41,7 +41,7 @@
                                         value="{{ sprintf("%02d",$i)}}" @if(sprintf("%02d",$i) == request()->date) {{ "selected" }}@endif>{{sprintf("%02d",$i)}}</option>
                                 @endfor
                             </select>
-
+                            <br/>
                             <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>

From aac7f1d0331c4f4a90c4c6f3531808f5e7db8c78 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 26 Dec 2024 10:33:23 +0800
Subject: [PATCH 4/8] update

---
 .../Controllers/Admin/OrdersController.php    | 38 ++++++++++++-------
 resources/views/admin/orders/index.blade.php  |  1 -
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index db1777c..0c8008f 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@@ -88,20 +88,30 @@ class OrdersController extends CommonController
             });
         }
 
-        $data = $this->model
-            ->with([
-                "orderItems",
-                "firstItem",
-                "lastItem",
-                "project",
-                "product",
-                "customer",
-                "manager",
-                "bed" => function ($query) {
-                    $query->with(["room", "building", "area"]);
+        $data = $this->model->with([
+            "orderItems",
+            "firstItem",
+            "lastItem",
+            "project",
+            "product",
+            "customer",
+            "manager",
+            "bed" => function ($query) {
+                $query->with(["room", "building", "area"]);
+            }
+        ])->where('status', $status)
+            ->where(function ($query) use ($building_id, $area_id) {
+                if ($building_id || $area_id) {
+                    $query->whereHas('bed', function ($q) use ($building_id, $area_id) {
+                        if (isset($building_id)) {
+                            $q->where('building_id', $building_id);
+                        }
+                        if (isset($area_id)) {
+                            $q->where('area_id', $area_id);
+                        }
+                    });
                 }
-            ])->where('status', $status)
-            ->orderBy("id", "desc");
+            })->orderBy("id", "desc");
 
         if (request()->is_export) {
             $data = $data->get();
@@ -126,7 +136,7 @@ class OrdersController extends CommonController
             '20' => '进行中',
             '100' => '已完成'
         ];
-        return view($this->bladePath . ".index", compact('area_id','building_id','buildings', 'areas', "status", "data", "project_id", "month", "project", "hushizhang", "yuanfang", "order_status_list"));
+        return view($this->bladePath . ".index", compact('area_id', 'building_id', 'buildings', 'areas', "status", "data", "project_id", "month", "project", "hushizhang", "yuanfang", "order_status_list"));
     }
 
     public function _getMonths()
diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index 641c102..51f66f9 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -41,7 +41,6 @@
                                         value="{{ sprintf("%02d",$i)}}" @if(sprintf("%02d",$i) == request()->date) {{ "selected" }}@endif>{{sprintf("%02d",$i)}}</option>
                                 @endfor
                             </select>
-                            <br/>
                             <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>

From 6a7bf0dd3a1614f3d19c7f972c76ea32eae409f8 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 26 Dec 2024 10:35:08 +0800
Subject: [PATCH 5/8] update

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

diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index 51f66f9..adbb46f 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -18,6 +18,7 @@
                             <select class="form-control mr-1" name="building_id"
                                     onchange="$(this).closest('form').submit()">
                                 @foreach($buildings as $pp)
+                                    <option value="">全部</option>
                                     <option
                                         value="{{$pp->id}}" @if($pp->id == $building_id) {{ "selected" }}@endif>{{$pp->name}}</option>
                                 @endforeach
@@ -25,8 +26,8 @@
                             <select class="form-control mr-1" name="building_id"
                                     onchange="$(this).closest('form').submit()">
                                 @foreach($areas as $pp)
-                                    <option
-                                        value="{{$pp->id}}" @if($pp->id == $area_id) {{ "selected" }}@endif>{{$pp->name}}</option>
+                                    <option value="">全部</option>
+                                    <option value="{{$pp->id}}" @if($pp->id == $area_id) {{ "selected" }}@endif>{{$pp->name}}</option>
                                 @endforeach
                             </select>
                             <select class="form-control mr-1" name="month" onchange="$(this).closest('form').submit()">

From b05ccd480b958612b52c44fbe5a4067c3200cbfa Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 26 Dec 2024 10:35:50 +0800
Subject: [PATCH 6/8] update

---
 resources/views/admin/orders/index.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index adbb46f..8f3c4de 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -17,16 +17,16 @@
                             </select>
                             <select class="form-control mr-1" name="building_id"
                                     onchange="$(this).closest('form').submit()">
-                                @foreach($buildings as $pp)
-                                    <option value="">全部</option>
+                                <option value="">全部</option>
+                            @foreach($buildings as $pp)
                                     <option
                                         value="{{$pp->id}}" @if($pp->id == $building_id) {{ "selected" }}@endif>{{$pp->name}}</option>
                                 @endforeach
                             </select>
                             <select class="form-control mr-1" name="building_id"
                                     onchange="$(this).closest('form').submit()">
-                                @foreach($areas as $pp)
-                                    <option value="">全部</option>
+                                <option value="">全部</option>
+                            @foreach($areas as $pp)
                                     <option value="{{$pp->id}}" @if($pp->id == $area_id) {{ "selected" }}@endif>{{$pp->name}}</option>
                                 @endforeach
                             </select>

From 1c22f9a08704d5d44845dbd622e6906f49769645 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 26 Dec 2024 10:37:20 +0800
Subject: [PATCH 7/8] update

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

diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index 8f3c4de..a698f37 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -23,7 +23,7 @@
                                         value="{{$pp->id}}" @if($pp->id == $building_id) {{ "selected" }}@endif>{{$pp->name}}</option>
                                 @endforeach
                             </select>
-                            <select class="form-control mr-1" name="building_id"
+                            <select class="form-control mr-1" name="area_id"
                                     onchange="$(this).closest('form').submit()">
                                 <option value="">全部</option>
                             @foreach($areas as $pp)

From 62741102317667c37f4509cca10e71aa20aa01ba Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 26 Dec 2024 10:42:08 +0800
Subject: [PATCH 8/8] update

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

diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index a698f37..2d3b18d 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -17,7 +17,7 @@
                             </select>
                             <select class="form-control mr-1" name="building_id"
                                     onchange="$(this).closest('form').submit()">
-                                <option value="">全部</option>
+                                <option value="">全部楼栋</option>
                             @foreach($buildings as $pp)
                                     <option
                                         value="{{$pp->id}}" @if($pp->id == $building_id) {{ "selected" }}@endif>{{$pp->name}}</option>
@@ -25,7 +25,7 @@
                             </select>
                             <select class="form-control mr-1" name="area_id"
                                     onchange="$(this).closest('form').submit()">
-                                <option value="">全部</option>
+                                <option value="">全部病区</option>
                             @foreach($areas as $pp)
                                     <option value="{{$pp->id}}" @if($pp->id == $area_id) {{ "selected" }}@endif>{{$pp->name}}</option>
                                 @endforeach