Selaa lähdekoodia

人才疗休养导出

linwu 2 vuotta sitten
vanhempi
commit
6cee13079a

+ 18 - 17
app/Admin/Controllers/Content/RecuperateController.php

@@ -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

+ 8 - 6
resources/views/admin/content/export_apply.blade.php

@@ -41,9 +41,10 @@
             <th>个人微信号</th>
             <th>工作单位</th>
             <th>人才层次</th>
-            <th>适用对象类型</th>
+            <th>人才有效期</th>
+            {{--<th>适用对象类型</th>
             <th>{{date('Y',strtotime("-1 year"))}}年在晋江连续缴纳社保和个税</th>
-            <th>年工资是否超过130336元</th>
+            <th>年工资是否超过130336元</th>--}}
             <th>报名时间</th>
             <th>审核状态</th>
             <th>审核备注</th>
@@ -56,15 +57,16 @@
                 <td>{{$v['wechat']}}</td>
                 <td>{{$v['company_name']}}</td>
                 <td>{{$v['level']}}</td>
-                <td>{{$v['condition']}}</td>
+                <td>{{$v['validate_time']}}</td>
+                {{--<td>{{$v['condition']}}</td>
                 <td>{{$v['tax'] == 1 ? "是" : '否'}}</td>
-                <td>{{$v['salary'] == 1 ? "是" : '否'}}</td>
+                <td>{{$v['salary'] == 1 ? "是" : '否'}}</td>--}}
                 <td>{{$v['created_at']}}</td>
                 <td>{{$v['status']}}</td>
                 <td>{{$v['reason']}}</td>
             </tr>
         @endforeach
-        <tr>
+        {{--<tr>
             <td colspan="12">
                 1、海内外高等院校、科研院所或中央企业、跨国公司在我市设立的直属研发公共服务平台引进的优秀人才;<br style='mso-data-placement:same-cell;'/>
                 2、落址在我市的高等院校引进的优秀人才;<br style='mso-data-placement:same-cell;'/>
@@ -76,7 +78,7 @@
                 8、近三年内引进到我市依法登记的事业单位(医疗教育除外)工作的优秀人才。<br style='mso-data-placement:same-cell;'/>
                 9、晋江市博士后科研工作站在站博士后。
             </td>
-        </tr>
+        </tr>--}}
     </table>
 
 </div>