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

app/Admin/Actions/Service/RevokeAction.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Admin\Actions\Service;
+
+use App\Models\Serviceapplys;
+use Encore\Admin\Actions\RowAction;
+use Illuminate\Database\Eloquent\Model;
+
+class RevokeAction extends RowAction
+{
+    public $name = '撤销';
+
+    public function handle(Model $model)
+    {
+        // $model ...
+//        dd($this->row->id);
+        Serviceapplys::where('id',$this->row->id)->update(['status'=>3]);
+        return $this->response()->success('撤销成功')->refresh();
+    }
+
+}

app/Admin/Controllers/CdmsController.php

@@ -31,7 +31,7 @@ class CdmsController extends AdminController
         $connection = config('tenancy.database.connection');
 
         $form->display('id', 'ID');
-        $form->text('username', trans('tenancy.username'))
+        $form->text('username', trans('tenancy.login_account'))
             ->creationRules(['required', "unique:{$connection}.{$userTable}"])
             ->updateRules(['required', "unique:{$connection}.{$userTable},username,{{id}}"]);
 

app/Admin/Controllers/CouponManagement/CouponManagementController.php

@@ -45,7 +45,7 @@ class CouponManagementController extends AdminController
         $grid->column('id', __('Id'));
         $grid->column('name', __('劵名称'));
         $grid->column('title', __('劵标题'));
