1

app/Http/Controllers/Admin/OrdersController.php

@@ -205,7 +205,7 @@ class OrdersController extends CommonController
      */
     public function artboard(Request $request)
     {
-        $has_ongoing_order = $request->get('has_ongoing_order',1);
+        $has_ongoing_order = $request->get('has_ongoing_order', 1);
         $userId = auth()->id();
         // 判断是否护士长
         $roleId = Role::where('name', 'like', '%护士长%')->where('guard_name', 'admin')->value('id');
@@ -229,7 +229,7 @@ class OrdersController extends CommonController
                 $query->where('project_id', $request->project_id);
             }
         })->with(['project',
-            "beds" => function ($query) use ($request,$has_ongoing_order) {
+            "beds" => function ($query) use ($request, $has_ongoing_order) {
                 if ($has_ongoing_order) {
                     $query->has("onGoingOrder");
                 }
@@ -253,7 +253,6 @@ class OrdersController extends CommonController
                 return $item->beds->count();
             });
         }
-        dd($data->toArray());
         return view($this->bladePath . ".artboard", compact("data"));
 
     }

resources/views/admin/orders/artboard.blade.php

@@ -31,7 +31,7 @@
                                 <td>{{ $row->name }}</td>
                                 <td>
                                     @foreach ($row->beds as $r)
-                                        {{$r->name}}-{{$r->}}
+                                        {{$r->name}}-{{$r->on_going_order->paramedic_name??''}}
                                     @endforeach
                                 </td>