订单预约时间筛选

app/Community/Actions/Vaccine/AddVaccine.php

@@ -82,9 +82,9 @@ class AddVaccine extends RowAction
         $order_id = $this->row->id;
 
         if($is_admin){
-            $list = Vaccine::pluck('name','id');
+            $list = Vaccine::where('stock','>',0)->pluck('name','id');
         } else {
-            $list = Vaccine::where('org_id',$org_id)->pluck('name','id');
+            $list = Vaccine::where('stock','>',0)->where('org_id',$org_id)->pluck('name','id');
         }
         $ids = OrderVaccine::where(['order_id'=>$order_id])->pluck('vaccine_id')->toArray();
         $this->multipleSelect('vaccine_id','选择疫苗')->options($list)->value($ids)->required();

app/Community/Controllers/OrderController.php

@@ -100,7 +100,7 @@ class OrderController extends AdminController
             $filter->column(1/2, function ($filter)   {
                 $filter->equal('docter_id','排班医生')->select('/cdms/api/getDocter');
                 $filter->equal('order_status','订单状态')->select(Order::$_order_status);
-                $filter->between('orderPatient.appoint_start_time','预约时间')->datetime();
+                $filter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();
             });
         });
         return $grid;

app/Community/Controllers/OrderNurseController.php

@@ -95,7 +95,7 @@ class OrderNurseController extends AdminController
             $filter->column(1/2, function ($filter) {
 //                $filter->equal('orders.docter_id','排班医生')->select('/cdms/api/getDocter');
                 $filter->equal('order_status','订单状态')->select(Order::$_order_status);
-                $filter->between('orderPatient.appoint_start_time','预约时间')->datetime();
+                $filter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();
             });
         });
 

app/Community/Controllers/OrderVaccinesController.php

@@ -55,6 +55,7 @@ class OrderVaccinesController extends AdminController
 //            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){
+            if(empty($this->orderPatient) || empty($this->orderPatient->appoint_start_time)) return '';
             return date('Y-m-d H:i',$w).'~'.date('H:i',$this->orderPatient->appoint_end_time);
         });
         $grid->column('end_time', __('接种时间'))->display(function ($w){
@@ -80,9 +81,9 @@ class OrderVaccinesController extends AdminController
 
         $grid->filter(function ($filter)  {
             $filter->column(1/2, function ($filter) {
-                $filter->equal('docter.id','排班医生')->select('/cdms/api/getDocter');
+//                $filter->equal('docter.id','排班医生')->select('/cdms/api/getDocter');
                 $filter->equal('order_status','订单状态')->select(Order::$_order_status);
-                $filter->between('orderPatient.appoint_start_time','预约时间')->datetime();
+                $filter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();
             });
         });
         $grid->tools(function ($tools) {