From 389be546bcc37590bbf22ce1222d369caed64b04 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Wed, 3 Jul 2024 11:41:52 +0800 Subject: [PATCH] update --- .../Controllers/Admin/ProjectController.php | 109 +++++++--- .../admin/project/asksubmit_create.blade.php | 195 ++---------------- .../project/asksubmit_create_v2.blade.php | 186 +++++++++++++++++ routes/web.php | 8 +- 4 files changed, 289 insertions(+), 209 deletions(-) create mode 100755 resources/views/admin/project/asksubmit_create_v2.blade.php diff --git a/app/Http/Controllers/Admin/ProjectController.php b/app/Http/Controllers/Admin/ProjectController.php index 81a5b37..59906c8 100755 --- a/app/Http/Controllers/Admin/ProjectController.php +++ b/app/Http/Controllers/Admin/ProjectController.php @@ -301,7 +301,7 @@ class ProjectController extends CommonController $is_export = \request('export', 0); $userId = auth()->id(); $projects = (new ProjectController())->_checkProjects(); - $project_id = \request('project_id', ($projects[0]->id) ?? ''); + $project_id = \request('project_id', ($projects[0]->id)??''); // 判断是否护士长 @@ -323,11 +323,10 @@ class ProjectController extends CommonController $sheet = $spreadsheet->getActiveSheet(); $sheet->setCellValue('A1', '日期'); $sheet->setCellValue('B1', '名字'); - $sheet->setCellValue('C1', '电话'); - $sheet->setCellValue('D1', '医院'); - $sheet->setCellValue('E1', '详情'); - $sheet->setCellValue('F1', '建议'); - $sheet->setCellValue('G1', '总分'); + $sheet->setCellValue('C1', '医院'); + $sheet->setCellValue('D1', '详情'); + $sheet->setCellValue('E1', '建议'); + $sheet->setCellValue('F1', '总分'); $sheet->getColumnDimension('A')->setWidth(20); $sheet->getColumnDimension('B')->setWidth(20); @@ -335,8 +334,6 @@ class ProjectController extends CommonController $sheet->getColumnDimension('D')->setWidth(60); $sheet->getColumnDimension('E')->setWidth(20); $sheet->getColumnDimension('F')->setWidth(20); - $sheet->getColumnDimension('G')->setWidth(20); - $count = count($data); //计算有多少条数据1 for ($i = 2; $i <= $count + 1; $i++) { @@ -345,8 +342,7 @@ class ProjectController extends CommonController $content .= $item['ask'] . ':' . $item['score'] . "\n"; } $sheet->setCellValue('A' . $i, $data[$i - 2]['date']); - $sheet->setCellValue('B' . $i, $data[$i - 2]['name']); - $sheet->setCellValue('B' . $i, $data[$i - 2]['mobile']); + $sheet->setCellValue('B' . $i, $data[$i - 2]['admin']['name']); $sheet->setCellValue('C' . $i, $data[$i - 2]['project']['name']); $sheet->setCellValue('D' . $i, $content); $sheet->setCellValue('E' . $i, $data[$i - 2]['tip']); @@ -360,14 +356,19 @@ class ProjectController extends CommonController exit; } $data = $data->orderBy('id', 'desc')->paginate(10); - $data = $data->appends(['project_id' => $project_id]); + $data = $data->appends(['project_id'=>$project_id]); return view($this->bladePath . ".asksubmit_index", compact("data", "projects", "project_id")); } public function askSubmitCreate(FormBuilder $formBuilder) { + $project_ids = auth()->user()->project_ids; $project_id = \request('project_id'); + if ($project_ids) { + $project_ids = explode(',', $project_ids); + } + if ($project_id == 7) { $askSubmitForm = AskSubmitScForm::class; } else { @@ -377,15 +378,19 @@ class ProjectController extends CommonController $form = $formBuilder->create($askSubmitForm, [ "method" => "POST", "id" => "fm", - "url" => url($this->urlPrefix . "/asksubmit_store?project_id=" . $project_id) + "url" => url($this->urlPrefix . "/asksubmit_store?project_id=".$project_id) ]); - $choices = (new Project())->get()->pluck("name", "id"); + $choices = (new Project())->where(function ($query) use ($project_ids) { + if ($project_ids) { + $query->whereIn("id", $project_ids); + } + })->get()->pluck("name", "id"); $form->modify("project_id", "select", [ "choices" => $choices->toArray(), "selected" => $choices->keys()->first() ]); - $form->modify('project_id', Field::HIDDEN, ["default_value" => $project_id]); + $form->modify('project_id',Field::HIDDEN,["default_value" => $project_id]); $form->modify('date', Field::DATE, ['default_value' => date('Y-m-d')]); return view($this->bladePath . ".asksubmit_create", compact("form")); } @@ -393,20 +398,19 @@ class ProjectController extends CommonController public function askSubmitStore(Request $request) { $all = \request()->all(); - if (!isset($all['mobile']) || empty($all['mobile'])) { - return $this->error("手机号不存在", ''); - } $project_id = \request('project_id'); + + $userId = auth()->user()->id; // 一个月只能提交一次 - $has = AskSubmit::where('project_id', $all['project_id']) - ->where('mobile', $all['mobile']) + $has = AskSubmit::where('admin_id', $userId) + ->where('project_id', $all['project_id']) ->where('date', 'like', '%' . date('Y-m') . '%') ->first(); if ($has) return $this->error("每个月只能提交一次"); $content = []; $socre = 0; $askList = AskSubmit::$askList; - if ($project_id == 7) { + if($project_id == 7){ $askList = AskSubmit::$askListSc; } foreach ($all['ask'] as $key => $item) { @@ -416,12 +420,12 @@ class ProjectController extends CommonController ]; $socre += $item; } -// $all['admin_id'] = $userId; + $all['admin_id'] = $userId; $all['score'] = $socre; $all['content'] = $content; $model = AskSubmit::create($all); $url = "/admin/project/asksubmit"; - return $this->success("新增成功", '', $model); + return $this->success("新增成功", $url, $model); } public function askSubmitEdit(Request $request, FormBuilder $formBuilder) @@ -452,7 +456,7 @@ class ProjectController extends CommonController } })->get()->pluck("name", "id")->toArray() ]); - $form->modify('project_id', Field::HIDDEN, ["default_value" => $vo->project_id]); + $form->modify('project_id',Field::HIDDEN,["default_value" => $vo->project_id]); $form->add("_previous", "hidden", ["value" => (url()->previous())]); return view($this->bladePath . ".asksubmit_create", compact("form")); } @@ -499,4 +503,63 @@ class ProjectController extends CommonController } } + public function askSubmitCreateV2(FormBuilder $formBuilder) + { + $project_id = \request('project_id'); + if ($project_id == 7) { + $askSubmitForm = AskSubmitScForm::class; + } else { + $askSubmitForm = AskSubmitForm::class; + } + + $form = $formBuilder->create($askSubmitForm, [ + "method" => "POST", + "id" => "fm", + "url" => url($this->urlPrefix . "/asksubmit_store?project_id=" . $project_id) + ]); + $choices = (new Project())->get()->pluck("name", "id"); + + $form->modify("project_id", "select", [ + "choices" => $choices->toArray(), + "selected" => $choices->keys()->first() + ]); + $form->modify('project_id', Field::HIDDEN, ["default_value" => $project_id]); + $form->modify('date', Field::DATE, ['default_value' => date('Y-m-d')]); + return view($this->bladePath . ".asksubmit_create", compact("form")); + } + + public function askSubmitStoreV2(Request $request) + { + $all = \request()->all(); + if (!isset($all['mobile']) || empty($all['mobile'])) { + return $this->error("手机号不存在", ''); + } + $project_id = \request('project_id'); + // 一个月只能提交一次 + $has = AskSubmit::where('project_id', $all['project_id']) + ->where('mobile', $all['mobile']) + ->where('date', 'like', '%' . date('Y-m') . '%') + ->first(); + if ($has) return $this->error("每个月只能提交一次"); + $content = []; + $socre = 0; + $askList = AskSubmit::$askList; + if ($project_id == 7) { + $askList = AskSubmit::$askListSc; + } + foreach ($all['ask'] as $key => $item) { + $content[] = [ + 'ask' => $askList[$key], + 'score' => $item + ]; + $socre += $item; + } +// $all['admin_id'] = $userId; + $all['score'] = $socre; + $all['content'] = $content; + $model = AskSubmit::create($all); + $url = "/admin/project/asksubmit"; + return $this->success("新增成功", '', $model); + } + } diff --git a/resources/views/admin/project/asksubmit_create.blade.php b/resources/views/admin/project/asksubmit_create.blade.php index 7d0bc91..cd44e92 100755 --- a/resources/views/admin/project/asksubmit_create.blade.php +++ b/resources/views/admin/project/asksubmit_create.blade.php @@ -1,186 +1,17 @@ - - - - - - {{ env("APP_NAME")}} - - - - - - - - - - - - - - - - - - - - - - @stack("header") - - - - - - - - -
-
-
-
-
-
-
-
-
- - -
- - - - - - - -
-
- - - - -
- - -
-
-
-
- -
-

