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

app/Admin/Actions/backstage/Orders/OrderOpinion.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Admin\Actions\backstage\Orders;
+
+use Encore\Admin\Actions\RowAction;
+use Illuminate\Database\Eloquent\Model;
+
+class OrderOpinion extends RowAction
+{
+    public $name = '病例意见单';
+
+    public function handle(Model $model)
+    {
+        // $model ...
+        return $this->response()->success('跳转病例意见单成功')->redirect('/admin/user_suggests?order_id='.$this->row->id.'');
+
+    }
+
+}

app/Admin/Controllers/ArticleManagement/ArticleController.php

@@ -44,7 +44,7 @@ class ArticleController extends AdminController
             // Add a column filter
             $type = [''=>'全部'];
             $type = array_merge($type,Article::$_post_type);
-            $filter->equal('type', '类别')->select(Article::$_post_type);
+            $filter->equal('type', '分类')->select(Article::$_post_type);
 
         });
 

app/Admin/Controllers/DocterTypeController.php

@@ -25,7 +25,10 @@ class DocterTypeController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new DocterType());
-
+        $grid->filter(function ($filter){
+            $filter->disableIdFilter();
+            $filter->like('name','名称');
+        });
         $grid->column('id', __('ID'));
         $grid->column('name', __('名称'));
         $states = [

app/Admin/Controllers/HelpInfoController.php

@@ -25,7 +25,10 @@ class HelpInfoController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new HelpInfo());
-
+        $grid->filter(function ($filter){
+           $filter->disableIdFilter();
+           $filter->like('title','标题');
+        });
         $grid->column('id', __('Id'));
         $grid->column('title', __('标题'));
         $grid->column('content', __('内容'))->limit(50,'...');

app/Admin/Controllers/OrdersManagement/ConsultingOrdersController.php

@@ -4,6 +4,7 @@ namespace App\Admin\Controllers\OrdersManagement;
 
 use App\Admin\Actions\backstage\Orders\Evaluate;
 use App\Admin\Actions\backstage\Orders\OrderDetails;
+use App\Admin\Actions\backstage\Orders\OrderOpinion;
 use App\Admin\Actions\backstage\Orders\RefundApplicationAction;
 use App\Admin\Actions\backstage\User\MapDepot;
 use App\Admin\Actions\backstage\User\Suggests;
@@ -89,6 +90,7 @@ class ConsultingOrdersController extends AdminController
             $actions->disableView();
             $actions->disableEdit();
             $actions->disableDelete();
+            $actions->add(new OrderOpinion());
         });
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();

app/Admin/Controllers/OrdersManagement/RechargeOrderController.php

@@ -36,7 +36,6 @@ class RechargeOrderController extends AdminController
             $filter->disableIdFilter();
 
             $filter->like('user.nickname','用户姓名');
