diff --git a/app/Http/Controllers/Admin/AsksubmitController.php b/app/Http/Controllers/Admin/AsksubmitController.php deleted file mode 100755 index dacfdda..0000000 --- a/app/Http/Controllers/Admin/AsksubmitController.php +++ /dev/null @@ -1,79 +0,0 @@ -id(); - // 判断是否护士长 - $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(); - - $data = AskSubmit::with("admin", "project") - ->where(function ($qeury) use ($hushizhang, $userId) { - if ($hushizhang) { - $qeury->where('admin_id', $userId); - } - })->paginate(10); - return view($this->bladePath . ".index", compact("data")); - } - - - public function edit($id = null, Request $request, FormBuilder $formBuilder) - { - $vo = (new Project())->with("paramedicLevels")->find($id ?: $request->id); - - $form = $formBuilder->create($this->formClass, [ - "method" => "POST", - "id" => "fm", - "url" => url($this->urlPrefix . "/update/" . $vo->id), - "class" => "form form-horizontal validate-form", - "model" => $vo - ]); - $form->add("_previous", "hidden", ["value" => (url()->previous())]); - - return view($this->bladePath . ".create", compact("form")); - } - - public function updated($model) - { - event(new ProjectSaved($model)); - } - - -} diff --git a/app/Http/Controllers/Admin/ProjectController.php b/app/Http/Controllers/Admin/ProjectController.php index 1ada7cc..0574956 100755 --- a/app/Http/Controllers/Admin/ProjectController.php +++ b/app/Http/Controllers/Admin/ProjectController.php @@ -280,4 +280,31 @@ class ProjectController extends CommonController return Excel::download(new CommonExport($data), "beds.xlsx"); } + + /** + * 满意度调查 + */ + public function askSubmit() + { + $userId = auth()->id(); + // 判断是否护士长 + $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(); + + $data = AskSubmit::with("admin", "project") + ->where(function ($qeury) use ($hushizhang, $userId) { + if ($hushizhang) { + $qeury->where('admin_id', $userId); + } + })->paginate(10); + return view($this->bladePath . ".ask_submit", compact("data")); + } + + public function askSubmitCreate(){ + return view($this->bladePath . ".ask_submit_create", compact("data")); + } + + } diff --git a/resources/views/admin/asksubmit/create.blade.php b/resources/views/admin/project/asksubmit_create.blade.php similarity index 100% rename from resources/views/admin/asksubmit/create.blade.php rename to resources/views/admin/project/asksubmit_create.blade.php diff --git a/resources/views/admin/asksubmit/index.blade.php b/resources/views/admin/project/asksubmit_index.blade.php similarity index 98% rename from resources/views/admin/asksubmit/index.blade.php rename to resources/views/admin/project/asksubmit_index.blade.php index ad35f4f..3700182 100755 --- a/resources/views/admin/asksubmit/index.blade.php +++ b/resources/views/admin/project/asksubmit_index.blade.php @@ -7,7 +7,7 @@