Browse Source

修改标签的显示

ChenWuJie 4 years ago
parent
commit
0a10d700a5

+ 12 - 1
app/Admin/Controllers/ServiceManagement/ServiceController.php

@@ -5,6 +5,7 @@ namespace App\Admin\Controllers\ServiceManagement;
 use App\Admin\Actions\Service\ApplysAction;
 use App\Admin\Actions\Service\ApplysAction;
 use App\Admin\Actions\Service\RefuseAction;
 use App\Admin\Actions\Service\RefuseAction;
 use App\Models\Docter;
 use App\Models\Docter;
+use App\Models\DocterLabel;
 use App\Models\Order;
 use App\Models\Order;
 use App\Models\Doctertimes;
 use App\Models\Doctertimes;
 use App\Models\Serviceapplys;
 use App\Models\Serviceapplys;
@@ -44,7 +45,17 @@ class ServiceController extends AdminController
         $grid->column('ondocter.name','医生名称');
         $grid->column('ondocter.name','医生名称');
         $grid->column('ondocter.sex','性别')->using([1=>'男',2=>'女']);
         $grid->column('ondocter.sex','性别')->using([1=>'男',2=>'女']);
         $grid->column('ondocter.DocterOrganization', __('所属机构'));
         $grid->column('ondocter.DocterOrganization', __('所属机构'));
-        $grid->column('ondocter.label', __('标签'))->label('info');
+//        $grid->column('ondocter.label', __('标签'))->label('info');
+        $grid->column('ondocter.label', __('标签'))->display(function ($label){
+            if($label==null)
+            {
+                return '无';
+            }else{
+                $label_value = DocterLabel::whereIn('id',$label)->pluck('label_name');
+                return $label_value;
+            }
+        })->label('info');
+
 
 
         $grid->column('status', __('状态'))->using([1=>'审核',2=>'已通过',3=>'已拒绝'])->label([
         $grid->column('status', __('状态'))->using([1=>'审核',2=>'已通过',3=>'已拒绝'])->label([
             1 => 'warning',
             1 => 'warning',

+ 4 - 0
app/Admin/Controllers/UserManagement/DocterManagement/DoctorManagementController.php

@@ -75,6 +75,10 @@ class DoctorManagementController extends AdminController
         $grid->column('organization', __('所属机构'))->pluck('name')->label('info');
         $grid->column('organization', __('所属机构'))->pluck('name')->label('info');
         $grid->column('is_then', __('认证状态'))->using([0=>'未认证',1=>'已认证']);
         $grid->column('is_then', __('认证状态'))->using([0=>'未认证',1=>'已认证']);
         $grid->column('label', __('标签'))->display(function ($label){
         $grid->column('label', __('标签'))->display(function ($label){
+            if($label==null)
+            {
+                return '无';
+            }
                 $label_value = DocterLabel::whereIn('id',$label)->pluck('label_name');
                 $label_value = DocterLabel::whereIn('id',$label)->pluck('label_name');
                 return $label_value;
                 return $label_value;
         })->label('info');
         })->label('info');