宝妈文档修复

app/Admin/Controllers/OrdersManagement/RechargeOrderController.php

@@ -36,6 +36,7 @@ class RechargeOrderController extends AdminController
             $filter->disableIdFilter();
 
             $filter->like('user.nickname','用户姓名');
+            $filter->equal('user.phone','用户电话');
             $filter->equal('order_status','订单状态')->radio(
                 [
                     ''=>'不限',

app/Admin/Controllers/OrdersManagement/ServicePackOrderController.php

@@ -2,6 +2,7 @@
 
 namespace App\Admin\Controllers\OrdersManagement;
 
+use App\Admin\Actions\backstage\Docters\Team;
 use App\Admin\Actions\backstage\Orders\Evaluate;
 use App\Admin\Actions\backstage\Orders\ServicePack;
 use App\Admin\Actions\backstage\Orders\ServicePackOrderList;
@@ -38,6 +39,8 @@ class ServicePackOrderController extends AdminController
             $filter->disableIdFilter();
 
                 $filter->like('user.nickname','用户姓名');
+                $filter->equal('user.phone','用户电话');
+                $filter->like('orderPack.pack_name','服务包名称');
                 $filter->like('patient.name','患者姓名');
                 $filter->equal('order_status','订单状态')->radio(
                     [
@@ -49,7 +52,12 @@ class ServicePackOrderController extends AdminController
                         5=>'已取消'
                     ]
                 );
-                $filter->timestampBetween('payment_time', "支付时间")->datetime();
+                $filter->where(function ($query){
+                   $query->whereHas('orderPack',function ($query){
+                       $query->where('team_id','like',"%{$this->input}%");
+                   });
+                },'医生团队')->select(\App\Models\Team::where('status',1)->pluck('name','id'));
+            $filter->timestampBetween('payment_time', "支付时间")->datetime();
 
             });
         //操作
@@ -78,6 +86,16 @@ class ServicePackOrderController extends AdminController
         $grid->column('orderPack.pack_price', __('服务包价格'))->display(function ($money){
             return $money/100;
         });
