修改账号页面 字段优化：用户名改为登录账号

筛选：按机构类型筛选，按机构级别筛选
按地区筛选：按省 市 区 筛选

app/Admin/Controllers/CdmsController.php

@@ -31,7 +31,7 @@ class CdmsController extends AdminController
         $connection = config('tenancy.database.connection');
 
         $form->display('id', 'ID');
-        $form->text('username', trans('tenancy.username'))
+        $form->text('username', trans('tenancy.login_account'))
             ->creationRules(['required', "unique:{$connection}.{$userTable}"])
             ->updateRules(['required', "unique:{$connection}.{$userTable},username,{{id}}"]);
 

app/Admin/Controllers/OrganizationController.php

@@ -28,7 +28,26 @@ class OrganizationController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Organization());
-
+        $grid->filter(function ($filter){
+           $filter->disableIdFilter();
+            $filter->column(1/2, function ($filter) {
+                $filter->equal('type','机构类型')->select([
+                    1=>'公立医院',
+                    2=>'私立医院'
+                ]);
+                $filter->equal('level','机构级别')->select([
+                    0=>'未定级',
+                    1=>'一级',
+                    2=>'二级',
+                    3=>'三级'
+                ]);
+            });
+            $filter->column(1/2, function ($filter) {
+                $filter->equal('province_id','省份')->select(Area::where('level',1)->pluck('name','id'));
+                $filter->equal('city_id','城市')->select(Area::where('level',2)->pluck('name','id'));
+                $filter->equal('area_id','地区')->select(Area::where('level',3)->pluck('name','id'));
+            });
+        });
         $grid->column('id', __('Id'));
         $grid->column('type', __('机构类型'))->using([1=>'公立医院',2=>'私立医院']);
         $grid->column('level', __('机构级别'))->using([0=>'未定级',1=>'一级',2=>'二级',3=>'三级']);

resources/lang/zh-CN/tenancy.php

@@ -111,5 +111,6 @@ return [
     'index' => '列表',
     'store' => '保存',
     'update' => '更新',
+    'login_account' =>'登录账号',
 ];