Merge branch 'master' of http://git.9026.com/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/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/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