ChenWuJie 4 years ago
parent
commit
b4d5edd38f

+ 1 - 4
app/Admin/Controllers/OrdersManagement/BookingOrderController.php

xqd xqd
@@ -46,6 +46,7 @@ class BookingOrderController extends AdminController
                 $filter->like('user.nickname','用户姓名');
                 $filter->like('docter.name','医生姓名');
                 $filter->like('orderPatient.name','患者姓名');
+                $filter->equal('orderPatient.patient_phone','患者电话');
                 $filter->equal('product_type','预约类型')->radio(
                     [
                         ''=>'不限',
@@ -106,10 +107,6 @@ class BookingOrderController extends AdminController
                         }
                 }
             }
-            //有问题 未支付是订单状态,这里冲突了
-//            if ($actions->row->product_type == 5 && $actions->row->order_status == 5 && $actions->row->payment_status == 2){
-//
-//            }
         });
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();

+ 1 - 0
app/Admin/Controllers/UserManagement/DocterManagement/ApproveController.php

xqd
@@ -43,6 +43,7 @@ class ApproveController extends AdminController
         $grid->column('id', __('Id'));
         $grid->column('docter.id', __('医生ID'));
         $grid->column('docter.name', __('医生姓名'));
+        $grid->column('docter.phone', __('医生电话'));
         $grid->column('docter.avatar', __('医生头像'))->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('docter.sex', __('性别'))->using([0=>'未知',1=>'男',2=>'女']);
         $grid->column('organization.name', __('机构'));