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

app/Admin/Controllers/TeamController.php

@@ -66,14 +66,27 @@ class TeamController extends AdminController
     protected function form()
     {
         $form = new Form(new Team());
+        $form->hidden('id');
         $form->text('name', __('团队名称'))->rules('required' ,['required'=>'请填写团队名称！']);
         $form->text('introduction','简介')->rules('required' ,['required'=>'请填写团队简介！']);
+        $form->multipleSelect('member',' 成员')->options(function (){
+            $member = Docter::where('is_then', 1)->pluck('name', 'id');
+//            dd($member);
+            return $member;
+
+        })->rules('required');
         $status = [
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
             'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
         ];
         $form->switch('status', __('状态'))->states($status);
+        $form->saved(function (Form $form){
+//           dd($form->member);
+            
+            dd($form->model()->id);
+
 
+        });
         return $form;
     }
 

app/Admin/Controllers/VaccinesController.php

@@ -2,6 +2,7 @@
 
 namespace App\Admin\Controllers;
 
+use App\Models\Organization;
 use App\Models\Vaccines;
 use App\Admin\Actions\Vaccines\ImportAction;
 use Encore\Admin\Controllers\AdminController;
@@ -44,11 +45,15 @@ class VaccinesController extends AdminController
             return '点击查看';
         })->modal('机构库存', function ($model) {
 
-            $comments = $model->organizationvaccines()->get()->map(function ($comment) {
-                return $comment->only(['org_id', 'stock',]);
+            $org = $model->organizationvaccines()->get()->map(function ($comment) {
+                return $comment->only(['org_id', 'stock']);
             });
-
-            return new Table(['ID', '库存', ], $comments->toArray());
+//            $id = $model->organizationvaccines()->value('org_id');
+//            $names = Organization::where('id',$id)->value('name');
+//            $comments = $org->toArray();
+//            $comments[0]['name'] = $names;
+//            dd($id);
+            return new Table(['ID', '库存' ], $org->toArray());
         });
 
         $grid->column('stock','库存');

app/Models/Organization.php

@@ -29,7 +29,7 @@ class Organization extends BaseModel
 
     public function vaccines()
     {
-        return $this->belongsToMany(Vaccines::class);
+        return $this->belongsToMany(Vaccines::class,'vaccines_id');
     }
 
     public function user()