From 795a185ecd9fa848e2e2b6047ec7b8f0a21f186b Mon Sep 17 00:00:00 2001 From: weizong song Date: Sat, 3 Apr 2021 22:06:44 +0800 Subject: [PATCH] up --- app/Forms/ProjectForm.php | 2 + .../Controllers/Manager/OrdersController.php | 28 +++--- ...21_04_03_212001_update_project_add_gps.php | 31 +++++++ .../views/admin/project/create.blade.php | 90 ++++++++++++++++++- 4 files changed, 133 insertions(+), 18 deletions(-) create mode 100644 database/migrations/2021_04_03_212001_update_project_add_gps.php diff --git a/app/Forms/ProjectForm.php b/app/Forms/ProjectForm.php index eff6c3a..84de7c2 100755 --- a/app/Forms/ProjectForm.php +++ b/app/Forms/ProjectForm.php @@ -9,6 +9,8 @@ class ProjectForm extends Form { public function buildForm() { + $this->add("latitude", Field::HIDDEN); + $this->add("longitude", Field::HIDDEN); $this->add("name", Field::TEXT, ["label" => "名称", "rules" => "required"]); $this->add("address", Field::TEXT, ["label" => "地址", "rules" => "required"]); $this->add("logo", Field::TEXT, ["label" => "logo", "attr" => ["data-plugin" => "uploader"]]); diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index bc921b4..e037c51 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -10,6 +10,7 @@ use App\Models\ApprovalItems; use App\Models\Balance; use App\Models\Building; use App\Models\FactorItems; +use App\Models\ManagerProject; use App\Models\OrderItems; use App\Models\Orders; use App\Models\Paramedic; @@ -35,31 +36,24 @@ class OrdersController extends CommonController /** * @OA\Get( * path="/manager/get-projects", - * summary="获取项目/医院列表", - * description="获取项目/医院列表", + * summary="V2 获取医院列表", + * description="获取医院列表", * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), * @OA\Response( * response="200", - * description="获取项目/医院列表" + * description="获取医院列表" * ) * ) */ public function getProjects() { - $projects = $this->manager->projects()->with(["paramedicLevels", "defaultProduct" => function ($query) { - $query->with([ - "defaultItem", - "productItems", - "project", - "productParamedicLevels" => function ($query) { - $query->with("paramedicLevel"); - }, - "factors" => function ($query) { - $query->with("factorItems"); - } - ]); - }])->get(); + $projects = (new Project()) + ->join("manager_project", 'project.id', '=', 'manager_project.project_id') + ->join('managers', 'managers.id', '=', 'manager_project.manager_id') + ->whereRaw("managers.id = " . $this->manager->id) + ->select("project.id", "project.name", "project.address", "project.latitude", "project.longitude") + ->get(); return response()->json($projects->toArray()); } @@ -230,7 +224,7 @@ class OrdersController extends CommonController $order = (new Orders())->with([ "orderItems" => function ($query) { $query->with([ - "bed" => function($query) { + "bed" => function ($query) { $query->with(["room", "building"]); }, "room", diff --git a/database/migrations/2021_04_03_212001_update_project_add_gps.php b/database/migrations/2021_04_03_212001_update_project_add_gps.php new file mode 100644 index 0000000..5d0fd3d --- /dev/null +++ b/database/migrations/2021_04_03_212001_update_project_add_gps.php @@ -0,0 +1,31 @@ +string("latitude")->nullable(); + $table->string("longitude")->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/resources/views/admin/project/create.blade.php b/resources/views/admin/project/create.blade.php index 8f818e6..84f905c 100755 --- a/resources/views/admin/project/create.blade.php +++ b/resources/views/admin/project/create.blade.php @@ -9,7 +9,19 @@
- @include("public._form") + {!! form_start($form) !!} + @foreach($form->getFields() as $field) + {!! form_row($form->{$field->getName()},isset($vo[$field->getName()]) ? ["value"=>$vo[$field->getName()],"selected"=>$vo[$field->getName()]] : []) !!} + @if($field->getName()=="address") +
+ +
+
+ @endif + @endforeach + {!!form_end($form)!!}
@@ -17,10 +29,86 @@ @endsection @push("footer") + @endpush