diff --git a/app/Http/Controllers/Admin/ProductController.php b/app/Http/Controllers/Admin/ProductController.php index 742ef90..f93bb63 100755 --- a/app/Http/Controllers/Admin/ProductController.php +++ b/app/Http/Controllers/Admin/ProductController.php @@ -10,6 +10,7 @@ namespace App\Http\Controllers\Admin; use App\Events\ProductSaved; use App\Forms\ProductForm; +use App\Models\Factor; use App\Models\ParamedicLevel; use App\Models\Product; use App\Models\ProductParamedicLevel; @@ -90,7 +91,9 @@ class ProductController extends CommonController "model" => $vo ]); $form->add("_previous", "hidden", ["value" => (url()->previous())]); - + $this->add("factor_item_ids", 'select', ["label" => "统计价格因素", "attr" => ["multiple" => true, "data-plugin" => "select2"], + "choices" => (new Factor())->where('product_id', $request->id)->get()->pluck("name", "id")->toArray() + ]); return view($this->bladePath . ".create", compact("form", "project", "vo")); } diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php index 61e7282..adc0834 100755 --- a/app/Http/Controllers/Admin/StatisticsController.php +++ b/app/Http/Controllers/Admin/StatisticsController.php @@ -12,6 +12,7 @@ use App\Customer; use App\Libs\AlipayF2F; use App\Libs\WxMicroPay; use App\Models\AdminAreaLink; +use App\Models\Area; use App\Models\Balance; use App\Models\Bed; use App\Models\Factor; @@ -96,7 +97,7 @@ class StatisticsController extends CommonController ->whereHas("order", function ($query) use ($project_id) { $query->where("project_id", $project_id); }) - ->with(["order", "product", "productItem", "productParamedicLevel", "paramedic" => function($query) { + ->with(["order", "product", "productItem", "productParamedicLevel", "paramedic" => function ($query) { $query->withoutGlobalScope(AdminProjectScope::class); }, "bed", "room", "building", "area"]) ->orderBy("id"); @@ -376,4 +377,34 @@ class StatisticsController extends CommonController $res = (new AlipayF2F())->manualQuery($recharge); dd($res); } + + public function huli(Request $request) + { + $projects = (new StatisticsController())->_checkProjects(); + $defaultProjectsId = ($projects[0]->id) ?? ''; + $project_id = $request->get('project_id', $defaultProjectsId); + + $userId = auth()->id(); + // 判断是否护士长 + $roleId = Role::where('name', 'like', '%护士长%')->where('guard_name', 'admin')->value('id'); + $hushizhang = DB::table('model_has_roles')->where('role_id', $roleId) + ->where('model_type', 'App\Admin') + ->where('model_id', $userId)->count(); + $areaId = []; + if ($hushizhang) { + $user = auth()->user(); + $areaId = AdminAreaLink::where(function ($qeury) use ($project_id) { + if ($project_id) { + $qeury->where('project_id', $project_id); + } + })->where('admin_id', $user->id)->pluck('area_id'); + } + $data = Area::where(function ($query) use ($areaId) { + if ($areaId) { + $query->whereIn('id', $areaId); + } + })->get(); + return view($this->bladePath . ".huli", compact("data")); + } + } diff --git a/app/Models/Product.php b/app/Models/Product.php index 37b64ae..827e5dc 100755 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -9,6 +9,8 @@ class Product extends SoftDeletesModel { protected $table = "product"; + protected $casts = ['factor_item_ids' => 'json']; + protected static function booted() { static::addGlobalScope(new AdminProjectScope()); diff --git a/resources/views/admin/statistics/huli.blade.php b/resources/views/admin/statistics/huli.blade.php new file mode 100644 index 0000000..6f90b07 --- /dev/null +++ b/resources/views/admin/statistics/huli.blade.php @@ -0,0 +1,69 @@ +@extends("admin.layouts.layout") + +@section("content") +
+
+
+
+ + + + + + + + + + + + + + + + @foreach ($data as $row) + + + + + + + + + + @endforeach + +
+ 日期 + 名字医院详情建议总分操作
+ {{ $row->date }} + + {{ $row->admin->name }} + {{ $row->project->name }} + @foreach ($row->content as $item) + {{ $item['ask'] }}:{{ $item['score'] }}
+ @endforeach +
{{ $row->tip }}{{ $row->score }} + @lang("icons.action_edit") @lang("actions.edit") + @lang("icons.action_delete") @lang("actions.delete") +
+ @include("public._pages") +
+ +
+
+
+ + @include("public._delete") +@endsection + +@push("footer") + +@endpush diff --git a/routes/web.php b/routes/web.php index 65b9962..53bd579 100644 --- a/routes/web.php +++ b/routes/web.php @@ -94,7 +94,7 @@ Route::group(["namespace" => "Admin", "prefix" => "admin"], function () { Route::get("orders/artboard", 'OrdersController@artboard'); - + Route::get("statistics/huli", 'StatisticsController@huli'); Route::get("statistics/overview", 'StatisticsController@overview'); Route::get("statistics/salary", 'StatisticsController@salary'); Route::get("statistics/finance", 'StatisticsController@finance');