药师代码调整

app/Admin/Controllers/DoctorController.php

@@ -39,7 +39,7 @@ protected function grid()
             // $grid->column('introduction');
             // $grid->column('introduction');
             $grid->column('signed_pic')->image('', 50, 50);
             $grid->column('signed_pic')->image('', 50, 50);
             $grid->column('status')->switch();
             $grid->column('status')->switch();
-            $grid->column('user.openid');
+            $grid->column('user.openid', '关联用户');
             $grid->column('created_at');
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
             $grid->column('updated_at')->sortable();
 
 

app/Admin/Controllers/PatientController.php

@@ -33,8 +33,8 @@ protected function grid()
             });
             });
             $grid->column('mobile');
             $grid->column('mobile');
             $grid->column('is_default')->using([0 => '否', 1 => '是']);
             $grid->column('is_default')->using([0 => '否', 1 => '是']);
-            $grid->column('user.id', '用户');
-            $grid->column('pharmacy.name', '药店');
+            $grid->column('user.id', '关联用户');
+            $grid->column('pharmacy.name', '关联药店');
 
 
             // 快捷搜索
             // 快捷搜索
             $grid->quickSearch(['name', 'id_card', 'mobile'])->placeholder('请输入[姓名/身份证/手机号]')->width(25);
             $grid->quickSearch(['name', 'id_card', 'mobile'])->placeholder('请输入[姓名/身份证/手机号]')->width(25);

app/Admin/Controllers/PharmacistController.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 namespace App\Admin\Controllers;
 
 
 use App\Admin\Repositories\PharmacistRepository;
 use App\Admin\Repositories\PharmacistRepository;
+use App\Models\PharmacyModel;
 use Carbon\Carbon;
 use Carbon\Carbon;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Form;
