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

app/Admin/Controllers/NoticeDoctorController.php

@@ -15,7 +15,7 @@ class NoticeDoctorController extends AdminController
      *
      * @var string
      */
-    protected $title = '公告->用户';
+    protected $title = '公告->医生';
 
     /**
      * Make a grid builder.
@@ -26,7 +26,7 @@ class NoticeDoctorController extends AdminController
     {
         $grid = new Grid(new Notice());
 
-        $grid->model()->where('type','2');
+        $grid->model()->where('type','1');
         $grid->column('id', __('Id'));
         $grid->column('title', __('标题'));
         $grid->column('content', __('内容'));

app/Admin/Controllers/OpenPackController.php

@@ -28,8 +28,8 @@ class OpenPackController extends AdminController
         $grid->model()->where('product_type','6');
         $grid->column('id', __('订单ID'));
         $grid->column('user_id', __('用户ID'));
-        $grid->column('user.name','用户姓名');
-        $grid->column('patients.name', __('患者名称'));
+        $grid->column('user.nickname','用户姓名');
+        $grid->column('orderPatient.name', __('患者名称'));
         $grid->column('orderPack.service_pack_id', __('服务包ID'));
         $grid->column('orderPack.pack_name', __('服务包名称'));
         $grid->column('orderPack.pack_price', __('服务包价格'));

app/Admin/Controllers/OrdersManagement/BookingOrderController.php

@@ -28,7 +28,7 @@ class BookingOrderController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Order());
-
+        $grid->disableCreateButton();
         $grid->model()->wherein('product_type',[3,4,5]);
 
         //筛选

app/Admin/Controllers/OrdersManagement/ConsultingOrdersController.php

@@ -28,6 +28,7 @@ class ConsultingOrdersController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Order());
+        $grid->disableCreateButton();
         $grid->model()->wherein('product_type',[1,2]);
         //筛选
         $grid->filter(function ($filter){

app/Admin/Controllers/OrdersManagement/OrdersDetailsController.php

@@ -25,6 +25,7 @@ class OrdersDetailsController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Order());
+        $grid->disableCreateButton();
         $grid->disableActions();
         $grid->column('id', __('Id'));
         $grid->column('product_type', __('产品类型'))->using([

app/Admin/Controllers/OrdersManagement/RechargeOrderController.php

@@ -26,7 +26,7 @@ class RechargeOrderController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Order());
-
+        $grid->disableCreateButton();
         $grid->model()->wherein('product_type',[7]);
 
         //筛选

app/Admin/Controllers/OrdersManagement/ServicePackOrderController.php

@@ -28,6 +28,7 @@ class ServicePackOrderController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Order());
+        $grid->disableCreateButton();
         $grid->model()->wherein('product_type',[6]);
         //筛选
         $grid->filter(function ($filter){

app/Admin/Controllers/OrdersManagement/UserSuggestsController.php

@@ -26,6 +26,7 @@ class UserSuggestsController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Suggest());
+        $grid->disableCreateButton();
         $uesr_id = \request('patient_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();

app/Admin/Controllers/ServicePacksController.php

@@ -26,7 +26,6 @@ class ServicePacksController extends AdminController
     {
         $grid = new Grid(new ServicePack());
 
-        $grid->disableActions();
         $grid->column('id', __('Id'));
         $grid->column('name', __('服务包名称'));
         $grid->column('intro', __('简介'));

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

@@ -25,6 +25,7 @@ class UserBalanceLogController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new UserBalanceLog());
+        $grid->disableCreateButton();
         //根据id筛选数据
         $uesr_id = \request('user_id');
         $grid->filter(function ($filter){

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

@@ -25,6 +25,7 @@ class UserCouponsController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new UserCoupon());
+        $grid->disableCreateButton();
         $uesr_id = \request('user_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
@@ -32,39 +33,53 @@ class UserCouponsController extends AdminController
         });
         $grid->disableActions();
         $grid->column('id', __('Id'));
-        $grid->column('user_id', __('用户ID'));
-        $grid->column('order_id', __('订单'));
         $grid->column('coupon_id', __('优惠券ID'));
         $grid->column('name', __('券名称'));
+        $grid->column('icon', __('券图标'))->image('',50,50);
         $grid->column('title', __('券标题'));
-        $grid->column('desc', __('使用说明'));
-        $grid->column('rules', __('使用规则'));
-        $grid->column('icon', __('券图标'))->image();
-        $grid->column('status', __('状态'))->using([1=>'可用',2=>'已用',3=>'已过期']);
         $grid->column('type', __('类型'))->using([1=>'满减券',2=>'折扣券']);
         $grid->column('usable_type', __('可用类型'))->using([1=>'全部产品通用',2=>'部分产品可用']);
         $grid->column('money', __('满减券的优惠钱数'))->display(function ($money){
             return $money/100;
         });
-        $grid->column('discount', __('折扣'));
         $grid->column('min_consume_amount', __('最低消费金额'))->display(function ($money){
             return $money/100;
         });
+        $grid->column('discount', __('折扣'));
         $grid->column('max_reduce_amount', __('折扣券的最大抵扣金额'))->display(function ($money){
             return $money/100;
         });
         $grid->column('expire_type', __('过期类型'))->using([1=>'领取N天过期',2=>'设置固定过期时间']);
         $grid->column('effective_days', __('有效天数'));
         $grid->column('start_time', __('有效期开始时间'))->display(function ($time){
-            return date("Y-m-d H:i",$time);
+            if($time == 0)
+            {
+                return '';
+            }else
+                return date("Y-m-d H:i",$time);
         });
         $grid->column('end_time', __('有效期结束时间'))->display(function ($time){
-            return date("Y-m-d H:i",$time);
+            if($time == 0)
+            {
+                return '';
+            }else
+                return date("Y-m-d H:i",$time);
         });
         $grid->column('expire_time', __('过期时间'))->display(function ($time){
-            return date("Y-m-d H:i",$time);
+            if($time == 0)
+            {
+                return '';
+            }else
+                return date("Y-m-d H:i",$time);
+        });
+        $grid->column('use_time', __('使用时间'))->display(function ($time){
+            if($time == 0)
+            {
+                return '';
+            }else
+                return date("Y-m-d H:i",$time);
         });
-        $grid->column('use_time', __('使用时间'));
+        $grid->column('status', __('优惠券状态'))->using([1=>'可用',2=>'已用',3=>'已过期']);
         $grid->column('created_at', __('创建时间'));
         $grid->column('updated_at', __('更新时间'));
 

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

@@ -31,6 +31,7 @@ class UserListController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new User());
+        $grid->disableCreateButton();
         $grid->actions(function ($actions) {
         // 去掉删除
         $actions->disableDelete();

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

@@ -29,6 +29,7 @@ class UserPatientsController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Patient());
+        $grid->disableCreateButton();
         $uesr_id = \request('user_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();

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

@@ -30,7 +30,7 @@ class DoctorManagementController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Docter());
-
+        $grid->disableCreateButton();
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
             $filter->like('name','昵称');

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

@@ -24,6 +24,7 @@ class SignUpController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new DocterOrganization());
+        $grid->disableCreateButton();
         $docter_id = \request('docter_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();

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

@@ -27,6 +27,7 @@ class UserEvaluatesController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Evaluate());
+        $grid->disableCreateButton();
         $grid->actions(function ($actions) {
             // 去掉删除
             $actions->disableDelete();

app/Admin/Controllers/VaccinesController.php

@@ -38,6 +38,19 @@ class VaccinesController extends AdminController
             'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
         ];
+
+//        $grid->column('organizations', '机构')->display(function (){
+//            return '点击查看';
+//        })->modal('机构库存', function ($model) {
+//
+//            $comments = $model->organizations()->get()->map(function ($comment) {
+//                return $comment->only(['org_id', 'content', 'created_at']);
+//            });
+//
+//            return new Table(['ID', '内容', '发布时间'], $comments->toArray());
+//        });
+
+        $grid->column('stock','库存');
         $grid->column('states','状态')->switch($states);
         $grid->column('created_at', __('创建时间'));
         $grid->column('updated_at', __('更新时间'));
@@ -119,6 +132,7 @@ class VaccinesController extends AdminController
         $form->currency('price', __('价格'))->symbol('分');
         $form->text('remark', __('备注'))->rules('required',['required'=>'请填写备注！']);;
         $form->text('supplier', __('厂家'))->rules('required',['required'=>'请填写厂家！']);
+        $form->number('stock','库存');
         $states = [
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
             'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],

app/Models/Team.php

@@ -10,6 +10,15 @@ namespace App\Models;
 
 class Team extends BaseModel
 {
+    public function getTagsAttribute($value)
+    {
+        return explode(',', $value);
+    }
+
+    public function setTagsAttribute($value)
+    {
+        $this->attributes['member'] = implode(',', $value);
+    }
     public function TeamDocter()
     {
         return $this->belongsTo(TeamDocter::class,'team_id','id');

config/tenancy.php

@@ -88,6 +88,7 @@ return [
 
     'https' => env('ADMIN_HTTPS', true),
 
+
     /*
     |--------------------------------------------------------------------------
     | Laravel-admin auth setting