Browse Source

Merge branch 'develop' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat into develop

master
lanzu_qinsheng 5 years ago
parent
commit
93d8236c52
  1. 5
      app/Admin/Controllers/v3/LanzuEmployeesController.php
  2. 2
      app/Admin/Controllers/v3/ServicePersonnelController.php
  3. 1
      resources/lang/zh-CN/lanzu-employees.php

5
app/Admin/Controllers/v3/LanzuEmployeesController.php

@ -29,6 +29,7 @@ class LanzuEmployeesController extends AdminController
$grid->column('id')->sortable(); $grid->column('id')->sortable();
$grid->column('name'); $grid->column('name');
$grid->column('tel');
$grid->column('user_id'); $grid->column('user_id');
$grid->column('market_id')->display(function($marketId) use($marketList){ $grid->column('market_id')->display(function($marketId) use($marketList){
return isset($marketList[$marketId]) ? $marketList[$marketId] : ''; return isset($marketList[$marketId]) ? $marketList[$marketId] : '';
@ -73,6 +74,7 @@ class LanzuEmployeesController extends AdminController
return Show::make($id, new LanzuEmployees(), function (Show $show) { return Show::make($id, new LanzuEmployees(), function (Show $show) {
$show->field('id'); $show->field('id');
$show->field('name'); $show->field('name');
$show->field('tel');
$show->field('user_id'); $show->field('user_id');
$show->field('store_id')->as(function($storeId){ $show->field('store_id')->as(function($storeId){
$item = StoreModel::getStoreInfo($storeId,'name'); $item = StoreModel::getStoreInfo($storeId,'name');
@ -124,7 +126,8 @@ class LanzuEmployeesController extends AdminController
$form->hidden('id'); $form->hidden('id');
$form->number('user_id')->required()->min(0); $form->number('user_id')->required()->min(0);
// $form->select('user_id')->required()->options($userList); // $form->select('user_id')->required()->options($userList);
$form->text('name','真实姓名')->width(4)->required();
$form->text('name','真实姓名')->width(2)->required();
$form->mobile('tel')->width(4)->required();
$form->select('market_id')->required()->options($marketList); $form->select('market_id')->required()->options($marketList);
$form->multipleSelect('position')->required()->options(config('role.position')); $form->multipleSelect('position')->required()->options(config('role.position'));
$form->select('store_id')->options($storeList); $form->select('store_id')->options($storeList);

2
app/Admin/Controllers/v3/ServicePersonnelController.php

@ -115,7 +115,7 @@ class ServicePersonnelController extends AdminController
$form->column(6,function(Form $form){ $form->column(6,function(Form $form){
$form->hidden('id'); $form->hidden('id');
$form->text('name')->required(); $form->text('name')->required();
$form->text('tel')->required();
$form->mobile('tel')->required();
$form->image('head_url')->autoUpload(); $form->image('head_url')->autoUpload();
}); });
$form->column(6,function(Form $form) use($marketList){ $form->column(6,function(Form $form) use($marketList){

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

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

Loading…
Cancel
Save