订单管理模块的优化

app/Admin/Controllers/OrdersManagement/BookingOrderController.php

@@ -39,18 +39,10 @@ class BookingOrderController extends AdminController
 
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->column(1/3, function ($filter) {
+            $filter->column(1/2, function ($filter) {
                 $filter->like('user.nickname','用户姓名');
                 $filter->like('docter.name','医生姓名');
                 $filter->like('orderPatient.name','患者姓名');
-                $filter->timestampBetween('payment_time', "支付时间")->datetime();
-            });
-            $filter->column(1/3, function ($filter) {
-                $filter->equal('user_id', '用户id');
-                $filter->equal('docter_id', '医生id');
-                $filter->timestampBetween('receiving_time', "接单时间")->datetime();
-            });
-            $filter->column(1/3,function ($filter) {
                 $filter->equal('product_type','预约类型')->radio(
                     [
                         ''=>'不限',
@@ -59,6 +51,8 @@ class BookingOrderController extends AdminController
                         5=>'儿保预约'
                     ]
                 );
+            });
+            $filter->column(1/2, function ($filter) {
                 $filter->equal('order_status','订单状态')->radio(
                     [
                         ''=>'不限',
@@ -69,7 +63,9 @@ class BookingOrderController extends AdminController
                         5=>'已取消'
                     ]
                 );
+                $filter->timestampBetween('payment_time', "支付时间")->datetime();
                 $filter->timestampBetween('end_time', "订单完成时间")->datetime();
+
             });
         });
 
@@ -136,13 +132,22 @@ class BookingOrderController extends AdminController
             return $money/100;
         });
         $grid->column('payment_time', __('支付时间'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
-        });
-        $grid->column('receiving_time', __('接单时间'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
+            if ($time == 0)
+            {
+                return '';
+            }else
+            {
+                return date('Y-m-d H:i:s',$time);
+            }
         });
         $grid->column('end_time', __('订单完成时间'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
+            if ($time == 0)
+            {
+                return '';
+            }else
+            {
+                return date('Y-m-d H:i:s',$time);
+            }
         });
         return $grid;
     }

app/Admin/Controllers/OrdersManagement/ConsultingOrdersController.php

@@ -37,22 +37,10 @@ class ConsultingOrdersController extends AdminController
         //筛选
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->column(1/3, function ($filter) {
+            $filter->column(1/2, function ($filter) {
                 $filter->like('user.nickname','用户姓名');
-                $filter->equal('user_id', '用户id');
-                $filter->timestampBetween('payment_time', "支付时间")->datetime();
-                $filter->in('evaluate.score','评分')->checkbox([
-                    1    => 1,
-                    2    => 2,
-                    3    => 3,
-                    4    => 4,
-                    5    => 5,
-                ]);
-
-            });
-            $filter->column(1/3, function ($filter) {
                 $filter->like('docter.name','医生姓名');
-                $filter->equal('docter_id', '医生id');
+                $filter->like('orderPatient.name','患者姓名');
                 $filter->equal('product_type','产品类型')->radio(
                     [
                         ''=>'不限',
@@ -60,10 +48,15 @@ class ConsultingOrdersController extends AdminController
                         2=>'图文咨询',
                     ]
                 );
-                $filter->timestampBetween('receiving_time', "接单时间")->datetime();
+                $filter->in('evaluate.score','评分')->checkbox([
+                    1    => 1,
+                    2    => 2,
+                    3    => 3,
+                    4    => 4,
+                    5    => 5,
+                ]);
             });
-            $filter->column(1/3, function ($filter) {
-                $filter->like('orderPatient.name','患者姓名');
+            $filter->column(1/2, function ($filter) {
                 $filter->equal('order_status','订单状态')->radio(
                     [
                         ''=>'不限',
@@ -74,6 +67,8 @@ class ConsultingOrdersController extends AdminController
                         5=>'已取消'
                     ]
                 );
+                $filter->timestampBetween('payment_time', "支付时间")->datetime();
+                $filter->timestampBetween('receiving_time', "接单时间")->datetime();
                 $filter->timestampBetween('end_time', "订单完成时间")->datetime();
             });
         });
@@ -136,13 +131,31 @@ class ConsultingOrdersController extends AdminController
         });
         $grid->column('evaluate.score', __('订单评分'));
         $grid->column('payment_time', __('支付时间'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
+            if ($time == 0)
+            {
+                return '';
+            }else
+            {
+                return date('Y-m-d H:i:s',$time);
+            }
         });
         $grid->column('receiving_time', __('接单时间'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
+            if ($time == 0)
+            {
+                return '';
+            }else
+            {
+                return date('Y-m-d H:i:s',$time);
+            }
         });
         $grid->column('end_time', __('订单完成时间'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
+            if ($time == 0)
+            {
+                return '';
+            }else
+            {
+                return date('Y-m-d H:i:s',$time);
+            }
         });
 
         return $grid;

