1

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"));
     }
 
 

resources/views/admin/project/asksubmit_index.blade.php

@@ -6,9 +6,18 @@
             <div class="card">
                 <div class="card-body">
                     <div class="mb-3">
-                        <a class="btn btn-primary" href="{{url($urlPrefix.'/asksubmit_create')}}">
-                            @lang("icons.action_create") @lang('actions.create')新建满意度调查
-                        </a>
+                        <form class="form-inline" id="search-form" autocomplete="off">
+                            <a class="btn btn-primary" href="{{url($urlPrefix.'/asksubmit_create')}}">
+                                @lang("icons.action_create") @lang('actions.create')新建满意度调查
+                            </a>&nbsp;&nbsp;&nbsp;
+                            <select class="form-control mr-1" name="project_id"
+                                    onchange="$(this).closest('form').submit()">
+                                @foreach($projects as $pp)
+                                    <option
+                                        value="{{$pp->id}}" @if($pp->id == $project_id) {{ "selected" }}@endif>{{$pp->name}}</option>
+                                @endforeach
+                            </select>
+                        </form>
                     </div>
 
                     <table class="table table-bordered" id="data-table">