计免修改

app/Admin/Controllers/VaccinesManagement/VaccinesController.php

@@ -37,19 +37,20 @@ class VaccinesController extends AdminController
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
         ];
 
-        $grid->column('organizations', '机构')->display(function (){
+        $grid->column('organizations', '机构库存')->display(function (){
             return '点击查看';
         })->modal('机构库存', function ($model) {
             $org = $model->organizationvaccines()->get()->map(function ($comment) {
-                return $comment->only(['org_id', 'stock']);
+                return $comment->only(['org_id','vaccine_id','stock']);
             });
             $org = $org->toArray();
             for($i=0;$i<count($org);$i++)
             {
                 $id = $org[$i]['org_id'];
+                $org[$i]['vaccine_id'] = $this->name;
                 $org[$i]['org_name'] = Organization::where('id',$id)->value('name');
             }
-            return new Table(['ID', '库存' ,'机构名称'], $org);
+            return new Table(['ID','疫苗','库存','机构名称'], $org);
         });
 
         $grid->column('kc','库存');
@@ -143,7 +144,7 @@ class VaccinesController extends AdminController
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
             'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
         ];
-        $form->switch('states','状态')->states($states);
+        $form->switch('states','状态')->states($states)->default(1);
         $form->saving(function ($f){
             $f->price *=100;
         });

app/Community/Controllers/DocterChatController.php

@@ -36,6 +36,8 @@ class DocterChatController extends AdminController
         $user = Admin::user();
         $org_id = $user->org_id;
         $docter_id = $user->docter_id;
+        $grid->model()->orderByDesc('id');
+
         $is_admin = Admin::user()->inRoles(['administrator','devloper']);
         $grid->batchActions(function ($batch) {
             $batch->add(new sendNotice());

app/Community/Controllers/Vaccine/OrganizationVaccineController.php

@@ -30,18 +30,18 @@ class OrganizationVaccineController extends AdminController
         $grid = new Grid(new OrganizationVaccine());
 
         $org_id = Admin::user()->org_id;
+
         if($org_id){
             $grid->model()->where(['org_id'=>$org_id]);
         }
         $grid->disableCreateButton(false);
 
-
         $is_admin = Admin::user()->isAdministrator();
-        $grid->filter(function ($fliter) use ($is_admin) {
+        $grid->filter(function ($fliter) use ($is_admin,$org_id) {
             if($is_admin){
                 $fliter->equal('organization.name','机构')->select(Organization::pluck('name','id'));
             }
-            $fliter->like('vaccine.name','疫苗')->select(Vaccine::pluck('name','id'));
+            $fliter->like('vaccine.name','疫苗')->select(Vaccine::where(['org_id'=>$org_id])->pluck('name','id'));
         });
 
 
@@ -108,20 +108,20 @@ class OrganizationVaccineController extends AdminController
         });
         $where = [];
         if(!empty($org_id)){
-            $where = ['id'=>$org_id];
+            $where = ['org_id'=>$org_id];
         }
         if($is_admin){
             if($form->isEditing()){
-                $form->select('org_id','机构')->options(Organization::where($where)->pluck('name','id'))->readOnly();
-                $form->select('vaccine_id', __('疫苗'))->options(Vaccine::pluck('name','id'))->readOnly();
+                $form->select('org_id','机构')->options(Organization::where(['id'=>$org_id])->pluck('name','id'))->readOnly();
+                $form->select('vaccine_id', __('疫苗'))->options(Vaccine::where($where)->pluck('name','id'))->readOnly();
                 $form->select('type', __('疫苗类型'))->options(OrganizationVaccine::getType())->when(1,function () use($form){
                     $form->hidden('price','价格')->value(0);
                 })->when(2,function () use($form){
                     $form->text('price','价格');
                 });
             } else {
-                $form->select('org_id','机构')->options(Organization::where($where)->pluck('name','id'));
-                $form->select('vaccine_id', __('疫苗'))->options(Vaccine::pluck('name','id'));
+                $form->select('org_id','机构')->options(Organization::where(['id'=>$org_id])->pluck('name','id'));
+                $form->select('vaccine_id', __('疫苗'))->options(Vaccine::where($where)->pluck('name','id'));
                 $form->select('type', __('疫苗类型'))->options(OrganizationVaccine::getType())->when(1,function () use($form){
                     $form->hidden('price','价格')->value(0);
                 })->when(2,function () use($form){

app/Community/Controllers/VaccineController.php

@@ -32,25 +32,29 @@ class VaccineController extends AdminController
     {
         $grid = new Grid(new Vaccine());
         $grid->model()->orderByDesc('id');
+        $org_id = Admin::user()->org_id;
+        if(!empty($org_id)){
+            $grid->model()->where(['org_id'=>$org_id]);
+        }
 
         $grid->disableCreateButton(false);
         $grid->column('id', __('ID'));
         $grid->column('name', __('疫苗名称'));
-        $grid->column('organizations', '机构库存')->display(function (){
-            return '点击查看';
-        })->modal('机构库存', function ($model) {
-            $org = $model->organizationvaccines()->get()->map(function ($comment) {
-                return $comment->only(['org_id','vaccine_id','stock']);
-            });
-            $org = $org->toArray();
-            for($i=0;$i<count($org);$i++)
-            {
-                $id = $org[$i]['org_id'];
-                $org[$i]['vaccine_id'] = $this->name;
-                $org[$i]['org_name'] = Organization::where('id',$id)->value('name');
-            }
-            return new Table(['ID','疫苗','库存','机构名称'], $org);
-        });
+//        $grid->column('organizations', '机构库存')->display(function (){
+//            return '点击查看';
+//        })->modal('机构库存', function ($model) {
+//            $org = $model->organizationvaccines()->get()->map(function ($comment) {
+//                return $comment->only(['org_id','vaccine_id','stock']);
+//            });
+//            $org = $org->toArray();
+//            for($i=0;$i<count($org);$i++)
+//            {
+//                $id = $org[$i]['org_id'];
+//                $org[$i]['vaccine_id'] = $this->name;
+//                $org[$i]['org_name'] = Organization::where('id',$id)->value('name');
+//            }
+//            return new Table(['ID','疫苗','库存','机构名称'], $org);
+//        });
         $grid->column('stocks', __('剩余库存'))->display(function (){
             return OrganizationVaccine::where(['vaccine_id'=>$this->id])->sum('stock');
         });
@@ -110,17 +114,23 @@ class VaccineController extends AdminController
 
         $orglist = Organization::pluck('name','id');
         $org_id = Admin::user()->org_id;
-        if($org_id){
-            $orglist = Organization::where(['id'=>$org_id])->pluck('name','id');
-        }
+//        if($org_id){
+//            $orglist = Organization::where(['id'=>$org_id])->pluck('name','id');
+//        }
 //        $form->editing(function ($f){
 //            $f->model()->price /= 100;
 //        });
+        $form->hidden('org_id', __('类型'))->value($org_id);
 //        $form->select('type', __('类型'))->options([1=>'一类',2=>'二类'])->default(1);
 //        $form->select('org_id','机构')->options($orglist)->rules('required',['requried'=>'请选择机构']);
-        $form->text('name', __('疫苗名称'))->creationRules(['required', "unique:vaccines"])
-            ->updateRules(['required', "unique:vaccines,name,{{id}}"]);
-        $form->hidden('states')->value(1);
+        $form->text('name', __('疫苗名称'))->rules('required',['required'=>'请输入疫苗']);
+//        $form->text('name', __('疫苗名称'))->creationRules(['required', "unique:vaccines"])
+//            ->updateRules(['required', "unique:vaccines,name,{{id}}"]);
+        $states = [
+            'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
+            'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
+        ];
+        $form->switch('states','状态')->states($states)->default(1);
 //        $form->text('stock', __('库存'))->rules('required',['requried'=>'请填写库存']);
 //        $form->textarea('remark', __('备注'));
 //        $form->saving(function ($form){