diff --git a/.DS_Store b/.DS_Store index e2604b9..1cbbca6 100644 Binary files a/.DS_Store and b/.DS_Store differ 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 5e1a8f6..1b44a80 100644 Binary files a/public/.DS_Store and b/public/.DS_Store differ diff --git a/public/dashboard/.DS_Store b/public/dashboard/.DS_Store new file mode 100644 index 0000000..0f4ff04 Binary files /dev/null and b/public/dashboard/.DS_Store differ diff --git a/public/hyper/.DS_Store b/public/hyper/.DS_Store index 1cc6564..9dcb7f0 100644 Binary files a/public/hyper/.DS_Store and b/public/hyper/.DS_Store differ 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 @@