1

app/Http/Controllers/Admin/OrdersController.php

@@ -249,11 +249,6 @@ class OrdersController extends CommonController
             ->addSelect("building.name as building_name")
             ->withCount("beds")
             ->paginate(10);
-//        if ($has_ongoing_order) {
-//            $data = $data->filter(function ($item) {
-//                return $item->beds->count();
-//            });
-//        }
         $projects = (new StatisticsController())->_checkProjects();
        // dd($data->toArray());
         return view($this->bladePath . ".artboard", compact("data", "projects", "project_id"));

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

@@ -19,7 +19,6 @@
                     <table class="table table-bordered" id="data-table">
                         <thead>
                         <tr>
-                            <th>ID</th>
                             <th>所属项目/医院</th>
                             <th>所在病区</th>
                             <th>客户信息</th>
@@ -28,12 +27,11 @@
                         <tbody>
                         @foreach ($data as $row)
                             <tr data-id="{{$row->id}}">
-                                <td>{{ $row->id }}</td>
                                 <td>{{ $row->project->name }}</td>
                                 <td>{{ $row->name }}</td>
                                 <td>
                                     @foreach ($row->beds as $r)
-                                        {{$r->name}}-{{$r->on_going_order??''}}
+                                        {{$r->name}}-{{$r->on_going_order->paramedic_name}}<br/>
                                     @endforeach
                                 </td>
                             </tr>