Merge branch 'develop' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa into develop

app/Admin/Controllers/ServicePacksManagment/ServicePacksController.php

@@ -71,7 +71,7 @@ class ServicePacksController extends AdminController
 
         $grid->column('image','图片')->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('is_need_insure', __('是否包含保险'))->using([0=>'不包含',1=>'包含']);
-        $grid->column('systemconfig.chinese', __('保险协议名称'));
+        $grid->column('insuranceagreement.name', __('保险协议名称'));
         $grid->column('phone_minutes', __('电话次数'));
         $grid->column('chat_num', __('图文次数'));
         $grid->column('appoint_num', __('门诊次数'));
@@ -103,7 +103,7 @@ class ServicePacksController extends AdminController
             0=>'否',
             1=>'是'
         ])->when(1,function (Form $form){
-            $form->select('agreement_id','协议名称')->options(SystemConfig::where('group','insurance_agreement')->pluck('chinese','id'))->rules('required',['required'=>'请选择协议名称']);
+            $form->select('agreement_id','协议名称')->options(InsuranceAgreement::pluck('name','id'))->rules('required',['required'=>'请选择协议名称']);
         })->rules('required',['required'=>'请选择是否包含保险']);
         $form->radio('is_need_team', __('是否包含团队'))->options([
             0=>'否',

app/Models/ServicePack.php

@@ -42,4 +42,7 @@ class ServicePack extends BaseModel
 
         return $data;
     }
+    public function insuranceagreement(){
+        return $this->hasOne(InsuranceAgreement::class,'id','agreement_id');
+    }
 }