diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php index ec922b4..e1d08f8 100755 --- a/app/Http/Controllers/Admin/OrdersController.php +++ b/app/Http/Controllers/Admin/OrdersController.php @@ -77,9 +77,10 @@ class OrdersController extends CommonController $data = $data->paginate(10); foreach ($data as $order) { + $factors = json_decode($order->factors,true); + $order->department = collect($factors)->where('factor_name','所在科室')->first()->factor_item_name; $order = $order->refreshTotal(); } - dd($data); return view($this->bladePath . ".index", compact("data", "project_id", "month", "project")); } diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php index 0749d78..f86dee6 100755 --- a/resources/views/admin/orders/index.blade.php +++ b/resources/views/admin/orders/index.blade.php @@ -56,6 +56,7 @@ {{ $row->serial }}