@@ -29,7 +30,7 @@ public function __construct(Request $request)
      */
      */
     protected function grid()
     protected function grid()
     {
     {
-        return Grid::make(new PharmacistRepository(), function (Grid $grid) {
+        return Grid::make(new PharmacistRepository('pharmacy'), function (Grid $grid) {
             Admin::style(
             Admin::style(
                 <<<'CSS'
                 <<<'CSS'
         .nav-tabs {
         .nav-tabs {
@@ -68,10 +69,11 @@ protected function grid()
             $grid->column('signed_pic')->image('', 50, 50);
             $grid->column('signed_pic')->image('', 50, 50);
             $grid->column('mobile');
             $grid->column('mobile');
             $grid->column('practicing_license_expired_time');
             $grid->column('practicing_license_expired_time');
+            $grid->column('pharmacy.name', '关联药店');
             // $grid->column('practicing_license')->image('', 50, 50);
             // $grid->column('practicing_license')->image('', 50, 50);
             // $grid->column('physician_license')->image('', 50, 50);
             // $grid->column('physician_license')->image('', 50, 50);
-            $grid->column('created_at');
-            $grid->column('updated_at')->sortable();
+            // $grid->column('created_at');
+            // $grid->column('updated_at')->sortable();
 
 
             // 快捷搜索
             // 快捷搜索
             $grid->quickSearch(['name', 'mobile', 'id_card'])->placeholder('请输入[姓名|手机号|身份证号码]')->width(25);
             $grid->quickSearch(['name', 'mobile', 'id_card'])->placeholder('请输入[姓名|手机号|身份证号码]')->width(25);
@@ -138,6 +140,7 @@ protected function form()
             $form->date('practicing_license_expired_time')->width(4);
             $form->date('practicing_license_expired_time')->width(4);
             $form->image('physician_license')->accept('jpg,png,jpeg')->uniqueName()->autoUpload()->retainable()->removable(false)->width(4);
             $form->image('physician_license')->accept('jpg,png,jpeg')->uniqueName()->autoUpload()->retainable()->removable(false)->width(4);
             $form->image('signed_pic')->accept('jpg,png,jpeg')->uniqueName()->autoUpload()->retainable()->removable(false)->width(4);
             $form->image('signed_pic')->accept('jpg,png,jpeg')->uniqueName()->autoUpload()->retainable()->removable(false)->width(4);
+            $form->select('pharmacy_id')->options(PharmacyModel::all()->pluck('name', 'id'))->width(4);
             $form->switch('status')->width(4);
             $form->switch('status')->width(4);
 
 
             $form->display('created_at')->width(4);
             $form->display('created_at')->width(4);

app/Admin/Controllers/PharmacyController.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 namespace App\Admin\Controllers;
 
 
 use App\Admin\Repositories\PharmacyRepository;
 use App\Admin\Repositories\PharmacyRepository;
+use App\Models\User;
 use Dcat\Admin\Form;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
@@ -18,7 +19,7 @@ class PharmacyController extends AdminController
      */
      */
     protected function grid()
     protected function grid()
     {
     {
-        return Grid::make(new PharmacyRepository(), function (Grid $grid) {
+        return Grid::make(new PharmacyRepository('user'), function (Grid $grid) {
             $grid->model()->orderBy('id', 'desc');
             $grid->model()->orderBy('id', 'desc');
 
 
             $grid->column('id')->sortable();
             $grid->column('id')->sortable();
@@ -36,6 +37,7 @@ protected function grid()
             $grid->column('mobile');
             $grid->column('mobile');
             // $grid->column('lng');
             // $grid->column('lng');
             // $grid->column('lat');
             // $grid->column('lat');
+            $grid->column('user.openid');
             $grid->column('created_at');
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
             $grid->column('updated_at')->sortable();
 
 
@@ -112,6 +114,7 @@ protected function form()
             $form->mobile('mobile')->width(4);
             $form->mobile('mobile')->width(4);
             $form->text('business_hours')->width(4);
             $form->text('business_hours')->width(4);
             $form->map('lat', 'lng', '经纬度坐标');
             $form->map('lat', 'lng', '经纬度坐标');
+            $form->select('user_id')->options(User::all()->pluck('openid', 'id'))->width(4);
             $form->switch('status')->width(4);
             $form->switch('status')->width(4);
 
 
             $form->display('created_at')->width(4);
             $form->display('created_at')->width(4);

lang/zh_CN/doctor.php

@@ -21,7 +21,7 @@
         'signed_pic' => '签名照',
         'signed_pic' => '签名照',
         'status' => '启用',
         'status' => '启用',
         'mobile' => '手机号',
         'mobile' => '手机号',
-        'user_id' => '用户',
+        'user_id' => '关联用户',
     ],
     ],
     'options' => [
     'options' => [
     ],
     ],

lang/zh_CN/patient.php

@@ -11,8 +11,8 @@
         'id_card' => '身份证号',
         'id_card' => '身份证号',
         'mobile' => '手机号',
         'mobile' => '手机号',
         'is_default' => '默认问诊人',
         'is_default' => '默认问诊人',
-        'pharmacy_id' => '药店',
-        'user_id' => '用户',
+        'pharmacy_id' => '关联药店',
+        'user_id' => '关联用户',
     ],
     ],
     'options' => [
     'options' => [
     ],
     ],

lang/zh_CN/pharmacist.php

@@ -14,6 +14,7 @@
         'physician_license' => '执业资格证书',
         'physician_license' => '执业资格证书',
         'signed_pic' => '签名照',
         'signed_pic' => '签名照',
         'status' => '启用',
         'status' => '启用',
+        'pharmacy_id' => '关联药店',
     ],
     ],
     'options' => [
     'options' => [
     ],
     ],

lang/zh_CN/pharmacy.php

@@ -19,6 +19,7 @@
         'lng' => '经度',
         'lng' => '经度',
         'lat' => '纬度',
         'lat' => '纬度',
         'status' => '启用',
         'status' => '启用',
+        'user_id' => '关联用户',
     ],
     ],
     'options' => [
     'options' => [
     ],
     ],