+        $grid->column('orderPack.team_id', __('医生团队'))->display(function ($team){
+            if (empty($team))
+            {
+                return '无';
+            }else
+            {
+                $res = \App\Models\Team::whereIn('id',$team)->pluck('name')->toArray();
+                return $res;
+            }
+        })->label('info');
         $grid->column('product_type', __('产品类型'))->using([6=>'服务包订单']);
         $grid->column('payment_type', __('支付方式'))->using([1=>'微信支付',2=>'余额支付']);
         $grid->column('order_status', __('订单状态'))->display(function ($w) use ($status_arr) {

app/Admin/Controllers/ServiceManagement/ServiceController.php

@@ -25,7 +25,7 @@ class ServiceController extends AdminController
      *
      * @var string
      */
-    protected $title = '服务审核';
+    protected $title = '服务开通';
 
     /**
      * Make a grid builder.
@@ -38,31 +38,34 @@ class ServiceController extends AdminController
 
 //        $status = request('status',2);
 
-        $grid->tools(function ($tools) {
-            $tools->batch(function ($batch) {
-                $batch->disableDelete();
-            });
-        });
+//        $grid->tools(function ($tools) {
+//            $tools->batch(function ($batch) {
+//                $batch->disableDelete();
+//            });
+//        });
+        $grid->disableBatchActions();
         $grid->model()->where('status','!=',3)->orderBy('id','desc');
         $grid->column('id', __('Id'));
-        $grid->column('ondocter.avatar', __('头像'))->lightbox(['width' =>'', 'height' => 30]);
+//        $grid->column('ondocter.avatar', __('头像'))->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('ondocter.id', __('医生ID'));
         $grid->column('ondocter.name','医生名称');
-        $grid->column('service_type','服务类别')->using([1=>'图文咨询',2=>'电话咨询',3=>'门诊预约'])->label('default');
+        $grid->column('ondocter.phone','医生电话');
         $grid->column('ondocter.sex','性别')->using([1=>'男',2=>'女']);
+
+        $grid->column('service_type','服务类别')->using([1=>'图文咨询',2=>'电话咨询',3=>'门诊预约'])->label('default');
         $grid->column('docterorganization', __('所属机构'))->where('state',1)->pluck('organization_id')->display(function ($organization){
             $value = Organization::whereIn('id',$organization->toArray())->pluck('intro')->toArray();
             return $value;
         })->label('info')->width(300);
-        $grid->column('ondocter.label', __('标签'))->display(function ($label){
-            if($label==null || $label == '无')
-            {
-                return '无';
-            }else{
-                $label_value = DocterLabel::whereIn('id',$label)->pluck('label_name')->toArray();
-                return $label_value;
-            }
-        })->label(['info']);
+//        $grid->column('ondocter.label', __('标签'))->display(function ($label){
+//            if($label==null || $label == '无')
+//            {
+//                return '无';
+//            }else{
+//                $label_value = DocterLabel::whereIn('id',$label)->pluck('label_name')->toArray();
+//                return $label_value;
+//            }
+//        })->label(['info']);
 
 
         $grid->column('status', __('状态'))->using([1=>'待审核',2=>'已开通',3=>'未开通'])->label([
@@ -78,6 +81,8 @@ class ServiceController extends AdminController
             $filter->equal('service_type','服务类别')->select([1 => '图文咨询', 2 => '电话咨询', 3 => '门诊预约']);
             $filter->equal('status','状态')->select([1=>'待审核',2 =>'已开通 ']);
             $filter->equal('docterorganization.organization_id','所属机构')->select(Organization::pluck('intro','id'));
+            $filter->like('ondocter.name','医生名称');
+            $filter->equal('ondocter.phone','医生电话');
         });
         $grid->actions(function ($actions) {
             $actions->disableEdit();

app/Admin/Controllers/UserManagement/BmUser/UserListController.php

@@ -84,13 +84,13 @@ class UserListController extends AdminController
                     return $time;
                 }
             });
-            $grid->column('last_login_time', __('最后登录时间'))->display(function ($time){
-                if ($time == 0 ){
-                    return '';
-                }else{
-                    return date('Y-m-d H:i:s',$time);
-                }
-            });
+//            $grid->column('last_login_time', __('最后登录时间'))->display(function ($time){
+//                if ($time == 0 ){
+//                    return '';
+//                }else{
+//                    return date('Y-m-d H:i:s',$time);
+//                }
+//            });
         return $grid;
     }
 

app/Admin/Controllers/UserManagement/BmUser/UserOrdersController.php

@@ -5,6 +5,7 @@ namespace App\Admin\Controllers\UserManagement\BmUser;
 use App\Admin\Actions\backstage\Orders\OrderOpinion;
 use App\Admin\Actions\backstage\Orders\ServicePack;
 use App\Models\Order;
+use App\Models\OrderPack;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
@@ -30,7 +31,8 @@ class UserOrdersController extends AdminController
         $uesr_id = \request('user_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->equal('user_id','用户id');
+//            $filter->equal('user_id','用户id');
+            $filter->like('orderPatient.name','患者姓名');
         });
         $grid->actions(function ($actions){
             $actions->disableView();
@@ -75,8 +77,9 @@ class UserOrdersController extends AdminController
                 return '余额支付';
             }
             if ($payment_type == 3){
-                $name = ServicePack::where('id',$this->pay_order_pack_id)->pluck('name');
-                return '服务包支付('.$name[0].')';
+                $order_pack_id = OrderPack::where('id',$this->pay_order_pack_id)->value('service_pack_id');
+                $name = \App\Models\ServicePack::where('id',$order_pack_id)->value('name');
+                return '服务包支付('.$name.')';
             }
             return '';
         });

app/Admin/Controllers/UserManagement/BmUser/UserServiceController.php

@@ -52,7 +52,8 @@ class UserServiceController extends AdminController
         });
         $grid->column('orderPack.team_id', __('医生团队'))->display(function ($team)
         {
-            $team = json_decode($team);
+//            $team = json_encode($team);
+//            $team = json_decode($team);
             if (empty($team))
             {
                 return '无';

app/Admin/Controllers/UserManagement/DocterManagement/DoctorManagementController.php

@@ -55,6 +55,7 @@ class DoctorManagementController extends AdminController
                 1    => '已认证',
             ]);
         });
+        $grid->disableBatchActions();
         $grid->actions(function ($actions) {
             // 去掉编辑
             $actions->disableEdit();

app/Models/OrderPack.php

@@ -20,6 +20,9 @@ class OrderPack extends BaseModel
     {
         return $this->belongsTo(Order::class);
     }
+    public function teams(){
+        return $this->hasOne(Team::class,'id','team_id');
+    }
 
     public function user()
     {