Merge branch 'master' of http://59.57.98.130:3000/jjhc/jucai

app/Admin/Controllers/HomeController.php

@@ -273,9 +273,7 @@ class HomeController extends Controller
         JobfairCompanyRepository $jobfairCompanyRepository,
         JobfairoutCompanyRepository $jobfairoutCompanyRepository
     ) {
-        if (Admin::user()->isRole(AdminRole::$consultantSlug)) {
-            return response()->json([]);
-        }
+
         $needAuthCompany = $this->needAuthCompany($companyRepository, $this->where)->getAuditCount;
         $needAuditJobs = $this->needAuditJobs($jobsRepository, $this->where)->getJobsCount;
         $companyImg =$this->companyImg($companyImgRepository, $this->where)->getCount;

app/Admin/Controllers/Recruit/RecruitController.php

@@ -249,6 +249,8 @@ class RecruitController extends Controller
             ])->default(1)->help('允许提交审核的次数，直接输入数字即可');
             $form->datetimeRange('supplement_start', 'supplement_end', '材料补登时间');
             $form->radio('pay_switch', '缴费报名')->options([0 => '否', 1 => '是'])->default(0);
+            $form->radio('special_condition_type', '加分条件样式')->options([0 => '手输', 1 => '下拉选择'])->default(0);
+            $form->text('special_condition_value', '加分条件值')->default("")->help('下拉选择项请用英文,隔开');
         })->tab('笔试', function ($form) {
             $form->radio('pen_ticket_type', '准考证类型')->options([-1 => '不需要',1 => '纸质', 2 => '短信', 3 => '模板'])->default(-1);
             $form->text('pen_ticket_content', '准考证内容')->help('当类型为纸质时，此处填入准考证模板的路径，当类型为短信时，此处填入短信标识，当类型为模板时，输入模板ID');
@@ -353,6 +355,10 @@ class RecruitController extends Controller
         $data['face_ticket_content'] = $verify['face_ticket_content'];
         $data['face_ticket_status'] = 0;
         $data['face_ticket_field'] = implode(',',$verify['face_ticket_field']);
+        $data['face_epidemic'] = $verify['face_epidemic'];
+        $data['face_health'] = $verify['face_health'];
+        $data['face_health_start'] = $verify['face_health_start'] ? $verify['face_health_start'] : null;
+        $data['face_health_end'] = $verify['face_health_end'] ? $verify['face_health_end'] : null;
 
         $fileCharater = $request->input('addFile');
         DB::beginTransaction();//检查数据库事务
@@ -483,6 +489,10 @@ class RecruitController extends Controller
         $data['face_ticket_content'] = $verify['face_ticket_content'];
         $data['face_ticket_status'] = 0;
         $data['face_ticket_field'] = implode(',',$verify['face_ticket_field']);
+        $data['face_epidemic'] = $verify['face_epidemic'];
+        $data['face_health'] = $verify['face_health'];
+        $data['face_health_start'] = $verify['face_health_start'] ? $verify['face_health_start'] : null;
+        $data['face_health_end'] = $verify['face_health_end'] ? $verify['face_health_end'] : null;
         $ids = RecruitPost::where('recruit_id', $recruit_id)->pluck('id');
         $fileCharater = $request->input('addFile');
 

app/Admin/Controllers/Recruit/RecruitTicketController.php

@@ -169,55 +169,73 @@ class RecruitTicketController extends Controller
             return response()->json(['status' => 0, 'msg' => '找不到对应招考场次'], 200);
         }
 
+        $ticket_type = $request->input('ticket_type');
 
-        if(array_key_exists('pen',$data)){
-            $pen = $data['pen'];
-            //有设置笔试准考证，前置数据检查
-            if($recruit->pen_ticket_type < 0){
-                return response()->json(['status' => 0, 'msg' => '未开启设置笔试准考证的功能'], 200);
-            }
-            if(empty($recruit->pen_ticket_content)){
-                return response()->json(['status' => 0, 'msg' => '未设置准考证模板'], 200);
-            }
-            if($recruit->pen_ticket_status > 0){
-                return response()->json(['status' => 0, 'msg' => '笔试准考证正在生成中或已生成，暂不允许操作，有疑问请联系技术人员'], 200);
-            }
-            if(!array_key_exists('type',$pen) || !in_array($pen['type'],[1,2])){
-                return response()->json(['status' => 0, 'msg' => '请指定正确的笔试准考证生成方式'], 200);
-            }
-            if($pen['type'] == 2 && (!array_key_exists('data',$pen) || empty($pen['data']))){
-                return response()->json(['status' => 0, 'msg' => '请上传笔试准考证数据'], 200);
-            }
-            if($pen['type'] == 1){
-                if(!array_key_exists('auto_each_number',$pen) || empty($pen['auto_each_number'])){
-                    return response()->json(['status' => 0, 'msg' => '请输入每间考试的人员数量'], 200);
+        switch ($ticket_type){
+            case 'pen':
+                $pen = $data['pen'];
+                //有设置笔试准考证，前置数据检查
+                if($recruit->pen_ticket_type < 0){
+                    return response()->json(['status' => 0, 'msg' => '未开启设置笔试准考证的功能'], 200);
                 }
-            }
-            if(!array_key_exists('ex_start',$pen) || empty($pen['ex_start'])){
-                return response()->json(['status' => 0, 'msg' => '准考证开启打印时间不能为空'], 200);
-            }
-            if(!array_key_exists('ex_end',$pen) || empty($pen['ex_end'])){
-                return response()->json(['status' => 0, 'msg' => '准考证结束打印时间不能为空'], 200);
-            }
-
-            switch ($pen['type']){
-                case '1':
-                    //自动生成
-                    $list = RecruitAppointInfo::where('recruit_id',$data['recruit_id'])->where('audit',3)->where('pen_audit',-1)->select('id','realname','card','post_id','avatar')->orderBy('post_id','asc')->orderBy('created_at','asc')->get()->toArray();
-                    if(!$list || count($list) == 0){
-                        return response()->json(['status' => 0, 'msg' => '无数据可生成'], 200);
+                if(empty($recruit->pen_ticket_content)){
+                    return response()->json(['status' => 0, 'msg' => '未设置准考证模板'], 200);
+                }
+                if($recruit->pen_ticket_status > 0){
+                    return response()->json(['status' => 0, 'msg' => '笔试准考证正在生成中或已生成，暂不允许操作，有疑问请联系技术人员'], 200);
+                }
+                if(!array_key_exists('type',$pen) || !in_array($pen['type'],[1,2])){
+                    return response()->json(['status' => 0, 'msg' => '请指定正确的笔试准考证生成方式'], 200);
+                }
+                if($pen['type'] == 2 && (!array_key_exists('data',$pen) || empty($pen['data']))){
+                    return response()->json(['status' => 0, 'msg' => '请上传笔试准考证数据'], 200);
+                }
+                if($pen['type'] == 1){
+                    if(!array_key_exists('auto_each_number',$pen) || empty($pen['auto_each_number'])){
+                        return response()->json(['status' => 0, 'msg' => '请输入每间考试的人员数量'], 200);
                     }
-                    //$post_data = RecruitPost::where('recruit_id',$data['recruit_id'])->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
-                    $list = array_chunk($list,$pen['auto_each_number'],true);
-                    if(count($list) <= 10){
-                        //小于10个队列数直接处理
-                        foreach ($list as $room => $room_list){
-                            if(is_array($room_list)){
+                }
+                if(!array_key_exists('ex_start',$pen) || empty($pen['ex_start'])){
+                    return response()->json(['status' => 0, 'msg' => '准考证开启打印时间不能为空'], 200);
+                }
+                if(!array_key_exists('ex_end',$pen) || empty($pen['ex_end'])){
+                    return response()->json(['status' => 0, 'msg' => '准考证结束打印时间不能为空'], 200);
+                }
+
+                switch ($pen['type']){
+                    case '1':
+                        //自动生成
+                        $list = RecruitAppointInfo::where('recruit_id',$data['recruit_id'])->where('audit',3)->where('pen_audit',-1)->select('id','realname','card','post_id','avatar')->orderBy('post_id','asc')->orderBy('created_at','asc')->get()->toArray();
+                        if(!$list || count($list) == 0){
+                            return response()->json(['status' => 0, 'msg' => '无数据可生成'], 200);
+                        }
+                        //$post_data = RecruitPost::where('recruit_id',$data['recruit_id'])->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
+                        $list = array_chunk($list,$pen['auto_each_number'],true);
+                        if(count($list) <= 10){
+                            //小于10个队列数直接处理
+                            foreach ($list as $room => $room_list){
+                                if(is_array($room_list)){
+                                    $ticket_data = [
+                                        'type' => 1,
+                                        'multiple' => 0,
+                                        'list' => $room_list,
+                                        'room' => $room,
+                                        'ex_start' => $pen['ex_start'],
+                                        'ex_end' => $pen['ex_end']
+                                    ];
+                                    $ticket = new TicketJob($data['recruit_id'],'pen',$ticket_data);
+                                    dispatch($ticket);
+                                }
+                            }
+                        }else{
+                            //划分10个队列任务
+                            $number = count($list) / 10 +1;
+                            $list = array_chunk($list,$number,true);
+                            foreach ($list as $k => $v){
                                 $ticket_data = [
                                     'type' => 1,
-                                    'multiple' => 0,
-                                    'list' => $room_list,
-                                    'room' => $room,
+                                    'multiple' => 1,
+                                    'list' => $v,
                                     'ex_start' => $pen['ex_start'],
                                     'ex_end' => $pen['ex_end']
                                 ];
@@ -225,166 +243,151 @@ class RecruitTicketController extends Controller
                                 dispatch($ticket);
                             }
                         }
-                    }else{
-                        //划分10个队列任务
-                        $number = count($list) / 10 +1;
-                        $list = array_chunk($list,$number,true);
-                        foreach ($list as $k => $v){
+
+                        Recruit::where('id',$data['recruit_id'])->update(['pen_ticket_status' => 2]);
+                        return response()->json(['status' => 1, 'msg' => '准考证生成成功'], 200);
+                        break;
+                    case '2':
+                        $ticket_url = base_path() . "/storage/app/public/recruit/ticket/" . uniqid() . '.xlsx';
+                        if(move_uploaded_file($_FILES['pen']['tmp_name']['data'],$ticket_url)){
+                            $spreadsheet = IOFactory::load($ticket_url);
+                            $sheet = $spreadsheet->getActiveSheet();
+                            $rowCount = $sheet->getHighestRow();
                             $ticket_data = [
-                                'type' => 1,
-                                'multiple' => 1,
-                                'list' => $v,
+                                'type' => 2,
+                                'list' => [],
                                 'ex_start' => $pen['ex_start'],
                                 'ex_end' => $pen['ex_end']
                             ];
+                            $field = explode(',',$recruit['pen_ticket_field']);
+                            for($row = 2;$row<=$rowCount;$row++){
+                                $row_data = [];
+                                if(in_array('ex_number',$field)){
+                                    $row_data['ex_number'] = $sheet->getCell("D{$row}")->getValue();
+                                }
+                                if(in_array('ex_subject',$field)){
+                                    $row_data['ex_subject'] = $sheet->getCell("E{$row}")->getValue();
+                                }
+                                if(in_array('ex_room',$field)){
+                                    $row_data['ex_room'] = $sheet->getCell("F{$row}")->getValue();
+                                }
+                                if(in_array('ex_seat',$field)){
+                                    $row_data['ex_seat'] = $sheet->getCell("G{$row}")->getValue();
+                                }
+                                if(in_array('ex_time',$field)){
+                                    $row_data['ex_time'] = $sheet->getCell("H{$row}")->getValue();
+                                }
+                                if(in_array('ex_name',$field)){
+                                    $row_data['ex_name'] = $sheet->getCell("I{$row}")->getValue();
+                                }
+                                if(in_array('ex_address',$field)){
+                                    $row_data['ex_address'] = $sheet->getCell("J{$row}")->getValue();
+                                }
+
+                                $ticket_data['list'][$sheet->getCell("B{$row}")->getValue()] = $row_data;
+                            }
+                            Recruit::where('id',$data['recruit_id'])->update(['pen_ticket_status' => 1]);
                             $ticket = new TicketJob($data['recruit_id'],'pen',$ticket_data);
                             dispatch($ticket);
+                            return response()->json(['status' => 1, 'msg' => '准考证生成成功'], 200);
+                        }else{
+                            return response()->json(['status' => 0, 'msg' => '准考证生成失败'], 200);
                         }
-                    }
-
-                    Recruit::where('id',$data['recruit_id'])->update(['pen_ticket_status' => 2]);
-                    return response()->json(['status' => 1, 'msg' => '准考证生成成功'], 200);
-                    break;
-                case '2':
-                    $ticket_url = base_path() . "/storage/app/public/recruit/ticket/" . uniqid() . '.xlsx';
-                    if(move_uploaded_file($_FILES['pen']['tmp_name']['data'],$ticket_url)){
-                        $spreadsheet = IOFactory::load($ticket_url);
-                        $sheet = $spreadsheet->getActiveSheet();
-                        $rowCount = $sheet->getHighestRow();
-                        $ticket_data = [
-                            'type' => 2,
-                            'list' => [],
-                            'ex_start' => $pen['ex_start'],
-                            'ex_end' => $pen['ex_end']
-                        ];
-                        $field = explode(',',$recruit['pen_ticket_field']);
-                        for($row = 2;$row<=$rowCount;$row++){
-                            $row_data = [];
-                            if(in_array('ex_number',$field)){
-                                $row_data['ex_number'] = $sheet->getCell("D{$row}")->getValue();
-                            }
-                            if(in_array('ex_subject',$field)){
-                                $row_data['ex_subject'] = $sheet->getCell("E{$row}")->getValue();
-                            }
-                            if(in_array('ex_room',$field)){
-                                $row_data['ex_room'] = $sheet->getCell("F{$row}")->getValue();
-                            }
-                            if(in_array('ex_seat',$field)){
-                                $row_data['ex_seat'] = $sheet->getCell("G{$row}")->getValue();
-                            }
-                            if(in_array('ex_time',$field)){
-                                $row_data['ex_time'] = $sheet->getCell("H{$row}")->getValue();
-                            }
-                            if(in_array('ex_name',$field)){
-                                $row_data['ex_name'] = $sheet->getCell("I{$row}")->getValue();
-                            }
-                            if(in_array('ex_address',$field)){
-                                $row_data['ex_address'] = $sheet->getCell("J{$row}")->getValue();
-                            }
+                        break;
+                }
+                break;
+            case 'face':
+                $face = $data['face'];
+                //面试通知书前置检查
+                if($recruit->face_ticket_type < 0){
+                    return response()->json(['status' => 0, 'msg' => '未开启设置面试准考证的功能'], 200);
+                }
+                if(empty($recruit->face_ticket_content)){
+                    return response()->json(['status' => 0, 'msg' => '未设置准考证模板'], 200);
+                }
+                if($recruit->face_ticket_status > 0){
+                    return response()->json(['status' => 0, 'msg' => '面试准考证正在生成中或已生成，暂不允许操作，有疑问请联系技术人员'], 200);
+                }
+                if(!array_key_exists('type',$face) || !in_array($face['type'],[0,1,2])){
+                    return response()->json(['status' => 0, 'msg' => '请指定正确的面试准考证生成方式'], 200);
+                }
+                if($face['type'] == 2 && (!array_key_exists('data',$face) || empty($face['data']))){
+                    return response()->json(['status' => 0, 'msg' => '请上传面试准考证数据'], 200);
+                }
+                if(!array_key_exists('ex_start',$face) || empty($face['ex_start'])){
+                    return response()->json(['status' => 0, 'msg' => '准考证开启打印时间不能为空'], 200);
+                }
+                if(!array_key_exists('ex_end',$face) || empty($face['ex_end'])){
+                    return response()->json(['status' => 0, 'msg' => '准考证结束打印时间不能为空'], 200);
+                }
 
-                            $ticket_data['list'][$sheet->getCell("B{$row}")->getValue()] = $row_data;
-                        }
-                        Recruit::where('id',$data['recruit_id'])->update(['pen_ticket_status' => 1]);
-                        $ticket = new TicketJob($data['recruit_id'],'pen',$ticket_data);
+                switch ($face['type']){
+                    case '0':
+                        Recruit::where('id',$data['recruit_id'])->update(['face_ticket_status' => 1]);
+                        $ticket = new TicketJob($data['recruit_id'],'face',['type' => '0','ex_start' => $face['ex_start'], 'ex_end' => $face['ex_end']]);
                         dispatch($ticket);
                         return response()->json(['status' => 1, 'msg' => '准考证生成成功'], 200);
-                    }else{
-                        return response()->json(['status' => 0, 'msg' => '准考证生成失败'], 200);
-                    }
-                    break;
-            }
-        }
-
-        if(array_key_exists('face',$data)){
-            $face = $data['face'];
-            //面试通知书前置检查
-            if($recruit->face_ticket_type < 0){
-                return response()->json(['status' => 0, 'msg' => '未开启设置面试准考证的功能'], 200);
-            }
-            if(empty($recruit->face_ticket_content)){
-                return response()->json(['status' => 0, 'msg' => '未设置准考证模板'], 200);
-            }
-            if($recruit->face_ticket_status > 0){
-                return response()->json(['status' => 0, 'msg' => '面试准考证正在生成中或已生成，暂不允许操作，有疑问请联系技术人员'], 200);
-            }
-            if(!array_key_exists('type',$face) || !in_array($face['type'],[0,1,2])){
-                return response()->json(['status' => 0, 'msg' => '请指定正确的面试准考证生成方式'], 200);
-            }
-            if($face['type'] == 2 && (!array_key_exists('data',$face) || empty($face['data']))){
-                return response()->json(['status' => 0, 'msg' => '请上传面试准考证数据'], 200);
-            }
-            if(!array_key_exists('ex_start',$face) || empty($face['ex_start'])){
-                return response()->json(['status' => 0, 'msg' => '准考证开启打印时间不能为空'], 200);
-            }
-            if(!array_key_exists('ex_end',$face) || empty($face['ex_end'])){
-                return response()->json(['status' => 0, 'msg' => '准考证结束打印时间不能为空'], 200);
-            }
-
-            switch ($face['type']){
-                case '0':
-                    Recruit::where('id',$data['recruit_id'])->update(['face_ticket_status' => 1]);
-                    $ticket = new TicketJob($data['recruit_id'],'face',['type' => '0','ex_start' => $face['ex_start'], 'ex_end' => $face['ex_end']]);
-                    dispatch($ticket);
-                    return response()->json(['status' => 1, 'msg' => '准考证生成成功'], 200);
-                    break;
-                case '1':
-                    //自动生成
-                    $ticket_data = [
-                        'type' => 1,
-                        'auto_each_number' => $face['auto_each_number'],
-                        'ex_start' => $face['ex_start'],
-                        'ex_end' => $face['ex_end']
-                    ];
-                    Recruit::where('id',$data['recruit_id'])->update(['face_ticket_status' => 1]);
-                    $ticket = new TicketJob($data['recruit_id'],'face',$ticket_data);
-                    dispatch($ticket);
-                    return response()->json(['status' => 1, 'msg' => '准考证生成成功'], 200);
-                    break;
-                case '2':
-                    $ticket_url = base_path() . "/storage/app/public/recruit/ticket/" . uniqid() . '.xlsx';
-                    if(move_uploaded_file($_FILES['face']['tmp_name']['data'],$ticket_url)){
-                        $spreadsheet = IOFactory::load($ticket_url);
-                        $sheet = $spreadsheet->getActiveSheet();
-                        $rowCount = $sheet->getHighestRow();
+                        break;
+                    case '1':
+                        //自动生成
                         $ticket_data = [
-                            'type' => 2,
-                            'list' => [],
+                            'type' => 1,
+                            'auto_each_number' => $face['auto_each_number'],
                             'ex_start' => $face['ex_start'],
                             'ex_end' => $face['ex_end']
                         ];
-                        for($row = 2;$row<=$rowCount;$row++){
-                            $ticket_data['list'][$sheet->getCell("B{$row}")->getValue()] = [
-                                'ex_number' => $sheet->getCell("D{$row}")->getValue(),
-                                'ex_subject' => $sheet->getCell("E{$row}")->getValue(),
-                                'ex_room' => $sheet->getCell("F{$row}")->getValue(),
-                                'ex_seat' => $sheet->getCell("G{$row}")->getValue(),
-                                'ex_time' => $sheet->getCell("H{$row}")->getValue(),
-                                'ex_name' => $sheet->getCell("I{$row}")->getValue(),
-                                'ex_address' => $sheet->getCell("J{$row}")->getValue(),
-                                'ex_ready_time' => $sheet->getCell("K{$row}")->getValue(),
-                                'extra1' => $sheet->getCell("L{$row}")->getValue(),
-                                'extra2' => $sheet->getCell("M{$row}")->getValue(),
-                                'extra3' => $sheet->getCell("N{$row}")->getValue()
-                            ];
-                        }
                         Recruit::where('id',$data['recruit_id'])->update(['face_ticket_status' => 1]);
                         $ticket = new TicketJob($data['recruit_id'],'face',$ticket_data);
                         dispatch($ticket);
                         return response()->json(['status' => 1, 'msg' => '准考证生成成功'], 200);
-                    }else{
-                        return response()->json(['status' => 0, 'msg' => '准考证生成失败'], 200);
-                    }
-                    break;
-            }
+                        break;
+                    case '2':
+                        $ticket_url = base_path() . "/storage/app/public/recruit/ticket/" . uniqid() . '.xlsx';
+                        if(move_uploaded_file($_FILES['face']['tmp_name']['data'],$ticket_url)){
+                            $spreadsheet = IOFactory::load($ticket_url);
+                            $sheet = $spreadsheet->getActiveSheet();
+                            $rowCount = $sheet->getHighestRow();
+                            $ticket_data = [
+                                'type' => 2,
+                                'list' => [],
+                                'ex_start' => $face['ex_start'],
+                                'ex_end' => $face['ex_end']
+                            ];
+                            for($row = 2;$row<=$rowCount;$row++){
+                                $ticket_data['list'][$sheet->getCell("B{$row}")->getValue()] = [
+                                    'ex_number' => $sheet->getCell("D{$row}")->getValue(),
+                                    'ex_subject' => $sheet->getCell("E{$row}")->getValue(),
+                                    'ex_room' => $sheet->getCell("F{$row}")->getValue(),
+                                    'ex_seat' => $sheet->getCell("G{$row}")->getValue(),
+                                    'ex_time' => $sheet->getCell("H{$row}")->getValue(),
+                                    'ex_name' => $sheet->getCell("I{$row}")->getValue(),
+                                    'ex_address' => $sheet->getCell("J{$row}")->getValue(),
+                                    'ex_ready_time' => $sheet->getCell("K{$row}")->getValue(),
+                                    'extra1' => $sheet->getCell("L{$row}")->getValue(),
+                                    'extra2' => $sheet->getCell("M{$row}")->getValue(),
+                                    'extra3' => $sheet->getCell("N{$row}")->getValue()
+                                ];
+                            }
+                            Recruit::where('id',$data['recruit_id'])->update(['face_ticket_status' => 1]);
+                            $ticket = new TicketJob($data['recruit_id'],'face',$ticket_data);
+                            dispatch($ticket);
+                            return response()->json(['status' => 1, 'msg' => '准考证生成成功'], 200);
+                        }else{
+                            return response()->json(['status' => 0, 'msg' => '准考证生成失败'], 200);
+                        }
+                        break;
+                }
 
-            $ticket_data = [
-                'type' => 1,
-                'auto_each_number' => $pen['auto_each_number']
-            ];
-            Recruit::where('id',$data['recruit_id'])->update(['pen_ticket_status' => 1]);
-            $ticket = new TicketJob($data['recruit_id'],'face',$ticket_data);
-            dispatch($ticket);
-            return response()->json(['status' => 1, 'msg' => '准考证生成成功'], 200);
+                $ticket_data = [
+                    'type' => 1,
+                    'auto_each_number' => $pen['auto_each_number']
+                ];
+                Recruit::where('id',$data['recruit_id'])->update(['pen_ticket_status' => 1]);
+                $ticket = new TicketJob($data['recruit_id'],'face',$ticket_data);
+                dispatch($ticket);
+                return response()->json(['status' => 1, 'msg' => '准考证生成成功'], 200);
+                break;
         }
+
     }
 }

app/Http/Controllers/Web/Recruit/IndexController.php

@@ -628,6 +628,8 @@ class IndexController extends WebBaseController
         $view_data['post_limit'] = json_encode($post_limit);
         $view_data['formDisable'] = $formDisabled;
         $view_data['title'] = $recruit->company;
+        $view_data['special_condition_type'] = $recruit->special_condition_type;
+        $view_data['special_condition_value'] = explode(',',$recruit->special_condition_value);
         return view('app.recruit.sign_up',$view_data);
 
     }

public/themes/default/views/app/recruit/show.blade.php

@@ -211,13 +211,13 @@
                 <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 24px">考生健康申明卡及安全考试承诺书</span>
             </p>
             <p style="margin-left:0;text-indent:0;text-autospace:ideograph-numeric;text-align:center;line-height:37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 24px">特别提示:为确保您顺利应考，考试报到时，须携带考前48小时内(8月18日及以后)新型冠状病毒核酸检测阴性的报告（检测报告为正规医疗机构纸质报告或应在闽政通上可查询）且考试当天本人动态“福建健康码”（闽政通APP）为“绿码”及体温正常者方可允许进场参加考试。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 24px">特别提示:为确保您顺利应考，考试报到时，须携带考前48小时内（10月20日14:00及以后）新型冠状病毒核酸检测阴性的报告（检测报告为正规医疗机构纸质报告或应在闽政通上可查询）且考试当天本人动态“福建健康码”（闽政通APP）为“绿码”及体温正常者方可允许进场参加考试。</span>
             </p>
             <p style="margin-left: 0;text-indent: 0;line-height: 37px;text-align: center">
                 <strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">姓名：</span></strong><strong><span style="text-decoration:underline;"><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">&nbsp;{{$appoint_info->realname}}&nbsp;</span></span></strong>&nbsp;&nbsp;<strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">性别：</span></strong><strong><span style="text-decoration:underline;"><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">&nbsp;{{$appoint_info->sex == 0 ? '女' : '男'}}&nbsp;</span></span></strong>&nbsp;&nbsp;&nbsp;<strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">身份证号：</span></strong><strong><span style="text-decoration:underline;"><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">&nbsp;{{$appoint_info->card}}&nbsp;<span style="font-family:微软雅黑">&nbsp;</span></span></span></strong>&nbsp;&nbsp;<strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">有效手机联系方式：</span></strong><strong><span style="text-decoration:underline;"><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">&nbsp; {{$appoint_info->mobile}}&nbsp;</span></span></strong>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 14px;line-height: 37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 18px">&nbsp; &nbsp;</span><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">1.1.本人过去7日内，有出现发热、干咳、乏力、鼻塞、流涕、咽痛、腹泻等症状。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 18px">&nbsp; &nbsp;</span><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">1.本人过去7日内，有出现发热、干咳、乏力、鼻塞、流涕、咽痛、腹泻等症状。</span>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 32px;line-height: 37px">
                 <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">2.本人属于新冠肺炎确诊病例、无症状感染者。</span>
@@ -280,7 +280,7 @@
                     </tr>
                     <tr>
                         <td style="line-height: 37px">
-                            2.本人为普通高等院校全日制在读的非应届毕业生；
+                            2.本人为普通高等院校全日制在读的非2022年应届毕业生；
                         </td>
                         <td>
                             <input type="radio"  name="q12" value="1" />是
@@ -291,7 +291,7 @@
                     </tr>
                     <tr>
                         <td style="line-height: 37px">
-                            3.本人曾受过刑事处罚的或涉嫌违法犯罪尚未查清；
+                            3.本人曾因犯罪受过刑事处罚；
                         </td>
                         <td>
                             <input type="radio"  name="q13" value="1" />是
@@ -302,7 +302,7 @@
                     </tr>
                     <tr>
                         <td style="line-height: 37px">
-                            4.本人因聚众赌博、嫖娼等被处以治安拘留及以上处罚，或有涉毒问题；
+                            4.本人曾被开除公职；
                         </td>
                         <td>
                             <input type="radio"  name="q14" value="1" />是
@@ -313,7 +313,7 @@
                     </tr>
                     <tr>
                         <td style="line-height: 37px">
-                            5.本人为尚未解除党纪、政纪处分或正在接受纪律审查的人员；
+                            5.本人被列为失信被执行人且尚未履行义务；
                         </td>
                         <td>
                             <input type="radio"  name="q15" value="1" />是
@@ -324,51 +324,7 @@
                     </tr>
                     <tr>
                         <td style="line-height: 37px">
-                            6.本人曾因违纪违规被开除辞退解聘；
-                        </td>
-                        <td>
-                            <input type="radio"  name="q16" value="1" />是
-                        </td>
-                        <td>
-                            <input type="radio"  name="q16" value="0" />否
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="line-height: 37px">
-                            7.本人曾参加非法组织、邪教组织或者从事其他危害国家安全活动；
-                        </td>
-                        <td>
-                            <input type="radio"  name="q17" value="1" />是
-                        </td>
-                        <td>
-                            <input type="radio"  name="q17" value="0" />否
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="line-height: 37px">
-                            8.本人被列为失信被执行人且尚未履行义务；
-                        </td>
-                        <td>
-                            <input type="radio"  name="q18" value="1" />是
-                        </td>
-                        <td>
-                            <input type="radio"  name="q18" value="0" />否
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="line-height: 37px">
-                            9.本人在各级公务员、事业单位招考中被认定有舞弊等严重违反纪律行为；
-                        </td>
-                        <td>
-                            <input type="radio"  name="q19" value="1" />是
-                        </td>
-                        <td>
-                            <input type="radio"  name="q19" value="0" />否
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="line-height: 37px">
-                            10.本人存在法律法规规定的其他不得报考的情形。
+                            6.本人存在法律法规规定的其他不得报考的情形。
                         </td>
                         <td>
                             <input type="radio"  name="q20" value="1" />是
@@ -382,10 +338,10 @@
             </form>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 43px;line-height: 37px">
-                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 20px;font-weight: 700">特别提示：</span><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 20px;font-weight: 700"><span style="font-family:微软雅黑">存在上述1-10情形的，不得参加考试。</span></span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 20px;font-weight: 700">特别提示：</span><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 20px;font-weight: 700"><span style="font-family:微软雅黑">存在上述1-6情形的，不得参加考试。</span></span>
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 32px;line-height: 37px">
-                <strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">本人承诺不存在上述1-10情形。</span></strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">本人保证所提交的报名信息和相关证明材料真实、准确、有效，如提供虚假信息和证明材料，本人愿承担一切责任。</span>
+                <strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">本人承诺不存在上述1-6情形。</span></strong><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">本人保证所提交的报名信息和相关证明材料真实、准确、有效，如提供虚假信息和证明材料，本人愿承担一切责任。</span>
             </p>
             <p style="margin-top:8px;margin-left:0;text-indent:0;text-autospace:ideograph-numeric;text-align:center;line-height:37px">
                 <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 18px"><input type="checkbox" class="agree_commit1" /> 我已知晓上述内容并承诺遵守</span>
@@ -669,21 +625,69 @@
                         disapperTooltip("remind", "只有登录个人会员才可打印！");
                         return false;
                     } else {
+                        {{--var qsDialog = $(this).dialog({--}}
+                        {{--    loading: true,--}}
+                        {{--    header: false,--}}
+                        {{--    border: false,--}}
+                        {{--    btns: ['打印准考证','取消'],--}}
+                        {{--    yes: function(){--}}
+                        {{--        if($($(".agree_commit_normal")[1]).prop('checked')){--}}
+                        {{--            window.location.href = "{!! route('recruit.face_ticket',['recruit_id'=>$recruit->id]) !!}";--}}
+                        {{--        }else{--}}
+                        {{--            alert('请阅读并承诺遵守《安全考试承诺书》');--}}
+                        {{--        }--}}
+                        {{--    }--}}
+                        {{--});--}}
+                        {{--qsDialog.setContent($('#commit0').html());--}}
                         var qsDialog = $(this).dialog({
                             loading: true,
                             header: false,
                             border: false,
-                            btns: ['打印准考证','取消'],
+                            btns: ['下一份','取消'],
                             yes: function(){
-                                if($($(".agree_commit_normal")[1]).prop('checked')){
-                                    window.location.href = "{!! route('recruit.face_ticket',['recruit_id'=>$recruit->id]) !!}";
-                                }else{
-                                    alert('请阅读并承诺遵守《安全考试承诺书》');
+                                qsDialog.setCloseDialog(false);
+                                if(!$($(".agree_commit")[1]).prop('checked')){
+                                    disapperTooltip("remind", "请阅读并承诺遵守《考生健康申明卡及安全考试承诺书》！");
+                                    //alert('请阅读并承诺遵守《考生健康申明卡及安全考试承诺书》');
+                                    return false;
                                 }
+                                qsDialog.setCloseDialog(true);
+                                var dialog_1 = $(this).dialog({
+                                    loading: true,
+                                    header: false,
+                                    border: false,
+                                    btns: ['打印准考证','取消'],
+                                    yes: function(){
+                                        dialog_1.setCloseDialog(false);
+                                        var must = 1,total = 0;
+                                        $.each($($(".commit_step_2")[1]).find("input"),function(){
+                                            if(this.checked){
+                                                if($(this).val() == 1){
+                                                    must = 0;
+                                                }
+                                                total++;
+                                            }
+                                        });
+                                        if(total != 6){
+                                            disapperTooltip("remind", "请勾选以上项目！");
+                                            return false;
+                                        }
+                                        if(!must){
+                                            disapperTooltip("remind", "不符合参加考试条件，请检查！");
+                                            return false;
+                                        }
+                                        if(!$($(".agree_commit1")[1]).prop('checked')){
+                                            disapperTooltip("remind", "请阅读并承诺遵守《考生报考承诺书》！");
+                                            return false;
+                                        }
+                                        dialog_1.setCloseDialog(true);
+                                        window.location.href = "{!! route('recruit.pen_ticket',['recruit_id'=>$recruit->id,'uid'=>$uid]) !!}";
+                                    }
+                                });
+                                dialog_1.setContent($('#commit1').html())
                             }
                         });
-                        qsDialog.setContent($('#commit0').html());
-
+                        qsDialog.setContent($('#commit').html());
                     }
                 } else {
                     var qsDialog = $(this).dialog({

public/themes/default/views/app/recruit/sign_up.blade.php

@@ -766,10 +766,19 @@
                                 符合哪一项加分条件
                             </td>
                             <td valign="center" colspan="4" >
-                                <el-form-item prop="special_condition">
-                                    <el-input v-model="user.special.condition" placeholder="请输入您符合的加分条件"></el-input>
-
-                                </el-form-item>
+                                @if($special_condition_type == 0)
+                                    <el-form-item prop="special_condition">
+                                        <el-input v-model="user.special.condition" placeholder="请输入您符合的加分条件"></el-input>
+                                    </el-form-item>
+                                @else
+                                    <el-form-item prop="special_condition">
+                                        <el-select v-model="user.special.condition" placeholder="请选择您符合的加分条件">
+                                            @foreach($special_condition_value as $v)
+                                                <el-option label="{{ $v }}" value="{{ $v }}"></el-option>
+                                            @endforeach
+                                        </el-select>
+                                    </el-form-item>
+                                @endif
                             </td>
                         </tr>
                         <tr style="height:52px;page-break-inside:avoid">

resources/views/admin/recruit/ajax_ticket.blade.php

@@ -1,25 +1,26 @@
 <form id="J_ticketWrap" enctype="multipart/form-data" class="form-horizontal" action="{{ route('recruit.create_ticket') }}" method="post">
     <input type="hidden" name="_token" value="{{ csrf_token() }}" />
     <input type="hidden" name="recruit_id" value="{{ $recruit->id }}">
+    <input type="hidden" name="ticket_type" id="ticket_type" value="pen" />
     <div class="box-body">
         <div class="nav-tabs-custom">
             <ul class="nav nav-tabs">
                 @if(in_array('3',explode(',',$recruit->step)))
-                <li>
+                <li data-ticketType="pen">
                     <a href="#tab-form-1" data-toggle="tab">
                         笔试 <i class="fa fa-exclamation-circle text-red hide"></i>
                     </a>
                 </li>
                 @endif
                 @if(in_array('4',explode(',',$recruit->step)))
-                <li>
+                <li data-ticketType="check">
                     <a href="#tab-form-2" data-toggle="tab">
                         上机 <i class="fa fa-exclamation-circle text-red hide"></i>
                     </a>
                 </li>
                 @endif
                 @if(in_array('5',explode(',',$recruit->step)))
-                <li>
+                <li data-ticketType="face">
                     <a href="#tab-form-3" data-toggle="tab">
                         面试 <i class="fa fa-exclamation-circle text-red hide"></i>
                     </a>
@@ -233,8 +234,6 @@
             </div>
         </div>
     </div>
-
-
 </form>
 <link rel="stylesheet" href="/vendor/laravel-admin/AdminLTE/plugins/iCheck/all.css">
 <link rel="stylesheet" href="/vendor/laravel-admin/bootstrap-fileinput/css/fileinput.min.css">
@@ -254,6 +253,9 @@
 </style>
 <script>
     $(function(){
+        $(".nav-tabs li").click(function(){
+            $("#ticket_type").val($(this).attr("data-ticketType"));
+        })
         $(".nav-tabs").find('li:first-child').addClass('active');
         $(".tab-content").find('div:first-child').addClass('active');
         $('.type').iCheck({radioClass:'iradio_minimal-blue'});