优化

app/Admin/Actions/Community/Docter/Failed.php

@@ -22,9 +22,11 @@ class Failed extends RowAction
             DocterOrganization::where('id',$this->row->id)->update(['state'=>2]);
             $docter_id = $this->row->docter_id;
             Docter::where(['id'=>$docter_id])->update(['is_then'=>0]);
+            DB::commit();
         } catch (Exception $e){
-            return $this->response->error('操作失败');
+            DB::rollBack();
+            return $this->response()->error('操作失败');
         }
-        return $this->response->success('操作成功')->refresh();
+        return $this->response()->success('操作成功')->refresh();
     }
 }

app/Community/Controllers/DocterVerifyController.php

@@ -41,7 +41,7 @@ class DocterVerifyController extends AdminController
         $grid->column('docter.card_id', __('身份证号'));
         $grid->column('office.name', __('认证科室'));
         $grid->column('qualification.name', __('认证资质'));
-        $grid->column('state', __('状态'))->using(['待审核','已认证','认证失败','审核中'])->label(['info','success','error','info']);
+        $grid->column('state', __('状态'))->using(['待审核','已认证','审核驳回','审核中'])->label(['info','success','danger','info']);
 
         $grid->actions(function($actions){
             $actions->disableDelete();

app/Community/Controllers/Vaccine/OrganizationVaccineController.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Community\Controllers\Vaccine;
+
+use App\Models\Organization;
+use App\Models\OrganizationVaccine;
+use App\Models\Vaccine;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Facades\Admin;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+
+class OrganizationVaccineController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '机构疫苗';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new OrganizationVaccine());
+
+        $org_id = Admin::user()->org_id;
+        if($org_id){
+            $grid->model()->where(['org_id'=>$org_id]);
+        }
+        $grid->disableCreateButton(false);
+
+        $grid->column('id', __('Id'));
+        $grid->column('organization.name', __('机构'));
+        $grid->column('vaccine.name', __('疫苗'));
+        $grid->column('stock', __('库存'));
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+
+        return $grid;
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        $show = new Show(OrganizationVaccine::findOrFail($id));
+
+        $show->field('id', __('Id'));
+        $show->field('org_id', __('Org id'));
+        $show->field('vaccine_id', __('Vaccine id'));
+        $show->field('stock', __('Stock'));
+        $show->field('created_at', __('Created at'));
+        $show->field('updated_at', __('Updated at'));
+
+        return $show;
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        $form = new Form(new OrganizationVaccine());
+        $is_admin = Admin::user()->isAdministrator();
+        if($is_admin){
+            if($form->isEditing()){
+                $form->select('org_id','机构')->options(Organization::pluck('name','id'))->disable();
+            } else {
+                $form->select('org_id','机构')->options(Organization::pluck('name','id'));
+            }
+        } else {
+            $form->hidden('org_id')->value(Admin::user()->org_id);
+        }
+        $form->select('vaccine_id', __('疫苗'))->options(Vaccine::pluck('name','id'));
+        $form->text('stock', __('库存'))->rules('required',['required'=>'请输入库存']);
+
+        return $form;
+    }
+}

app/Community/routes.php

@@ -17,6 +17,9 @@ Route::resource('docter_verifies', DocterVerifyController::class);
 Route::resource('cdms_roles', PermissionController::class);
 Route::resource('docter_account', DocterAccountController::class);
 Route::resource('docter_chats', DocterChatController::class);
+
+Route::resource('organization_vaccines', Vaccine\OrganizationVaccineController::class);
+//服务管理
 Route::resource('services', ServiceController::class);
 Route::resource('orgservice', OrganizationController::class);
 Route::resource('nurse_ervice', NurseServiceController::class);
@@ -30,7 +33,6 @@ Route::resource('user_notices', UserNoticeController::class);
 Route::get('schedule', 'ScheduleController@index');
 Route::get('schedule_view', 'ScheduleController@schedule');
 
-//
 
 Route::get('send_notices', 'NoticeController@send');
 Route::resource('/docter_chats', DocterChatController::class);
@@ -49,7 +51,5 @@ Route::get('/setDocChedule', 'ApiController@setDocChedule');
 Route::get('/getScheduleInfo', 'ApiController@getScheduleInfo');
 
 
-Route::get('/getChatOrder', 'ScheDuleController@get_chat_order');
-
 
 

app/Models/OrganizationVaccine.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OrganizationVaccine extends Model
+{
+    public function organization()
+    {
+        return $this->hasOne(Organization::class,'id','org_id');
+    }
+
+    public function vaccine()
+    {
+        return $this->hasOne(Vaccine::class,'id','vaccine_id');
+    }
+}