Merge branch 'master' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa

app/Admin/Controllers/CouponManagement/CouponManagementController.php

@@ -36,6 +36,11 @@ class CouponManagementController extends AdminController
             $actions->disableView();
             $actions->add(new CouponDetails());
         });
+        $grid->filter(function($filter){
+            $filter->timestampBetween('start_time', "有效期开始时间")->datetime();
+            $filter->timestampBetween('end_time', "有效期结束时间")->datetime();
+        });
+
 
         $grid->column('id', __('Id'));
         $grid->column('name', __('劵名称'));

app/Admin/Controllers/OrdersManagement/BookingOrderController.php

@@ -41,10 +41,12 @@ class BookingOrderController extends AdminController
                 $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(
@@ -65,6 +67,7 @@ class BookingOrderController extends AdminController
                         5=>'已取消'
                     ]
                 );
+                $filter->timestampBetween('end_time', "订单完成时间")->datetime();
             });
         });
 

app/Admin/Controllers/OrdersManagement/ConsultingOrdersController.php

@@ -37,6 +37,7 @@ class ConsultingOrdersController extends AdminController
             $filter->column(1/3, function ($filter) {
                 $filter->like('user.nickname','用户姓名');
                 $filter->equal('user_id', '用户id');
+                $filter->timestampBetween('payment_time', "支付时间")->datetime();
             });
             $filter->column(1/3, function ($filter) {
                 $filter->like('docter.name','医生姓名');
@@ -48,6 +49,7 @@ class ConsultingOrdersController extends AdminController
                         2=>'图文咨询',
                     ]
                 );
+                $filter->timestampBetween('receiving_time', "接单时间")->datetime();
             });
             $filter->column(1/3, function ($filter) {
                 $filter->like('orderPatient.name','患者姓名');
@@ -61,6 +63,7 @@ class ConsultingOrdersController extends AdminController
                         5=>'已取消'
                     ]
                 );
+                $filter->timestampBetween('end_time', "订单完成时间")->datetime();
             });
         });
         //操作

app/Admin/Controllers/OrdersManagement/RechargeOrderController.php

@@ -34,6 +34,7 @@ class RechargeOrderController extends AdminController
 
         $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(
@@ -47,6 +48,12 @@ class RechargeOrderController extends AdminController
                     ]
                 );
             });
+            $filter->column(1/2, function ($filter) {
+                $filter->timestampBetween('payment_time', "支付时间")->datetime();
+                $filter->timestampBetween('receiving_time', "接单时间")->datetime();
+                $filter->timestampBetween('end_time', "订单完成时间")->datetime();
+            });
+            });
 
         $grid->actions(function ($actions) {
             // 去掉删除

app/Admin/Controllers/OrdersManagement/ServicePackOrderController.php

@@ -34,12 +34,12 @@ class ServicePackOrderController extends AdminController
         //筛选
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->column(1/2, function ($filter) {
+            $filter->column(1/3, function ($filter) {
                 $filter->like('user.nickname','用户姓名');
                 $filter->like('docter.name','医生姓名');
                 $filter->like('orderPatient.name','患者姓名');
             });
-            $filter->column(1/2, function ($filter) {
+            $filter->column(1/3, function ($filter) {
                 $filter->equal('user_id', '用户id');
                 $filter->equal('docter_id', '医生id');
                 $filter->equal('order_status','订单状态')->radio(
@@ -52,6 +52,11 @@ 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();
+                });
             });
         });
         //操作

app/Admin/Controllers/UserManagement/BmUser/UserListController.php

@@ -46,20 +46,26 @@ class UserListController extends AdminController
     });
         //筛选
         $grid->filter(function ($filter){
-            $filter->disableIdFilter();
-            $filter->equal('phone','手机')->mobile()->placeholder("请输入手机");
-            $filter->like('patient.name','患者姓名')->placeholder("请输入患者姓名");
-            $filter->like('nickname','昵称');
-            $filter->equal('status','用户状态')->radio([
-                ''   => '不限',
-                0    => '黑名单',
-                1    => '正常',
-            ]);
-            $filter->equal('is_pack','用户状态')->radio([
-                ''   => '全部用户',
-                0    => '普通用户',
-                1    => '服务包用户',
-            ]);
+            $filter->column(1/2, function ($filter) {
+                $filter->disableIdFilter();
+                $filter->equal('phone','手机')->mobile()->placeholder("请输入手机");
+                $filter->like('patient.name','患者姓名')->placeholder("请输入患者姓名");
+                $filter->like('nickname','昵称');
+            });
+            $filter->column(1/2, function ($filter) {
+                $filter->equal('status','用户状态')->radio([
+                    ''   => '不限',
+                    0    => '黑名单',
+                    1    => '正常',
+                ]);
+                $filter->equal('is_pack','用户状态')->radio([
+                    ''   => '全部用户',
+                    0    => '普通用户',
+                    1    => '服务包用户',
+                ]);
+                $filter->between('created_at', '注册时间')->datetime();
+                $filter->timestampBetween('last_login_time', "最后登录时间")->datetime();
+            });
         });
             $grid ->model()->where('status','>=','0');
             $grid->column('id', __('用户id'))->sortable();

app/Admin/Controllers/UserManagement/DocterManagement/ApproveController.php

@@ -29,7 +29,13 @@ class ApproveController extends AdminController
      */
     protected function grid()
     {
+
         $grid = new Grid(new DocterOrganization());
+        $grid->filter(function($filter){
+            $filter->between('authentication_time', '签约时间')->datetime();
+            $filter->between('authentication_end_time', '签约到期时间')->datetime();
+        });
+
         $grid ->model()->where('state','>',0);
         $grid->column('id', __('Id'));
         $grid->column('docter.id', __('医生ID'));

app/Admin/Controllers/UserManagement/DocterManagement/UserEvaluatesController.php

@@ -4,6 +4,7 @@ namespace App\Admin\Controllers\UserManagement\DocterManagement;
 
 use App\Admin\Actions\backstage\Evaluate\Ignore;
 use App\Admin\Actions\backstage\Evaluate\Pass;
+use App\Admin\Filters\date;
 use App\Models\Evaluate;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
@@ -51,7 +52,8 @@ class UserEvaluatesController extends AdminController
             $filter->like('user.nickname','用户名字');
             $filter->like('docter.name','医生名字');
             $filter->like('content','评价内容');
-                $filter->equal('status','审核状态')->select([
+            $filter->timestampBetween('audit_time', "审核时间")->datetime();
+            $filter->equal('status','审核状态')->select([
                 1   => '待审核',
                 2    => '审核通过',
                 3    => '忽略',