Merge branch 'master' of http://git.9026.com/swdz-WangHaijun/BaoMa

app/Admin/Controllers/ArticleManagement/ArticleController.php

@@ -25,6 +25,9 @@ class ArticleController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Article());
+        $grid->actions(function ($actions){
+           $actions->disableView();
+        });
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'));
         $grid->column('type', __('分类'))->using([1=>'健康科普',2=>'疫苗科普']);

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

@@ -33,9 +33,12 @@ class UserPatientsController extends AdminController
         $uesr_id = \request('user_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->equal('id','患者id');
             $filter->like('userspatient.nickname','用户姓名');
             $filter->like('name','患者姓名');
+            $filter->equal('phone','联系电话');
+            $filter->like('guardian_name','监护人姓名');
+            $filter->between('created_at', "创建时间")->datetime();
+            $filter->between('updated_at', "更新时间")->datetime();
         });
         $grid->disableActions();
         $grid->model()->orderBy('id','desc');