From d47a1a73c6b8e7aa421b2973cf7f24b0d64fb01b Mon Sep 17 00:00:00 2001
From: liyinglin <liyl@langye.net>
Date: Thu, 4 Jan 2024 10:01:13 +0800
Subject: [PATCH] 1

---
 app/Http/Controllers/Admin/ProjectController.php | 10 ++++++++--
 resources/views/admin/project/index.blade.php    |  9 +++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/ProjectController.php b/app/Http/Controllers/Admin/ProjectController.php
index d029601..fbe02b3 100755
--- a/app/Http/Controllers/Admin/ProjectController.php
+++ b/app/Http/Controllers/Admin/ProjectController.php
@@ -300,6 +300,8 @@ class ProjectController extends CommonController
     public function askSubmit()
     {
         $userId = auth()->id();
+        $project_id = \request('project_id');
+
         // 判断是否护士长
         $roleId = Role::where('name', 'like', '%护士长%')->where('guard_name', 'admin')->value('id');
         $hushizhang = DB::table('model_has_roles')->where('role_id', $roleId)
@@ -307,11 +309,15 @@ class ProjectController extends CommonController
             ->where('model_id', $userId)->count();
 
         $data = AskSubmit::with("admin", "project")
-            ->where(function ($qeury) use ($hushizhang, $userId) {
+            ->where(function ($qeury) use ($hushizhang, $userId, $project_id) {
                 if ($hushizhang) $qeury->where('admin_id', $userId);
+                if ($project_id) $qeury->where('project_id', $project_id);
             })->paginate(10);
 
-        return view($this->bladePath . ".asksubmit_index", compact("data"));
+        $projects = (new StatisticsController())->_checkProjects();
+
+
+        return view($this->bladePath . ".asksubmit_index", compact("data", "projects"));
     }
 
 
diff --git a/resources/views/admin/project/index.blade.php b/resources/views/admin/project/index.blade.php
index d901e54..33a73ba 100755
--- a/resources/views/admin/project/index.blade.php
+++ b/resources/views/admin/project/index.blade.php
@@ -6,6 +6,15 @@
             <div class="card">
                 <div class="card-body">
                     <div class="mb-3">
+                        <form class="form-inline" id="search-form" autocomplete="off">
+                            <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>
                         <a class="btn btn-primary" href="{{url($urlPrefix.'/create')}}">
                             @lang("icons.action_create") @lang('actions.create'){{$modelName}}
                         </a>