Merge branch 'master' of http://git.imohe.com/zhaozengyu/tzt-admin

app/Admin/Controllers/DoctorController.php

@@ -126,6 +126,7 @@ protected function form()
                 $form->textarea('introduction')->required();
                 $form->textarea('introduction')->required();
                 $form->display('user_id');
                 $form->display('user_id');
                 $form->switch('status');
                 $form->switch('status');
+                $form->switch('is_auto');
 
 
                 $form->display('created_at');
                 $form->display('created_at');
                 $form->display('updated_at');
                 $form->display('updated_at');

app/Admin/Controllers/DoctorCorrectionController.php

@@ -4,6 +4,7 @@
 
 
 use App\Admin\Repositories\DoctorCorrectionRepository;
 use App\Admin\Repositories\DoctorCorrectionRepository;
 use App\Models\DoctorCorrectionModel;
 use App\Models\DoctorCorrectionModel;
+use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
 
 
@@ -25,7 +26,7 @@ protected function grid()
             // $grid->column('doctor_id');
             // $grid->column('doctor_id');
             $grid->column('doctor_name');
             $grid->column('doctor_name');
             $grid->column('content');
             $grid->column('content');
-            // $grid->column('created_at');
+            $grid->column('created_at');
             // $grid->column('updated_at')->sortable();
             // $grid->column('updated_at')->sortable();
 
 
             $grid->filter(function (Grid\Filter $filter) {
             $grid->filter(function (Grid\Filter $filter) {
@@ -44,4 +45,20 @@ protected function grid()
             $grid->disableBatchActions(); // 禁用批量操作
             $grid->disableBatchActions(); // 禁用批量操作
         });
         });
     }
     }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new DoctorCorrectionRepository(), function (Form $form) {
+            $form->switch('is_handle')->width(4);
+
+            // 右上角按钮控制
+            $form->disableDeleteButton(); // 去掉删除按钮
+            $form->disableViewButton(); // 去掉跳转详情页按钮
+        });
+    }
 }
 }

app/Admin/Controllers/PharmacyController.php

@@ -131,6 +131,7 @@ protected function form()
                 if ($form->isEditing()) {
                 if ($form->isEditing()) {
                     $form->switch('status');
                     $form->switch('status');
                 }
                 }
+                $form->switch('is_auto');
 
 
                 $form->display('created_at');
                 $form->display('created_at');
                 $form->display('updated_at');
                 $form->display('updated_at');

app/Admin/Controllers/PharmacyCorrectionController.php

@@ -4,6 +4,7 @@
 
 
 use App\Admin\Repositories\PharmacyCorrectionRepository;
 use App\Admin\Repositories\PharmacyCorrectionRepository;
 use App\Models\PharmacyCorrectionModel;
 use App\Models\PharmacyCorrectionModel;
+use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
 
 
@@ -20,12 +21,12 @@ protected function grid()
         return Grid::make(new PharmacyCorrectionRepository(), function (Grid $grid) {
         return Grid::make(new PharmacyCorrectionRepository(), function (Grid $grid) {
             $grid->model()->orderBy('id', 'DESC');
             $grid->model()->orderBy('id', 'DESC');
 
 
-            $grid->column('id')->sortable();
+            $grid->column('id');
             // $grid->column('pharmacy_id');
             // $grid->column('pharmacy_id');
+            $grid->column('is_handle')->switch();
             $grid->column('pharmacy_name');
             $grid->column('pharmacy_name');
-            $grid->column('is_handle');
             $grid->column('content');
             $grid->column('content');
-            // $grid->column('created_at');
+            $grid->column('created_at');
             // $grid->column('updated_at')->sortable();
             // $grid->column('updated_at')->sortable();
 
 
             $grid->filter(function (Grid\Filter $filter) {
             $grid->filter(function (Grid\Filter $filter) {
@@ -44,4 +45,20 @@ protected function grid()
             $grid->disableBatchActions(); // 禁用批量操作
             $grid->disableBatchActions(); // 禁用批量操作
         });
         });
     }
     }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new PharmacyCorrectionRepository(), function (Form $form) {
+            $form->switch('is_handle')->width(4);
+
+            // 右上角按钮控制
+            $form->disableDeleteButton(); // 去掉删除按钮
+            $form->disableViewButton(); // 去掉跳转详情页按钮
+        });
+    }
 }
 }

lang/zh_CN/doctor.php

@@ -22,6 +22,7 @@
         'status' => '启用',
         'status' => '启用',
         'mobile' => '手机号',
         'mobile' => '手机号',
         'user_id' => '关联用户',
         'user_id' => '关联用户',
+        'is_auto' => '自动开方',
     ],
     ],
     'options' => [
     'options' => [
     ],
     ],

lang/zh_CN/pharmacy.php

@@ -21,6 +21,7 @@
         'status' => '启用',
         'status' => '启用',
         'user_id' => '关联用户',
         'user_id' => '关联用户',
         'is_open' => '开店状态',
         'is_open' => '开店状态',
+        'is_auto' => '自动审方',
     ],
     ],
     'options' => [
     'options' => [
     ],
     ],