up

app/Exports/OrdersExport.php

@@ -18,10 +18,13 @@ class OrdersExport implements FromCollection
     public function collection()
     {
         $res = [];
+
         foreach ($this->data as $row) {
             $res[] = [
                 "订单编号" => " ".$row->serial,
                 "所属项目/医院" => $row->project->name,
+                "楼栋" => isset($row->bed->building) ? $row->bed->building->name : "",
+                "楼层/病区" => isset($row->bed->area) ? $row->bed->area->name : "",
                 "科室" => $row->department,
                 "客户姓名" => $row->customer->name ?: $row->patient->name,
                 "联系电话" => " ".$row->customer->mobile,

app/Http/Controllers/Admin/OrdersController.php

@@ -44,7 +44,6 @@ class OrdersController extends CommonController
         $this->model = $this->model->whereRaw("UNIX_TIMESTAMP(`created_at`) >= " . $start_timestamp . " and UNIX_TIMESTAMP(`created_at`) < " . $end_timestamp);
         $this->model = $this->model->where("project_id", $project_id);
 
-
         if ($request->keyword) {
             $this->model = $this->model->where(function ($query) use ($request) {
                 $query->where("serial", "like", "%" . $request->keyword . "%")

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

@@ -37,8 +37,8 @@
                         <tr>
                             <th>订单编号</th>
                             <th>所属项目/医院</th>
-{{--                            <th>所在楼栋</th>--}}
-{{--                            <th>所在病区</th>--}}
+                            <th>所在楼栋</th>
+                            <th>所在病区</th>
                             <th>客户科室</th>
                             <th>客户姓名</th>
                             <th>客户余额</th>
@@ -58,8 +58,8 @@
                                     {{ $row->serial }}
                                 </td>
                                 <td>{{ $row->project->name }}</td>
-{{--                                <td>{{ $row->bed->building->name }}</td>--}}
-{{--                                <td>{{ $row->bed->area->name }}</td>--}}
+                                <td>{{ $row->bed->building->name }}</td>
+                                <td>{{ $row->bed->area->name }}</td>
                                 <td>{{ $row->department }}</td>
                                 <td>{{ $row->customer->name ?: $row->patient->name }}</td>
                                 <td>{{ $row->customer->balance }}</td>