From 7b41fa7b477f0a88c3affe9fa13a667e5298e669 Mon Sep 17 00:00:00 2001 From: liyinglin Date: Thu, 4 Jan 2024 16:35:14 +0800 Subject: [PATCH] 1 --- app/Http/Controllers/Admin/OrdersController.php | 11 +++++++++-- resources/views/admin/orders/index.blade.php | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php index fbc1eec..5634e4b 100755 --- a/app/Http/Controllers/Admin/OrdersController.php +++ b/app/Http/Controllers/Admin/OrdersController.php @@ -40,7 +40,7 @@ class OrdersController extends CommonController $month = request()->month ?? '全部'; $months = (new OrdersController())->_getMonths(); - if($month != '全部'){ + if ($month != '全部') { $start_timestamp = strtotime($month); $end_timestamp = strtotime("+1 month", strtotime($month)); $this->model = $this->model->whereRaw("UNIX_TIMESTAMP(`created_at`) >= " . $start_timestamp . " and UNIX_TIMESTAMP(`created_at`) < " . $end_timestamp); @@ -60,6 +60,13 @@ class OrdersController extends CommonController $roleId = Role::where('name', 'like', '%护士长%')->where('guard_name', 'admin')->value('id'); $hushizhang = DB::table('model_has_roles')->where('role_id', $roleId) ->where('model_type', 'App\Admin')->where('model_id', $userId)->count(); + + // 是否院方管理 + $roleId = Role::where('name', 'like', '%院方管理%')->where('guard_name', 'admin')->value('id'); + $yuanfang = DB::table('model_has_roles')->where('role_id', $roleId) + ->where('model_type', 'App\Admin')->where('model_id', $userId)->count(); + + if ($hushizhang) { $user = auth()->user(); $areaId = AdminAreaLink::where('project_id', $project_id)->where('admin_id', $user->id)->pluck('area_id'); @@ -111,7 +118,7 @@ class OrdersController extends CommonController '20' => '进行中', '100' => '已完成' ]; - return view($this->bladePath . ".index", compact("status", "data", "project_id", "month", "project", "hushizhang", "order_status_list")); + return view($this->bladePath . ".index", compact("status", "data", "project_id", "month", "project", "hushizhang", "yuanfang", "order_status_list")); } public function _getMonths() diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php index 750e481..1df3a01 100755 --- a/resources/views/admin/orders/index.blade.php +++ b/resources/views/admin/orders/index.blade.php @@ -80,7 +80,7 @@ {!! $row->status == \App\Models\Orders::STATUS_FINISHED ? $row->to_date : " {$row->to_date}" !!} {!! $row->getStatusLabelAttribute() !!} {!! $row->status == \App\Models\Orders::STATUS_FINISHED ? "" : "" !!} {{ $row->total }} - @if (!$hushizhang) + @if (!$hushizhang || !$yuanfang)