From c4bb2468b23a868ac995fea98df6e293f7fce632 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 28 Nov 2024 13:08:58 +0800
Subject: [PATCH] update

---
 app/Http/Controllers/Admin/OrdersController.php | 6 +++++-
 resources/views/admin/orders/artboard.blade.php | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index 2bb4da8..d123a98 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@@ -12,6 +12,7 @@ use App\Exports\OrdersExport;
 use App\Models\AdminAreaLink;
 use App\Models\Area;
 use App\Models\Bed;
+use App\Models\Building;
 use App\Models\OrderItems;
 use App\Models\Orders;
 use App\Models\Project;
@@ -242,6 +243,7 @@ class OrdersController extends CommonController
     public function artboard(Request $request)
     {
         $projects = (new StatisticsController())->_checkProjects();
+        $building_id = $request->get('building_id');
         $defaultProjectsId = ($projects[0]->id) ?? '';
         $project_id = $request->get('project_id', $defaultProjectsId);
 
@@ -289,7 +291,9 @@ class OrdersController extends CommonController
         if ($data->first()) {
             $data = $data->toArray();
         }
-        return view($this->bladePath . ".artboard", compact("data", "projects", "project_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/artboard.blade.php b/resources/views/admin/orders/artboard.blade.php
index 7ec3145..6a6b998 100644
--- a/resources/views/admin/orders/artboard.blade.php
+++ b/resources/views/admin/orders/artboard.blade.php
@@ -16,6 +16,13 @@
                                         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>
                         </form>
                     </div>
                     <table class="table table-bordered" id="data-table">