更新

app/Admin/Controllers/OrdersManagement/BookingOrderController.php

@@ -9,6 +9,7 @@ use App\Admin\Actions\backstage\Refund\RefundServicePackAction;
 use App\Models\Order;
 use App\Admin\Actions\backstage\Orders\OrderDetails;
 use App\Models\OrderPack;
+use App\Models\Organization;
 use App\Models\ServicePack;
 use Encore\Admin\Widgets\Table;
 use Encore\Admin\Controllers\AdminController;
@@ -114,13 +115,13 @@ class BookingOrderController extends AdminController
         $grid->column('docter.name', __('医生姓名'));
         $grid->column('orderPatient.name', __('患者姓名'));
         $grid->column('orderPatient.patient_phone', __('患者电话'));
-        $grid->column('orderPatient.appoint_start_time', __('预约日期'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
+        $grid->column('organization_id', __('预约机构'))->display(function ($org_id){
+            $name = Organization::where('id',$org_id)->value('name');
+            return $name;
         });
-        $grid->column('orderPatient.appoint_end_time', __('就诊日期'))->display(function ($time){
+        $grid->column('orderPatient.appoint_start_time', __('预约日期'))->display(function ($time){
             return date('Y-m-d H:i:s',$time);
         });
-//        $grid->column('evaluate.score', __('订单评分'));
         $grid->column('product_type', __('产品类型'))->using([3=>'门诊预约',4=>'疫苗接种预约',5=>'儿保预约']);
         $grid->column('payment_type', __('支付方式'))->display(function ($payment_type){
             if ($payment_type == 1)

app/Admin/Controllers/ServicePacksManagment/InsuranceAgreementController.php

@@ -26,16 +26,13 @@ class InsuranceAgreementController extends AdminController
     {
         $grid = new Grid(new InsuranceAgreement());
         $grid->disableBatchActions();
-        $grid->actions(function ($actions){
-           $actions->disableView();
-        });
         $grid->filter(function ($filter){
            $filter->disableIdFilter();
            $filter->like('name','协议名称');
         });
         $grid->column('id', __('Id'));
         $grid->column('name', __('协议名称'));
-        $grid->column('content', __('协议内容'))->limit(20,'...');
+//        $grid->column('content', __('协议内容'))->limit('300','...');
         $status = [
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
             'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
@@ -54,6 +51,19 @@ class InsuranceAgreementController extends AdminController
      * @return Show
      */
 
+    protected function detail($id)
+    {
+        $show = new Show(InsuranceAgreement::findOrFail($id));
+
+        $show->field('id', 'ID');
+        $show->field('name', '协议名称');
+        $show->field('content', '协议内容')->unescape();
+        $show->field('status', '状态')->using([0=>'禁用',1=>'启用'])->label('info');
+        $show->field('created_at', '创建时间');
+        $show->field('updated_at', '更新时间');
+
+        return $show;
+    }
     /**
      * Make a form builder.
      *

app/Community/Controllers/OrderVaccinesController.php

@@ -49,7 +49,7 @@ class OrderVaccinesController extends AdminController
         }
 
         $grid->column('id', __('Id'));
-        $grid->column('orderPatient.name', __('预约用户'));
+        $grid->column('user.nickname', __('预约用户'));
 //        $grid->column('yuyue', __('预约时间'))->display(function ($w){
 //            if(empty($this->orderPatient) || empty($this->orderPatient->appoint_start_time)) return '';
 //            return date('Y-m-d H:i:s',($this->orderPatient->appoint_start_time)) .'致' . date('Y-m-d H:i:s',($this->orderPatient->appoint_end_time));