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}} @endforeach +