whj преди 4 години
родител
ревизия
2f8a8dbcc8
променени са 1 файла, в които са добавени 10 реда и са изтрити 10 реда
  1. 10 10
      app/Admin/Controllers/ServiceManagement/ServiceController.php

+ 10 - 10
app/Admin/Controllers/ServiceManagement/ServiceController.php

xqd xqd xqd
@@ -46,18 +46,18 @@ class ServiceController extends AdminController
         $grid->column('ondocter.name','医生名称');
         $grid->column('ondocter.sex','性别')->using([1=>'男',2=>'女']);
         $grid->column('docterorganization', __('所属机构'))->pluck('organization_id')->display(function ($organization){
-            $value = Organization::whereIn('id',$organization)->pluck('name');
+            $value = Organization::whereIn('id',$organization->toArray())->pluck('name')->toArray();
             return $value;
         })->label('info');
         $grid->column('ondocter.label', __('标签'))->display(function ($label){
-            if($label==null)
+            if($label==null || $label == '无')
             {
                 return '无';
             }else{
-                $label_value = DocterLabel::whereIn('id',$label)->pluck('label_name');
+                $label_value = DocterLabel::whereIn('id',$label)->pluck('label_name')->toArray();
                 return $label_value;
             }
-        })->label('info');
+        })->label(['info']);
 
 
         $grid->column('status', __('状态'))->using([1=>'审核',2=>'已通过',3=>'已拒绝'])->label([
@@ -71,11 +71,11 @@ class ServiceController extends AdminController
         $grid->filter(function ($filter){
             $filter->equal('service_type','服务类型')->select([1 => '图文', 2 => '电话', 3 => '问诊']);
             $filter->equal('status','服务类型')->select([1=>'待审核',2 =>'已通过 ',3=>'已拒绝']);
-            $filter->where(function ($query) {
-                $query->whereHas('organization',function ($query){
-                    $query->where('name','like',"%{$this->input}%");
-                });
-            },'机构名');
+//            $filter->where(function ($query) {
+//                $query->whereHas('organization',function ($query){
+//                    $query->where('name','like',"%{$this->input}%");
+//                });
+//            },'机构名');
         });
         $grid->actions(function ($actions) {
             $actions->disableEdit();
@@ -89,4 +89,4 @@ class ServiceController extends AdminController
         return $grid;
     }
 
-}
+}