|
@@ -81,7 +81,7 @@ class RecuperateController extends Controller
|
|
|
$grid->model()->orderBy('created_at', 'DESC');
|
|
|
|
|
|
$grid->id('ID');
|
|
|
- $grid->column('recuperate_category.name','分类');
|
|
|
+ $grid->column('recuperate_category.name', '分类');
|
|
|
$grid->column('标题')->display(function () {
|
|
|
$style = "color:" . $this->tit_color . ';';
|
|
|
if ($this->tit_b == '1') {
|
|
@@ -159,9 +159,9 @@ class RecuperateController extends Controller
|
|
|
'off' => ['value' => 0, 'text' => '否', 'color' => 'danger'],
|
|
|
];
|
|
|
|
|
|
- $form = new ValidateForm(new Recuperate());
|
|
|
- $category = array_column(RecuperateCategory::where('deleted_at',null)->select('id','name')->get()->toArray(), 'name', 'id');
|
|
|
- $form->select('r_c_id', '分类名称')->rules('required', ['required' => '分类名称为空。'])->options($category)->setMustMark();
|
|
|
+ $form = new ValidateForm(new Recuperate());
|
|
|
+ $category = array_column(RecuperateCategory::where('deleted_at', null)->select('id', 'name')->get()->toArray(), 'name', 'id');
|
|
|
+ $form->select('r_c_id', '分类名称')->rules('required', ['required' => '分类名称为空。'])->options($category)->setMustMark();
|
|
|
$form->text('title', '标题')->rules('required|max:100', ['required' => '标题不能为空。', 'max' => '标题长度不能大于100。'])->setWidth(4)->setMustMark();
|
|
|
$form->color('tit_color', '标题颜色')->rules('required|regex:/^#[a-fA-F0-9]{6}$/', ['required' => '标题颜色不能为空。', 'regex' => '标题颜色格式不正确。'])->default('#000000');
|
|
|
$form->switch('tit_b', '标题加粗')->states($display_option)->default(0)->setMustMark();
|
|
@@ -206,7 +206,7 @@ class RecuperateController extends Controller
|
|
|
'on' => ['value' => 1, 'text' => '是', 'color' => 'success'],
|
|
|
'off' => ['value' => 0, 'text' => '否', 'color' => 'danger'],
|
|
|
];
|
|
|
- $category = array_column(RecuperateCategory::where('deleted_at',null)->select('id','name')->get()->toArray(), 'name', 'id');
|
|
|
+ $category = array_column(RecuperateCategory::where('deleted_at', null)->select('id', 'name')->get()->toArray(), 'name', 'id');
|
|
|
|
|
|
$form = new ValidateForm(new Recuperate);
|
|
|
$form->select('r_c_id', '分类名称')->rules('required', ['required' => '分类名称为空。'])->options($category)->setMustMark();
|
|
@@ -313,18 +313,19 @@ class RecuperateController extends Controller
|
|
|
|
|
|
//数据处理
|
|
|
foreach ($list as $key => $value) {
|
|
|
- $data[$key]['user_name'] = $value->user_name;
|
|
|
- $data[$key]['user_idcard'] = $value->user_idcard;
|
|
|
- $data[$key]['mobile'] = $value->mobile;
|
|
|
- $data[$key]['wechat'] = $value->wechat;
|
|
|
- $data[$key]['company_name'] = $value->company_name;
|
|
|
- $data[$key]['level'] = $level_arr[$value->level];
|
|
|
- $data[$key]['condition'] = $value->condition;
|
|
|
- $data[$key]['tax'] = $value->tax;
|
|
|
- $data[$key]['salary'] = $value->salary;
|
|
|
- $data[$key]['created_at'] = $value->created_at;
|
|
|
- $data[$key]['status'] = $status_arr[$value->status];
|
|
|
- $data[$key]['reason'] = $value->reason;
|
|
|
+ $data[$key]['user_name'] = $value->user_name;
|
|
|
+ $data[$key]['user_idcard'] = $value->user_idcard;
|
|
|
+ $data[$key]['mobile'] = $value->mobile;
|
|
|
+ $data[$key]['wechat'] = $value->wechat;
|
|
|
+ $data[$key]['company_name'] = $value->company_name;
|
|
|
+ $data[$key]['level'] = $level_arr[$value->level];
|
|
|
+ $data[$key]['validate_time'] = $value->validate_time;
|
|
|
+ /*$data[$key]['condition'] = $value->condition;
|
|
|
+ $data[$key]['tax'] = $value->tax;
|
|
|
+ $data[$key]['salary'] = $value->salary;*/
|
|
|
+ $data[$key]['created_at'] = $value->created_at;
|
|
|
+ $data[$key]['status'] = $status_arr[$value->status];
|
|
|
+ $data[$key]['reason'] = $value->reason;
|
|
|
}
|
|
|
|
|
|
//导出excel
|