From ae114f3c871bf1f140dd937e2e0ac8f6412e0148 Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Wed, 6 Apr 2022 16:42:11 +0800
Subject: [PATCH] up

---
 .DS_Store                                     | Bin 12292 -> 12292 bytes
 .../Controllers/Admin/ParamedicController.php |  21 +++++++++++++-----
 public/.DS_Store                              | Bin 10244 -> 10244 bytes
 public/dashboard/.DS_Store                    | Bin 0 -> 6148 bytes
 public/hyper/.DS_Store                        | Bin 10244 -> 10244 bytes
 .../views/admin/paramedic/index.blade.php     |  11 ++++++---
 6 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 public/dashboard/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index e2604b90a970f7a1fbb66ab09798ccb8bb602d58..1cbbca6283ca53dd9d718caf98bb8f1a9d72e262 100644
GIT binary patch
delta 14
VcmZokXi3;$E5OLO*-qe?JOCzI1g-!8

delta 16
XcmZokXi3;$D==9_Kyb64z&3dRGa3bi

diff --git a/app/Http/Controllers/Admin/ParamedicController.php b/app/Http/Controllers/Admin/ParamedicController.php
index 9c61ce8..24011f1 100755
--- a/app/Http/Controllers/Admin/ParamedicController.php
+++ b/app/Http/Controllers/Admin/ParamedicController.php
@@ -30,12 +30,20 @@ class ParamedicController extends CommonController
 
     public function index(Request $request)
     {
-        $data = $this->model->with("project")->paginate(10);
+        $data = $this->model->with("project");
+        if (request()->keyword) {
+            $data->where(function ($query) {
+                $query->where("name", "like", "%" . request()->keyword . "%")
+                    ->orWhere("id_card_number", "like", "%" . request()->keyword . "%");
+            });
+        }
+        $data = $data->paginate(10);
         return view($this->bladePath . ".index", compact("data"));
     }
 
-    public function getLevels(Request $request) {
-        $levels = (new ParamedicLevel())->where("project_id",$request->project_id)->get();
+    public function getLevels(Request $request)
+    {
+        $levels = (new ParamedicLevel())->where("project_id", $request->project_id)->get();
         return $this->ajaxResponse($levels);
     }
 
@@ -50,7 +58,7 @@ class ParamedicController extends CommonController
             "class" => "form form-horizontal validate-form",
             "model" => $vo
         ]);
-        $form->modify("paramedic_level_id", "select", ["label" => "护工等级","value"=>$vo->paramedic_level_id,"choices"=>(new ParamedicLevel())->where("project_id",$vo->project_id)->get()->pluck("name","id")->toArray()]);
+        $form->modify("paramedic_level_id", "select", ["label" => "护工等级", "value" => $vo->paramedic_level_id, "choices" => (new ParamedicLevel())->where("project_id", $vo->project_id)->get()->pluck("name", "id")->toArray()]);
         $form->add("_previous", "hidden", ["value" => (url()->previous())]);
 
         return view($this->bladePath . ".create", compact("form"));
@@ -89,7 +97,8 @@ class ParamedicController extends CommonController
         }
     }
 
-    public function export() {
-        return Excel::download(new ParamedicExport(),"paramedics.xlsx");
+    public function export()
+    {
+        return Excel::download(new ParamedicExport(), "paramedics.xlsx");
     }
 }
diff --git a/public/.DS_Store b/public/.DS_Store
index 5e1a8f6bca78ce8b7cd625e6eb44aba102156ac0..1b44a80076570629e418524db9e19db49e258367 100644
GIT binary patch
delta 118
zcmZn(XbG6$&nU4mU^hRb#AF@;O=(Vs6oy2GVulQcB!+w-tB4^bEu}a)DL+4Fv!Q@I
tyC@q&CPOYzBAp?Xp%^aZBi_uhnO)%*%VaMhh0RQ&eoWXEPWBOR002(}AYlLi

delta 45
zcmZn(XbG6$&nUJrU^hRb*km37&CMYK((Ic%#OpaGHdt(CSNO%USwYmFX>y177643!
B4yynF

diff --git a/public/dashboard/.DS_Store b/public/dashboard/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..0f4ff044af9fbf0ad3217372ec1ff5de4a9ec633
GIT binary patch
literal 6148
zcmeH~F>b>!3`IW^4*{}x?5HIN$PI)bIYBQ_G)94<K{5p0b@YBxT<UZVjN%g@pGcXo
z{RhhgV2AH%4~zgdbSHKmW@gL>-0_7^TtBA!`Tcggc#*d1fT#2kv;Eu_q<|EV0#ZN<
zNPz_@kjMCDyP#*%qeuZMunYzK`%vi4nrxl%>0pQvfE-v3<2q&uvUq{4$=1mV&2oCM
zY_%9eydLdj$?Iyeb@p~x4j-0xHlJc>*4tr)3C(IiK?+ELnF8yckAD82=zq=svlgXN
zKnnab1#CFJ9uIt}JX;@L&+Bhl^>w3@aXG`Up8zI)6u;2JxL<rh)@18sg{B{YkU>ET
HJXL`oqlyx)

literal 0
HcmV?d00001

diff --git a/public/hyper/.DS_Store b/public/hyper/.DS_Store
index 1cc656424f3f105d78fe1e0c08b5c262e2370ac8..9dcb7f0f6062662151be49ce6254a2a4ebf4a035 100644
GIT binary patch
delta 14
VcmZn(XbIRLD#*yVSxoSq7yu(A1YZCE

delta 14
VcmZn(XbIRLD#*yNSxoSq7yu(41YQ6D

diff --git a/resources/views/admin/paramedic/index.blade.php b/resources/views/admin/paramedic/index.blade.php
index 19cbca4..92c6794 100755
--- a/resources/views/admin/paramedic/index.blade.php
+++ b/resources/views/admin/paramedic/index.blade.php
@@ -6,9 +6,14 @@
             <div class="card">
                 <div class="card-body">
                     <div class="mb-3">
-                        <a class="btn btn-primary" href="{{url($urlPrefix.'/create')}}">
-                            @lang("icons.action_create") @lang('actions.create'){{$modelName}}
-                        </a>
+
+                        <form class="form-inline" id="search-form" autocomplete="off">
+                            <a class="btn btn-primary mr-1" href="{{url($urlPrefix.'/create')}}">
+                                @lang("icons.action_create") @lang('actions.create'){{$modelName}}
+                            </a>
+                            <input class="form-control" type="text" name="keyword" value="{{ request()->keyword }}"
+                                   placeholder="姓名/身份证">
+                        </form>
                     </div>
 
                     <table class="table table-bordered" id="data-table">