app/Admin/Controllers/OrdersManagement/RechargeOrderController.php

@@ -31,29 +31,24 @@ class RechargeOrderController extends AdminController
         $grid->model()->wherein('product_type',[7]);
 
         //筛选
-
+        $grid->disableActions();
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->column(1/2, function ($filter) {
-                $filter->like('user.nickname','用户姓名');
-                $filter->equal('user_id', '用户id');
-                $filter->equal('order_status','订单状态')->radio(
-                    [
-                        ''=>'不限',
-                        1=>'未支付',
-                        2=>'待接单',
-                        3=>'进行中',
-                        4=>'已完成',
-                        5=>'已取消'
-                    ]
-                );
-            });
-            $filter->column(1/2, function ($filter) {
-                $filter->timestampBetween('payment_time', "支付时间")->datetime();
-                $filter->timestampBetween('receiving_time', "接单时间")->datetime();
-                $filter->timestampBetween('end_time', "订单完成时间")->datetime();
-            });
-            });
+
+            $filter->like('user.nickname','用户姓名');
+            $filter->equal('user_id', '用户id');
+            $filter->equal('order_status','订单状态')->radio(
+                [
+                    ''=>'不限',
+                    1=>'未支付',
+                    2=>'待接单',
+                    3=>'进行中',
+                    4=>'已完成',
+                    5=>'已取消'
+                ]
+            );
+            $filter->timestampBetween('payment_time', "支付时间")->datetime();
+        });
 
         $grid->actions(function ($actions) {
             // 去掉删除
@@ -82,12 +77,6 @@ class RechargeOrderController extends AdminController
         $grid->column('payment_time', __('支付时间'))->display(function ($time){
             return date('Y-m-d H:i:s',$time);
         });
-        $grid->column('receiving_time', __('接单时间'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
-        });
-        $grid->column('end_time', __('订单完成时间'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
-        });
         return $grid;
     }
 

app/Admin/Controllers/OrdersManagement/ServicePackDetailsController.php

@@ -30,9 +30,9 @@ class ServicePackDetailsController extends AdminController
         $grid->disableActions();
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->equal('order_id','订单id');
+//            $filter->equal('order_id','订单id');
         });
-        $grid->model()->orderBy('id','desc');
+        $grid->model()->where('order_id',$order_id)->orderBy('id','desc');
         $grid->column('id', __('id'));
         $grid->column('order_id', __('订单id'));
         $grid->column('service_pack_id', __('服务包id'));

app/Admin/Controllers/OrdersManagement/ServicePackOrderController.php

@@ -36,14 +36,9 @@ class ServicePackOrderController extends AdminController
         //筛选
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->column(1/3, function ($filter) {
+
                 $filter->like('user.nickname','用户姓名');
-                $filter->like('docter.name','医生姓名');
                 $filter->like('orderPatient.name','患者姓名');
-            });
-            $filter->column(1/3, function ($filter) {
-                $filter->equal('user_id', '用户id');
-                $filter->equal('docter_id', '医生id');
                 $filter->equal('order_status','订单状态')->radio(
                     [
                         ''=>'不限',
@@ -54,13 +49,9 @@ class ServicePackOrderController extends AdminController
                         5=>'已取消'
                     ]
                 );
-                $filter->column(1/3, function ($filter) {
-                    $filter->timestampBetween('payment_time', "支付时间")->datetime();
-                    $filter->timestampBetween('receiving_time', "接单时间")->datetime();
-                    $filter->timestampBetween('end_time', "订单完成时间")->datetime();
-                });
+                $filter->timestampBetween('payment_time', "支付时间")->datetime();
+
             });
-        });
         //操作
         $grid->actions(function ($actions) {
             // 去掉删除

app/Admin/Controllers/OrdersManagement/ServicePackOrderListController.php

@@ -33,10 +33,10 @@ class ServicePackOrderListController extends AdminController
         
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->equal('pay_order_pack_id','服务包id');
-            $filter->equal('patient_id','患者id');
+//            $filter->equal('pay_order_pack_id','服务包id');
+//            $filter->equal('patient_id','患者id');
         });
-        $grid->model()->orderBy('id','desc');
+        $grid->model()->where('pay_order_pack_id',$pack_id)->where('patient_id',$patient_id)->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
         $grid->column('user.nickname', __('用户姓名'));
         $grid->column('docter.name', __('医生姓名'));