diff --git a/app/Http/Controllers/Admin/ProjectController.php b/app/Http/Controllers/Admin/ProjectController.php index f8ab2ae..0e46e27 100755 --- a/app/Http/Controllers/Admin/ProjectController.php +++ b/app/Http/Controllers/Admin/ProjectController.php @@ -35,6 +35,13 @@ class ProjectController extends CommonController public $modelClass = Project::class; public $formClass = ProjectForm::class; + public function _checkProjects() + { + $projects = (new Project())->adminProject()->orderBy("id", "desc")->get(); + view()->share(compact("projects")); + return $projects; + } + public function index(Request $request) { $data = $this->model->with("paramedicLevels")->paginate(10); @@ -288,7 +295,8 @@ class ProjectController extends CommonController public function askSubmit() { $userId = auth()->id(); - $project_id = \request('project_id',0); + $project_id = \request('project_id', 0); + $projects = (new ProjectController())->_checkProjects(); // 判断是否护士长 $roleId = Role::where('name', 'like', '%护士长%')->where('guard_name', 'admin')->value('id'); @@ -299,11 +307,10 @@ class ProjectController extends CommonController $data = AskSubmit::with("admin", "project") ->where(function ($qeury) use ($hushizhang, $userId, $project_id) { if ($hushizhang) $qeury->where('admin_id', $userId); - // if ($project_id) $qeury->where('project_id', $project_id); + if ($project_id) $qeury->where('project_id', $project_id); })->paginate(10); - // $projects = (new StatisticsController())->_checkProjects(); - return view($this->bladePath . ".asksubmit_index", compact("data","project_id")); + return view($this->bladePath . ".asksubmit_index", compact("data", "projects", "project_id")); } diff --git a/resources/views/admin/project/asksubmit_index.blade.php b/resources/views/admin/project/asksubmit_index.blade.php index 6f90b07..4c79349 100755 --- a/resources/views/admin/project/asksubmit_index.blade.php +++ b/resources/views/admin/project/asksubmit_index.blade.php @@ -6,9 +6,18 @@
- - @lang("icons.action_create") @lang('actions.create')新建满意度调查 - +
+ + @lang("icons.action_create") @lang('actions.create')新建满意度调查 +     + +