ChenWuJie 4 년 전
부모
커밋
a33b03b87c
6개의 변경된 파일26개의 추가작업 그리고 4개의 파일을 삭제
  1. 5 1
      app/Admin/Controllers/UserListController.php
  2. 2 0
      app/Admin/routes.php
  3. 7 2
      app/Models/Docter.php
  4. 3 0
      app/Models/Team.php
  5. 6 1
      app/Models/TeamDocter.php
  6. 3 0
      app/Models/User.php

+ 5 - 1
app/Admin/Controllers/UserListController.php

xqd xqd xqd
@@ -5,7 +5,9 @@ namespace App\Admin\Controllers;
 use App\Admin\Actions\backstage\User\archives;
 use App\Admin\Actions\backstage\User\BalanceLog;
 use App\Admin\Actions\backstage\User\BlackList;
+use App\Admin\Actions\backstage\User\coupons;
 use App\Admin\Actions\backstage\User\service;
+use App\Models\Patient;
 use App\Models\User;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
@@ -40,12 +42,13 @@ class UserListController extends AdminController
             $actions->add(new service());
             $actions->add(new BalanceLog());
             $actions->add(new BlackList());
+            $actions->add(new coupons());
         });
         //筛选
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
             $filter->equal('phone','手机')->mobile()->placeholder("请输入手机");
-            $filter->equal('phone','订单号')->placeholder("请输入订单号");
+            $filter->like('patient.name','患者姓名')->placeholder("请输入患者姓名");
             $filter->like('nickname','昵称');
             $filter->equal('status','用户状态')->radio([
                 ''   => '不限',
@@ -72,6 +75,7 @@ class UserListController extends AdminController
             $grid->column('last_login_time', __('最后登录时间'))->display(function ($time){
                 return date("Y-m-d H:i",$time);
             });
+            $grid->column('patient', __('患者姓名'))->pluck('name')->map('ucwords')->implode(',');
         return $grid;
     }
 

+ 2 - 0
app/Admin/routes.php

xqd
@@ -32,5 +32,7 @@ Route::group([
     $router->resource('user_orders', UserServiceController::class);
     $router->resource('user_balance_logs', UserBalanceLogController::class);
 
+    //用户管理->优惠券管理
+    $router->resource('user_coupons', UserCouponsController::class);
 });
 

+ 7 - 2
app/Models/Docter.php

xqd xqd
@@ -25,9 +25,9 @@ class Docter extends BaseModel
         return $this->belongsTo(Qualification::class)->select(['id', 'name']);
     }
 
-    public function organization()
+    public function DocterOrganization()
     {
-        return $this->belongsToMany(Organization::class);
+        return $this->belongsTo(DocterOrganization::class,'docter_id','id');
     }
 
     public function evaluate()
@@ -35,6 +35,11 @@ class Docter extends BaseModel
         return $this->hasMany(Evaluate::class)->where('status', 2);
     }
 
+    public  function teamdocter()
+    {
+        return $this->hasOne(TeamDocter::class);
+    }
+
     public function getIsCollectAttribute()
     {
         if (!empty(request()->header('token'))) {

+ 3 - 0
app/Models/Team.php

xqd
@@ -14,4 +14,7 @@ class Team extends BaseModel
     {
         return $this->belongsToMany(Docter::class, 'team_docters');
     }
+    public function DocterOrganization(){
+        return $this->belongsTo(DocterOrganization::class);
+    }
 }

+ 6 - 1
app/Models/TeamDocter.php

xqd
@@ -10,5 +10,10 @@ namespace App\Models;
 
 class TeamDocter extends BaseModel
 {
-
+    public function DocterOrganization(){
+        return $this->belongsTo(DocterOrganization::class);
+    }
+    public function docter(){
+        return $this->belongsTo(Docter::class);
+    }
 }

+ 3 - 0
app/Models/User.php

xqd
@@ -93,4 +93,7 @@ class User extends BaseModel
     public function UserBalanceLog(){
         return $this->hasMany(UserBalanceLog::class);
     }
+    public function patient(){
+        return $this->hasMany(Patient::class);
+    }
 }