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

app/Admin/Controllers/OrganizationController.php

@@ -53,6 +53,7 @@ class OrganizationController extends AdminController
         $grid->column('type', __('机构类型'))->using([1=>'公立医院',2=>'私立医院']);
         $grid->column('level', __('机构级别'))->using([0=>'未定级',1=>'一级',2=>'二级',3=>'三级']);
         $grid->column('name', __('名称'));
+        $grid->column('intro', __('机构简称'));
         $grid->column('province_id', __('省份'))->display(function ($id){
             return Area::where('id',$id)->value('name');
         });
@@ -134,6 +135,7 @@ class OrganizationController extends AdminController
             return Area::where(['level'=>3,'parent_id'=>$this->city_id])->pluck('name','id');
         })->required();
         $form->text('address', __('详细地址'))->required();
+        $form->text('intro','机构简称')->rules('required')->help('建议在六个中文字符以内');
         $form->editor('nurse_notice','门诊通告');
         $form->editor('vaccine_notice','计免通告');
         $form->latlong('latitude', 'longitude','经纬度');

app/Community/Controllers/SettingController.php

@@ -59,6 +59,7 @@ class SettingController extends AdminController
         $grid->column('type', __('机构类型'))->using([1=>'公立医院',2=>'私立医院']);
         $grid->column('level', __('机构级别'))->using([0=>'未定级',1=>'一级',2=>'二级',3=>'三级']);
         $grid->column('name', __('名称'));
+        $grid->column('intro', __('机构简称'));
         $grid->column('province_id', __('省份'))->display(function ($id){
             return Area::where('id',$id)->value('name');
         });
@@ -126,6 +127,8 @@ class SettingController extends AdminController
             3=>'三级',
         ])->required();
         $form->text('name', __('名称'))->required();
+        $form->text('intro','机构简称')->rules('required')->help('建议在六个中文字符以内');
+
         $form->select('province_id', __('省份'))->options(function (){
             return Area::where('level',1)->pluck('name','id');
         })->load('city_id','/cdms/api/getCity')->required();