diff --git a/app/Exports/OrdersExport.php b/app/Exports/OrdersExport.php index 1ae007d..0e492f9 100644 --- a/app/Exports/OrdersExport.php +++ b/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, diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php index def1431..13c972f 100755 --- a/app/Http/Controllers/Admin/OrdersController.php +++ b/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 . "%") diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php index afe87e0..29652cc 100755 --- a/resources/views/admin/orders/index.blade.php +++ b/resources/views/admin/orders/index.blade.php @@ -37,8 +37,8 @@