陪护工作满意度调查表

-
-
+@extends("admin.layouts.layout") + +@php + $pageTitle = "陪护工作满意度调查表"; +@endphp + +@section("content") +
+
+
+
+ @include("public._form")
- - - -
-
-
-
- @include("public._form") -
-
-
-
-
- - - -
-
-
-
- {{ date("Y") }} © {{ env("COPYRIGHT") }} -
-
-
- {{ isset($laravel_duration) ? $laravel_duration : "" }} -
-
-
-
-
- -
- - - - - - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - -@stack("footer") - - - - +@endsection diff --git a/resources/views/admin/project/asksubmit_create_v2.blade.php b/resources/views/admin/project/asksubmit_create_v2.blade.php new file mode 100755 index 0000000..7d0bc91 --- /dev/null +++ b/resources/views/admin/project/asksubmit_create_v2.blade.php @@ -0,0 +1,186 @@ + + + + + + {{ env("APP_NAME")}} + + + + + + + + + + + + + + + + + + + + + + @stack("header") + + + + + + + + +
+
+
+
+
+
+
+
+
+ + +
+ + + + + + + +
+
+ + + + +
+ + +
+
+
+
+ +
+

陪护工作满意度调查表

+
+
+
+ + + +
+
+
+
+ @include("public._form") +
+
+
+
+
+ +
+ + + +
+
+
+
+ {{ date("Y") }} © {{ env("COPYRIGHT") }} +
+
+
+ {{ isset($laravel_duration) ? $laravel_duration : "" }} +
+
+
+
+
+ + +
+ + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +@stack("footer") + + + + diff --git a/routes/web.php b/routes/web.php index 93ca96a..88a34f9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -33,8 +33,8 @@ Route::group(["namespace" => "Admin", "prefix" => "admin"], function () { Route::post('upload', 'CommonController@upload'); }); // 所有人都可以提交 - Route::get("project/asksubmit_create", 'ProjectController@askSubmitCreate'); - Route::post("project/asksubmit_store", 'ProjectController@askSubmitStore'); + Route::get("project/asksubmit_create_v2", 'ProjectController@askSubmitCreateV2'); + Route::post("project/asksubmit_store_v2", 'ProjectController@askSubmitStoreV2'); Route::group(['middleware' => ['authorize:admin', 'rbac:admin']], function () { \App\Models\CommonModel::generateCurdRouter("PermissionController", "permission"); @@ -51,8 +51,8 @@ Route::group(["namespace" => "Admin", "prefix" => "admin"], function () { // 满意度调查 Route::get("project/asksubmit", 'ProjectController@askSubmit'); - // Route::get("project/asksubmit_create", 'ProjectController@askSubmitCreate'); - // Route::post("project/asksubmit_store", 'ProjectController@askSubmitStore'); + Route::get("project/asksubmit_create", 'ProjectController@askSubmitCreate'); + Route::post("project/asksubmit_store", 'ProjectController@askSubmitStore'); Route::post("project/asksubmit_update/{id}", 'ProjectController@askSubmitUpdate'); Route::get("project/asksubmit_edit", 'ProjectController@askSubmitEdit');