订单列表修改

app/Community/Actions/Vaccine/Finished.php

@@ -13,7 +13,7 @@ class Finished extends RowAction
     public function handle(Model $model)
     {
         $id = $this->row->id;
-        $res = Order::where('id',$id)->update(['order_status'=>Order::FINISHED]);
+        $res = Order::where('id',$id)->update(['order_status'=>Order::FINISHED,'end_time'=>time()]);
         if($res){
             return $this->response()->success('操作成功!')->refresh();
         }

app/Community/Controllers/OrderController.php

@@ -46,19 +46,22 @@ class OrderController extends AdminController
         }
         $grid->column('id', __('Id'));
         $grid->column('orderUser.nickname', __('预约用户'));
-        $grid->column('orderPatient.appoint_start_time', __('预约开始时间'))->display(function ($w){
-            return date('Y-m-d H:i:s',$w);
+        $grid->column('orderPatient.appoint_start_time', __('预约时间'))->display(function ($w){
+            return date('Y-m-d H:i',$w).'至'.date('H:i',$this->orderPatient->appoint_end_time);
         });
-        $grid->column('orderPatient.appoint_end_time', __('预约结束时间'))->display(function ($w){
-            if(empty($w)) return '';
-            return date('Y-m-d H:i:s',$w);
+//        $grid->column('orderPatient.appoint_end_time', __('预约结束时间'))->display(function ($w){
+//            if(empty($w)) return '';
+//            return date('Y-m-d H:i',$w);
+//        });
+        $grid->column('orderPatient.phone', __('电话号码'))->display(function ($p){
+            if(empty($p))  return $this->user->phone;
+            return $p;
         });
-        $grid->column('orderPatient.phone', __('电话号码'));
 
-        $grid->column('orderPatient.name', __('预约患者'))->display(function ($w){
+        $grid->column('orderPatient.name', __('预约患者'));
+        $grid->column('orderPatient.sex', __('患者性别'))->display(function ($w){
             return $w==1?'男':'女';
         });
-        $grid->column('orderPatient.sex', __('患者性别'));
         $grid->column('orderPatient.birthday', __('患者年龄'))->display(function ($w){
             return birthday_to_age($w);
         });;
@@ -76,7 +79,7 @@ class OrderController extends AdminController
 //            if(!empty($actions->row->order_status) && $actions->row->order_status < 2){
 //                $actions->add(new Reserved());
 //            }
-            if(!empty($actions->row->order_status) && $actions->row->order_status<= 3){
+            if(!empty($actions->row->order_status) && ($actions->row->order_status<= 3 || $actions->row->order_status == 7) ){
                 $actions->add(new OrderCancel());
                 $actions->add(new Finished());
             }

app/Community/Controllers/OrderNurseController.php

@@ -99,7 +99,7 @@ class OrderNurseController extends AdminController
 //            if(!empty($actions->row->orders) && $actions->row->orders->order_status < 2){
 //                $actions->add(new Reserved());
 //            }
-            if(!empty($actions->row->orders) && $actions->row->orders->order_status<= 3){
+            if(!empty($actions->row->orders) && ($actions->row->orders->order_status<= 3 || $actions->row->order_status == 7) ){
                 $actions->add(new OrderCance());
                 $actions->add(new Finished());
             }

app/Community/Controllers/OrderVaccinesController.php

@@ -50,9 +50,12 @@ class OrderVaccinesController extends AdminController
 
         $grid->column('id', __('Id'));
         $grid->column('orderPatient.name', __('预约用户'));
-        $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));
+//        $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));
+//        });
+        $grid->column('orderPatient.appoint_start_time', __('预约时间'))->display(function ($w){
+            return date('Y-m-d H:i',$w).'至'.date('H:i',$this->orderPatient->appoint_end_time);
         });
         $grid->column('end_time', __('接种时间'))->display(function ($w){
             if(empty($w)) return '';
@@ -90,7 +93,7 @@ class OrderVaccinesController extends AdminController
 //                $actions->add(new Reserved());
 //            }
 
-            if(!empty($actions->row->order_status) &&  $actions->row->order_status<= 3 ){
+            if(!empty($actions->row->order_status) &&  ($actions->row->order_status<= 3 || $actions->row->order_status == 7 )  ){
                 $actions->add(new Finished());
                 $actions->add(new OrderCance());
                 $actions->add(new AddVaccine());