员工添加字段-name

app/Admin/Controllers/v3/LanzuEmployeesController.php

@@ -28,13 +28,14 @@ class LanzuEmployeesController extends AdminController
             $positionList = config('role.position');
 
             $grid->column('id')->sortable();
+            $grid->column('name');
             $grid->column('market_id')->display(function($marketId) use($marketList){
                 return isset($marketList[$marketId]) ? $marketList[$marketId] : '';
             });
-            $grid->column('user_id')->display(function($userId){
-                $item = UserModel::getUserInfo($userId,'real_name');
-                return empty($item) ? '' : $item->real_name;
-            });
+            // $grid->column('user_id')->display(function($userId){
+            //     $item = UserModel::getUserInfo($userId,'real_name');
+            //     return empty($item) ? '' : $item->real_name;
+            // });
             $grid->column('store_id')->display(function($storeId){
                 $item = StoreModel::getStoreInfo($storeId,'name');
                 return empty($item) ? '' : $item->name;
@@ -74,10 +75,8 @@ class LanzuEmployeesController extends AdminController
     {
         return Show::make($id, new LanzuEmployees(), function (Show $show) {
             $show->field('id');
-            $show->field('user_id')->as(function($userId){
-                $item = UserModel::getUserInfo($userId,'real_name');
-                return empty($item) ? '' : $item->real_name;
-            });
+            $show->field('name');
+            $show->field('user_id');
             $show->field('store_id')->as(function($storeId){
                 $item = StoreModel::getStoreInfo($storeId,'name');
                 return empty($item) ? '' : $item->name;
@@ -87,7 +86,7 @@ class LanzuEmployeesController extends AdminController
                 return empty($item) ? '' : $item->name;
             });
             $show->field('position')->as(function($position){
-                $positionList = config('position.position');
+                $positionList = config('role.position');
                 $item = '';
                 if(!empty($position) && is_array($position)){
                     foreach($position as $key => $value){
@@ -126,8 +125,9 @@ class LanzuEmployeesController extends AdminController
             //     }
             // }
             $form->hidden('id');
-            // $form->select('user_id')->required()->options($userList);
             $form->number('user_id')->required()->min(0);
+            // $form->select('user_id')->required()->options($userList);
+            $form->text('name','真实姓名')->width(4)->required();
             $form->select('market_id')->required()->options($marketList);
             $form->multipleSelect('position')->required()->options(config('role.position'));
             $form->select('store_id')->options($storeList);
@@ -137,7 +137,7 @@ class LanzuEmployeesController extends AdminController
             $form->saving(function(Form $form){
                 $id = $form->getKey();
                 $userId = $form->input('user_id');
-                $store = StoreModel::select('id')->where([
+                $store = EmployeesModel::select('id')->where([
                     ['user_id','=',$userId],
                     ['id','<>',$id?$id:0],
                 ])->first();

app/Admin/Controllers/v3/StoreController.php

@@ -213,8 +213,8 @@ class StoreController extends AdminController
                 // $form->select('user_id')->options($userList)->required();
                 $form->number('admin_id')->required()->min(0);
                 $form->number('user_id')->required()->min(0);
-                $form->time('time1','时间段一开始')->format('HH:mm');
-                $form->time('time2','时间段一结束')->format('HH:mm')->rules('after:time1',['after'=>'选择的时间必须比时间段一开始时间晚']);
+                $form->time('time1','时间段一开始')->required()->format('HH:mm');
+                $form->time('time2','时间段一结束')->required()->format('HH:mm')->rules('after:time1',['after'=>'选择的时间必须比时间段一开始时间晚']);
                 $form->time('time3','时间段二开始')->format('HH:mm')->rules('after:time2',['after'=>'选择的时间必须比时间段一结束时间晚']);
                 $form->time('time4','时间段二结束')->format('HH:mm')->rules('after:time3',['after'=>'选择的时间必须比时间段二开始时间晚']);
                 // $form->timeRange('time1','time2','营业时间段一')->required();

resources/lang/zh-CN/lanzu-employees.php

@@ -9,6 +9,7 @@ return [
     'fields' => [
         'user_id' => '用户懒ID',
         'store_id' => '店铺',
+        'name' => '姓名',
         'market_id' => '服务站',
         'position' => '职位',
         'status' => '状态',