-            $filter->equal('user_id', '用户id');
             $filter->equal('order_status','订单状态')->radio(
                 [
                     ''=>'不限',

app/Admin/Controllers/OrdersManagement/UserSuggestsController.php

@@ -28,15 +28,15 @@ class UserSuggestsController extends AdminController
         $grid = new Grid(new Suggest());
         $grid->disableCreateButton();
         $grid->disableActions();
-        $uesr_id = \request('order_id');
+        $order_id = \request('order_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
             $filter->equal('order_id','订单id');
         });
         $grid->column('id', __('Id'));
         $grid->column('order_id', __('订单id'));
-        $grid->column('user_id', __('用户id'));
-        $grid->column('patient_id', __('档案id'));
+        $grid->column('user.nickname', __('用户姓名'));
+        $grid->column('OrderPatient.name', __('患者姓名'));
         $grid->column('symptoms', __('病症'))->limit(20,'...');
         $grid->column('pathogen', __('病因'))->limit(20,'...');
         $grid->column('suggest', __('结论建议'))->limit(20,'...');

app/Admin/Controllers/ServiceManagement/ServiceController.php

@@ -75,9 +75,9 @@ class ServiceController extends AdminController
 
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->equal('service_type','服务类别')->select([1 => '图文', 2 => '电话', 3 => '问诊']);
+            $filter->equal('service_type','服务类别')->select([1 => '图文咨询', 2 => '电话咨询', 3 => '门诊预约']);
             $filter->equal('status','状态')->select([1=>'待审核',2 =>'已通过 ',3=>'未开通']);
-            $filter->equal('docterorganization.organization_id','机构')->select(Organization::pluck('name','id'));
+            $filter->equal('docterorganization.organization_id','机构')->select(Organization::pluck('intro','id'));
         });
         $grid->actions(function ($actions) {
             $actions->disableEdit();

app/Admin/Controllers/ServicePacksManagment/InsuranceAgreementController.php

@@ -29,6 +29,10 @@ class InsuranceAgreementController extends AdminController
         $grid->actions(function ($actions){
            $actions->disableView();
         });
+        $grid->filter(function ($filter){
+           $filter->disableIdFilter();
+           $filter->like('name','协议名称');
+        });
         $grid->column('id', __('Id'));
         $grid->column('name', __('协议名称'));
         $grid->column('content', __('协议内容'))->limit(20,'...');

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

@@ -30,6 +30,7 @@ class FeedBacksController extends AdminController
            $actions->disableEdit();
         });
         $grid->filter(function ($filter){
+            $filter->disableIdFilter();
            $filter->like('docter.nickname','名字');
            $filter->equal('docter.phone','电话');
            $filter->between('created_at', '创建时间')->datetime();

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

@@ -54,7 +54,7 @@ class UserListController extends AdminController
         $grid->filter(function ($filter){
             $filter->column(1/2, function ($filter) {
                 $filter->disableIdFilter();
-                $filter->equal('phone','手机')->mobile()->placeholder("请输入手机");
+                $filter->equal('phone','手机号码')->mobile()->placeholder("请输入手机");
                 $filter->like('nickname','用户名');
                 $filter->equal('status','用户状态')->radio([
                     ''   => '不限',
@@ -73,13 +73,23 @@ class UserListController extends AdminController
             $grid->column('avatar', __('头像'))->lightbox(['width' =>'', 'height' => 30]);
             $grid->column('nickname', __('用户名'));
             $grid->column('phone', __('手机号码'));
-            $grid->column('status', __('状态'))->using([0=>'黑名单',1=>'正常',]);
+            $grid->column('status', __('用户状态'))->using([0=>'黑名单',1=>'正常',]);
             $grid->column('balance', __('当前余额'))->display(function ($price){
                 return $price/100;
             });
-            $grid->column('created_at', __('注册时间'));
+            $grid->column('created_at', __('注册时间'))->display(function ($time){
+                if ($time == 0 ){
+                    return '';
+                }else{
+                    return $time;
+                }
+            });
             $grid->column('last_login_time', __('最后登录时间'))->display(function ($time){
-                return date("Y-m-d H:i",$time);
+                if ($time == 0 ){
+                    return '';
+                }else{
+                    return $time;
+                }
             });
         return $grid;
     }

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

@@ -2,6 +2,7 @@
 
 namespace App\Admin\Controllers\UserManagement\BmUser;
 
+use App\Admin\Actions\backstage\Orders\OrderOpinion;
 use App\Admin\Actions\backstage\Orders\ServicePack;
 use App\Models\Order;
 use Encore\Admin\Controllers\AdminController;
@@ -29,9 +30,14 @@ class UserOrdersController extends AdminController
         $uesr_id = \request('user_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-//            $filter->equal('user_id','用户id');
+            $filter->equal('user_id','用户id');
+        });
+        $grid->actions(function ($actions){
+            $actions->disableView();
+            $actions->disableEdit();
+            $actions->disableDelete();
+           $actions->add(new OrderOpinion());
         });
-        $grid->disableActions();
         $grid->model()->where('user_id',$uesr_id)->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
         $grid->column('user_id', __('用户id'))->sortable()->hide();
@@ -86,13 +92,34 @@ class UserOrdersController extends AdminController
             return $money/100;
         });
         $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/UserManagement/DocterManagement/ApproveController.php

@@ -36,6 +36,7 @@ class ApproveController extends AdminController
             $filter->like('docter.name','医生姓名');
             $filter->like('organization.name','机构名');
             $filter->equal('state', '认证状态')->select([1=>'已认证',2=>'审核驳回',3=>'待审核']);
+            $filter->equal('docter.phone', '医生电话');
             $filter->between('authentication_time', '签约时间')->datetime();
             $filter->between('authentication_end_time', '签约到期时间')->datetime();
         });

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

@@ -39,13 +39,13 @@ class DoctorManagementController extends AdminController
         $grid->disableCreateButton();
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->like('name','昵称');
+            $filter->like('name','姓名');
             $filter->equal('phone','电话');
             $filter->where(function ($query) {
                 $query->whereHas('organization',function ($query){
-                    $query->where('name','like',"%{$this->input}%");
+                    $query->where('intro','like',"%{$this->input}%");
                 });
-            },'机构名');
+            },'所属机构');
             $filter->equal('status','工作状态')->select([
                 0    => '禁用',
                 1    => '启用',

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

@@ -49,8 +49,8 @@ class UserEvaluatesController extends AdminController
 
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->like('user.nickname','用户名字');
-            $filter->like('docter.name','医生名字');
+            $filter->like('user.nickname','用户姓名');
+            $filter->like('docter.name','医生名称');
             $filter->equal('status','审核状态')->select([
                 1   => '待审核',
                 2    => '审核通过',
@@ -71,7 +71,7 @@ class UserEvaluatesController extends AdminController
         $grid->column('docter.name', __('医生名称'));
         $grid->column('content', __('评价内容'));
         $grid->column('score', __('评分'));
-        $grid->column('status', __('状态'))->using([1=>'待审核',2=>'审核通过',3=>'忽略']);
+        $grid->column('status', __('审核状态'))->using([1=>'待审核',2=>'审核通过',3=>'忽略']);
         $grid->column('audit_time', __('审核时间'))->display(function ($time){
             if($time == 0)
                 return '';

app/Admin/Controllers/WeChatProgram/UserManagement/BannerController.php

@@ -45,7 +45,7 @@ class BannerController extends AdminController
             // Add a column filter
             $type = [''=>'全部'];
             $type = array_merge($type,Banner::$_post_type);
-            $filter->equal('type', '类别')->select(Banner::$_post_type);
+            $filter->equal('type', '类型')->select(Banner::$_post_type);
 
         });
 

app/Admin/Controllers/WeChatProgram/UserManagement/IconsUserController.php

@@ -26,6 +26,10 @@ class IconsUserController extends AdminController
     {
         $grid = new Grid(new Icons());
         $grid->model()->where('type_cl','1')->orderBy('id','desc');
+        $grid->filter(function ($filter){
+           $filter->disableIdFilter();
+           $filter->like('name','功能图标名称');
+        });
         $grid->column('id', __('Id'));
         $grid->column('name', __('功能图标名称'));
         $grid->column('image', __('图片'))->lightbox(['width' =>'', 'height' => 30]);

app/Models/Suggest.php

@@ -29,7 +29,10 @@ class Suggest extends BaseModel
     {
         return $this->hasOne(Patient::class,'id','patient_id');
     }
-
+    public function OrderPatient()
+    {
+        return $this->hasOne(OrderPatient::class,'order_id','order_id');
+    }
     /**
      * 意见详情表联查
      * @return mixed