-        $grid->column('icon', __('券图标'))->image('',100,100);
+        $grid->column('icon', __('券图标'))->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('type', __('类型'))->using([1=>'满减券',2=>'折扣券']);
         $grid->column('usable_type', __('可用类型'))->using([1=>'全部产品通用',2=>'部分产品可用']);
         $grid->column('CouponType', __('可用产品'))->pluck('product_type','id')->display(function ($i){

app/Admin/Controllers/OrganizationController.php

@@ -28,9 +28,29 @@ class OrganizationController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Organization());
-
+        $grid->filter(function ($filter){
+           $filter->disableIdFilter();
+            $filter->column(1/2, function ($filter) {
+                $filter->equal('type','机构类型')->select([
+                    1=>'公立医院',
+                    2=>'私立医院'
+                ]);
+                $filter->equal('level','机构级别')->select([
+                    0=>'未定级',
+                    1=>'一级',
+                    2=>'二级',
+                    3=>'三级'
+                ]);
+            });
+            $filter->column(1/2, function ($filter) {
+                $filter->equal('province_id','省份')->select(Area::where('level',1)->pluck('name','id'));
+                $filter->equal('city_id','城市')->select(Area::where('level',2)->pluck('name','id'));
+                $filter->equal('area_id','地区')->select(Area::where('level',3)->pluck('name','id'));
+            });
+        });
         $grid->column('id', __('Id'));
-        $grid->column('type', __('类型'));
+        $grid->column('type', __('机构类型'))->using([1=>'公立医院',2=>'私立医院']);
+        $grid->column('level', __('机构级别'))->using([0=>'未定级',1=>'一级',2=>'二级',3=>'三级']);
         $grid->column('name', __('名称'));
         $grid->column('province_id', __('省份'))->display(function ($id){
             return Area::where('id',$id)->value('name');
@@ -92,7 +112,16 @@ class OrganizationController extends AdminController
     {
         $form = new Form(new Organization());
 
-        $form->select('type', __('类型'))->options(Organization::getType())->required();
+        $form->select('type', __('机构类型'))->options([
+            1=>'公立医院',
+            2=>'私立医院'
+        ])->required();
+        $form->select('level', __('机构级别'))->options([
+            0=>'未定级',
+            1=>'一级',
+            2=>'二级',
+            3=>'三级',
+        ])->required();
         $form->text('name', __('名称'))->required();
         $form->select('province_id', __('省份'))->options(function (){
             return Area::where('level',1)->pluck('name','id');

app/Admin/Controllers/ServiceManagement/ServiceController.php

@@ -4,6 +4,7 @@ namespace App\Admin\Controllers\ServiceManagement;
 
 use App\Admin\Actions\Service\ApplysAction;
 use App\Admin\Actions\Service\RefuseAction;
+use App\Admin\Actions\Service\RevokeAction;
 use App\Models\Docter;
 use App\Models\DocterLabel;
 use App\Models\Order;
@@ -44,6 +45,7 @@ class ServiceController extends AdminController
         $grid->column('ondocter.avatar', __('头像'))->image('',50,50);
         $grid->column('ondocter.id', __('医生ID'));
         $grid->column('ondocter.name','医生名称');
+        $grid->column('service_type','服务类别')->using([1=>'图文咨询',2=>'电话咨询',3=>'门诊预约'])->label('default');
         $grid->column('ondocter.sex','性别')->using([1=>'男',2=>'女']);
         $grid->column('docterorganization', __('所属机构'))->pluck('organization_id')->display(function ($organization){
             $value = Organization::whereIn('id',$organization->toArray())->pluck('name')->toArray();
@@ -71,11 +73,6 @@ class ServiceController extends AdminController
         $grid->filter(function ($filter){
             $filter->equal('service_type','服务类型')->select([1 => '图文', 2 => '电话', 3 => '问诊']);
             $filter->equal('status','服务类型')->select([1=>'待审核',2 =>'已通过 ',3=>'已拒绝']);
-//            $filter->where(function ($query) {
-//                $query->whereHas('organization',function ($query){
-//                    $query->where('name','like',"%{$this->input}%");
-//                });
-//            },'机构名');
             $filter->equal('docterorganization.organization_id','机构')->select(Organization::pluck('name','id'));
         });
         $grid->actions(function ($actions) {
@@ -86,6 +83,10 @@ class ServiceController extends AdminController
                 $actions->add(new ApplysAction());
                 $actions->add(new RefuseAction());
             }
+            if ($actions->row->status == 2)
+            {
+                $actions->add(new RevokeAction());
+            }
         });
         return $grid;
     }

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

@@ -73,6 +73,7 @@ class UserListController extends AdminController
         });
             $grid ->model()->where('status','>=','0');
             $grid->column('id', __('用户id'))->sortable();
+            $grid->column('avatar', __('头像'))->lightbox(['width' =>'', 'height' => 30]);
             $grid->column('nickname', __('用户名'));
             $grid->column('phone', __('手机号码'));
             $grid->column('status', __('状态'))->using([0=>'黑名单',1=>'正常',]);

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

@@ -37,20 +37,12 @@ class UserPatientsController extends AdminController
             $filter->equal('id','患者id');
             $filter->like('name','患者姓名');
         });
-        $grid->actions(function ($actions) {
-            // 去掉删除
-            $actions->disableDelete();
-            // 去掉编辑
-            $actions->disableEdit();
-            //服务包
-//            $actions->add(new service());
-
-        });
-        $grid->column('id', __('档案id'));
+        $grid->disableActions();
+        $grid->column('id', __('患者id'));
         $grid->column('user_id', __('用户id'));
         $grid->column('name', __('患者姓名'));
         $grid->column('sex', __('性别'))->using([0=>'未知',1=>'男',2=>'女',]);
-        $grid->column('avatar', __('头像'))->image("",'',50);
+        $grid->column('avatar', __('头像'))->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('age', __('年龄'));
         $grid->column('email', __('邮箱'));
         $grid->column('phone', __('联系电话'));

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

@@ -40,13 +40,13 @@ class ApproveController extends AdminController
         $grid->column('id', __('Id'));
         $grid->column('docter.id', __('医生ID'));
         $grid->column('docter.name', __('医生姓名'));
-        $grid->column('docter.avatar', __('医生头像'))->image(50,50);
+        $grid->column('docter.avatar', __('医生头像'))->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('docter.sex', __('性别'))->using([0=>'未知',1=>'男',2=>'女']);
         $grid->column('organization.name', __('机构'));
         $grid->column('office.name', __('科室'));
         $grid->column('qualification.name', __('医生资质'));
         $grid->column('remarks', __('备注'));
-        $grid->column('state', __('认证状态'))->using([1=>'已认证',2=>'审核驳回',3=>'待审核']);
+        $grid->column('state', __('认证状态'))->using([1=>'已认证',2=>'审核驳回',3=>'待审核'])->label('info');
         $grid->column('authentication_time', __('签约时间'))->display(function ($time){
             if ($time == 0){
                 return '';

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

@@ -63,7 +63,7 @@ class DoctorManagementController extends AdminController
         });
         $grid->column('id', __('Id'))->sortable();
         $grid->column('name', __('姓名'));
-        $grid->column('avatar', __('头像'))->image('',50,50);
+        $grid->column('avatar', __('头像'))->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('phone', __('电话'));
         $grid->column('score', __('评分'));
         $grid->column('service_persons', __('服务人数'));

composer.json

@@ -12,6 +12,7 @@
         "encore/laravel-admin": "1.*",
         "fideloper/proxy": "^4.0",
         "jxlwqq/wang-editor2": "^1.0",
+        "laravel-admin-ext/grid-lightbox": "^1.0",
         "laravel-admin-ext/latlong": "1.x",
         "laravel-admin-ext/multitenancy": "^2.1",
         "laravel/framework": "^6.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7409500d3fafcd889b08474a021a9d13",
+    "content-hash": "25742195beec021de3cb3346cb03e874",
     "packages": [
         {
             "name": "dnoegel/php-xdg-base-dir",
@@ -1159,6 +1159,71 @@
             },
             "time": "2018-12-04T04:15:44+00:00"
         },
+        {
+            "name": "laravel-admin-ext/grid-lightbox",
+            "version": "v1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel-admin-extensions/grid-lightbox.git",
+                "reference": "f8a247f0d017eb05830cc720fb621401b1bfbc2c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel-admin-extensions/grid-lightbox/zipball/f8a247f0d017eb05830cc720fb621401b1bfbc2c",
+                "reference": "f8a247f0d017eb05830cc720fb621401b1bfbc2c",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "encore/laravel-admin": "~1.6",
+                "php": ">=7.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~6.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Encore\\Grid\\Lightbox\\LightboxServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Encore\\Grid\\Lightbox\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "song",
+                    "email": "zosong@126.com"
+                }
+            ],
+            "description": "Turn your grid into a lightbox & gallery",
+            "homepage": "https://github.com/laravel-admin-ext/grid-lightbox",
+            "keywords": [
+                "extension",
+                "gallery",
+                "grid",
+                "laravel-admin",
+                "lightbox"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel-admin-extensions/grid-lightbox/issues",
+                "source": "https://github.com/laravel-admin-extensions/grid-lightbox/tree/v1.0.3"
+            },
+            "time": "2019-10-11T06:38:51+00:00"
+        },
         {
             "name": "laravel-admin-ext/latlong",
             "version": "v1.2.4",

config/admin.php

@@ -396,6 +396,10 @@ return [
     |
     */
     'extensions' => [
+        'grid-lightbox' => [
+            // Set to `false` if you want to disable this extension
+            'enable' => true,
+            ],
         'latlong' => [
 
             // Whether to enable this extension, defaults to true

resources/lang/zh-CN/tenancy.php

@@ -111,5 +111,6 @@ return [
     'index' => '列表',
     'store' => '保存',
     'update' => '更新',
+    'login_account' =>'登录账号',
 ];