增加筛选

app/Admin/Controllers/DiagnosiController.php

@@ -23,6 +23,7 @@ protected function grid()
             $grid->column('id')->sortable();
             $grid->column('id')->sortable();
             $grid->column('name');
             $grid->column('name');
             $grid->column('code');
             $grid->column('code');
+            $grid->column('encoding');
             $grid->column('content');
             $grid->column('content');
 
 
             $grid->filter(function (Grid\Filter $filter) {
             $grid->filter(function (Grid\Filter $filter) {
@@ -31,6 +32,7 @@ protected function grid()
 
 
                 $filter->like('name')->width(3);
                 $filter->like('name')->width(3);
                 $filter->like('code')->width(3);
                 $filter->like('code')->width(3);
+                $filter->like('encoding')->width(3);
                 $filter->like('content')->width(3);
                 $filter->like('content')->width(3);
             });
             });
 
 
@@ -77,8 +79,8 @@ protected function form()
             $form->display('id')->width(4);
             $form->display('id')->width(4);
             $form->text('name')->width(4)->required()->maxLength(128, '最多输入128个字符');
             $form->text('name')->width(4)->required()->maxLength(128, '最多输入128个字符');
             $form->text('content')->width(4)->required()->maxLength(255, '最多输入255个字符');
             $form->text('content')->width(4)->required()->maxLength(255, '最多输入255个字符');
+            $form->text('encoding')->width(4)->required()->maxLength(128);
             $form->display('code')->width(4);
             $form->display('code')->width(4);
-            $form->display('encoding')->width(4);
 
 
             $form->display('created_at')->width(4);
             $form->display('created_at')->width(4);
             $form->display('updated_at')->width(4);
             $form->display('updated_at')->width(4);

app/Admin/Controllers/DrugController.php

@@ -74,7 +74,6 @@ protected function grid()
             $grid->disableViewButton(); // 禁用详情按钮
             $grid->disableViewButton(); // 禁用详情按钮
 
 
             // 工具栏按钮控制
             // 工具栏按钮控制
-            $grid->disableCreateButton(); // 禁用创建按钮
             $grid->disableBatchDelete(); // 禁用批量删除
             $grid->disableBatchDelete(); // 禁用批量删除
 
 
             // 导出按钮
             // 导出按钮

app/Admin/Controllers/DrugUnitController.php

@@ -70,7 +70,7 @@ protected function form()
     {
     {
         return Form::make(new DrugUnitRepository(), function (Form $form) {
         return Form::make(new DrugUnitRepository(), function (Form $form) {
             $form->display('id')->width(4);
             $form->display('id')->width(4);
-            $form->text('name')->width(4)->maxLength(32, '最多输入32个字符');
+            $form->text('name')->width(4)->required()->maxLength(32);
 
 
             $form->display('created_at')->width(4);
             $form->display('created_at')->width(4);
             $form->display('updated_at')->width(4);
             $form->display('updated_at')->width(4);

app/Admin/Controllers/PharmacyController.php

@@ -128,7 +128,9 @@ protected function form()
                 $form->timeRange('business_start', 'business_end', '营业时间')->required();
                 $form->timeRange('business_start', 'business_end', '营业时间')->required();
                 $form->map('lat', 'lng', '经纬度坐标');
                 $form->map('lat', 'lng', '经纬度坐标');
                 // $form->select('user_id')->options(User::all()->pluck('openid', 'id'))->width(6)->help('实际后台操作可以不用关联');
                 // $form->select('user_id')->options(User::all()->pluck('openid', 'id'))->width(6)->help('实际后台操作可以不用关联');
+                if ($form->isEditing()) {
                     $form->switch('status');
                     $form->switch('status');
+                }
 
 
                 $form->display('created_at');
                 $form->display('created_at');
                 $form->display('updated_at');
                 $form->display('updated_at');
@@ -144,7 +146,8 @@ protected function form()
             $form->saving(function (Form $form) {
             $form->saving(function (Form $form) {
                 $status = $form->status;
                 $status = $form->status;
                 $pharmacyId = $form->getKey();
                 $pharmacyId = $form->getKey();
-                $pharmacistNum = PharmacistModel::where('status', 1)->where('pharmacy_id', $pharmacyId)->count();
+                $pharmacistNum = PharmacistModel::where('status', PharmacyModel::STATUS_TRUE)->where('pharmacy_id', $pharmacyId)->count();
+
                 if ($status == 1 && $pharmacistNum <= 0) {
                 if ($status == 1 && $pharmacistNum <= 0) {
                     return $form->response()->error('开启失败，至少添加并且启用一个药师才可以开启药店~');
                     return $form->response()->error('开启失败，至少添加并且启用一个药师才可以开启药店~');
                 }
                 }

app/Models/DiagnosiModel.php

@@ -15,8 +15,10 @@ class DiagnosiModel extends Model
 
 
     protected $table = 'diagnosis';
     protected $table = 'diagnosis';
 
 
-    public function setCodeAttribute($value)
+    public function setNameAttribute($value)
     {
     {
+        $this->attributes['name'] = $value;
+
         $pinyin = new Pinyin();
         $pinyin = new Pinyin();
         $abbr = $pinyin->abbr($this->name)->join(''); // 获取拼音首字母
         $abbr = $pinyin->abbr($this->name)->join(''); // 获取拼音首字母
         $this->attributes['code'] = strtoupper($abbr);
         $this->attributes['code'] = strtoupper($abbr);

app/Models/DrugModel.php

@@ -36,8 +36,10 @@ class DrugModel extends Model
         self::RX_FALSE => '否',
         self::RX_FALSE => '否',
     ];
     ];
 
 
-    public function setCodeAttribute($value)
+    public function setNameAttribute($value)
     {
     {
+        $this->attributes['name'] = $value;
+
         $pinyin = new Pinyin();
         $pinyin = new Pinyin();
         $abbr = $pinyin->abbr($this->name)->join(''); // 获取拼音首字母
         $abbr = $pinyin->abbr($this->name)->join(''); // 获取拼音首字母
         $this->attributes['code'] = strtoupper($abbr);
         $this->attributes['code'] = strtoupper($abbr);