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

app/Admin/Controllers/Recruit/RecruitController.php

@@ -1367,6 +1367,7 @@ class RecruitController extends Controller
             $info->save();
             $appointinfo->health_audit = 0;
             $appointinfo->save();
+            $this->smsService->sendSms($appointinfo->mobile,'sms_recruit_register_error',array('reason'=>$reason));
         }
         if($status == 1){
             $reason = $reason ?? '符合报考条件';
@@ -1386,8 +1387,10 @@ class RecruitController extends Controller
             $info->save();
             $appointinfo->health_audit = 1;
             $appointinfo->save();
+            $this->smsService->sendSms($appointinfo->mobile,'sms_recruit_register_success',array('reason'=>"健康信息审核通过，请及时打印准考证"));
         }
 
+
         return response()->json(['status' => 1, 'msg' => '操作成功！', 'data' => 'ok']);
     }
 

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

@@ -1226,7 +1226,7 @@ class IndexController extends WebBaseController
                     $name = $recruit->name_en;
                     $date = date("Y-m-d",strtotime($recruit->created_at));
                     $filename = $date . '_' . $appoint_info->realname . '_' . $appoint_info->card . '_' . $post_data[$appoint_info->post_id];
-                    $file = base_path() . "/storage/app/public/recruit/ticket/pdf/{$date}/{$name}/pen/" . $filename . '_create.pdf';
+                    $file = base_path() . "/storage/app/public/recruit/ticket/pdf/{$date}/{$name}/pen/" . $filename . '.pdf';
                     if(file_exists($file)){
                         header('Content-Description: File Transfer');
                         header('Content-Type: application/octet-stream');
@@ -1926,7 +1926,9 @@ class IndexController extends WebBaseController
                 }
             }
             $info->trip_code = json_encode($trip_code);
-
+            $info->h_status = 0;
+            $appoint_info->health_audit = 4;
+            $appoint_info->save();
             $info->save();
             return ['status' => 1, 'msg' => '提交成功', 'data' => ''];
         }else{
@@ -1946,34 +1948,47 @@ class IndexController extends WebBaseController
             }
 
             $health_result = $this->baiduService->health_code(file_get_contents(base_path() . "/public" . $health_code[0]['response']['path']));
-
+            $health_msg = [];
+            $h_status = 1;
             if(!array_key_exists('error_msg',$health_result) && !array_key_exists('error_code',$health_result)){
                 if(array_key_exists('姓名',$health_result)){
+                    if(stripos($health_result['姓名'][0]['word'],'*')>0){
+                        return ['status' => 0, 'msg' => '请打开健康码的“眼睛开关”，显示完整个人信息'];
+                    }
                     if($health_result['姓名'][0]['word'] != $appoint_info->realname){
-                        return ['status' => 0, 'msg' => '抱歉，请上传您本人的健康码！'];
+                        array_push($health_msg,'抱歉，请上传您本人的健康码！');
+                        $h_status = 0;
                     }
                 }else{
-                    return ['status' => 0, 'msg' => '健康码错误，识别不到姓名！'];
+                    array_push($health_msg,'健康码错误，识别不到姓名！');
+                    $h_status = 0;
                 }
                 if(array_key_exists('状态',$health_result)){
                     if($health_result['状态'][0]['word'] != '绿码'){
-                        return ['status' => 0, 'msg' => '抱歉，您的健康码非绿码！'];
+                        array_push($health_msg,'抱歉，您的健康码非绿码！');
+                        $h_status = 0;
                     }
                 }else{
-                    return ['status' => 0, 'msg' => '健康码错误，识别不到状态！'];
+                    array_push($health_msg,'健康码错误，识别不到状态！');
+                    $h_status = 0;
                 }
                 if(array_key_exists('更新时间',$health_result)){
                     $time = strtotime($health_result['更新时间'][0]['word']);
                     if($time < strtotime($recruit->pen_health_start) || $time > strtotime($recruit->pen_health_end)){
-                        return ['status' => 0, 'msg' => "抱歉，请上传{$recruit->pen_health_start}至{$recruit->pen_health_end}之间的健康码！"];
+                        array_push($health_msg,'抱歉，请上传{$recruit->pen_health_start}至{$recruit->pen_health_end}之间的健康码！');
+                        $h_status = 0;
                     }
                 }else{
-                    return ['status' => 0, 'msg' => '健康码错误，识别不到时间！'];
+                    array_push($health_msg,'健康码错误，识别不到时间！');
+                    $h_status = 0;
                 }
-                $data['h_status'] = 1;
-                $data['h_msg'] = '健康码自动审核通过';
-                $appoint_info->health_audit = 1;
+                $data['h_status'] = $h_status;
+                $data['h_msg'] = $h_status == 1 ? '健康码自动审核通过' : implode(';',$health_msg);
+                $appoint_info->health_audit = $h_status == 1 ? 1 : 4;
                 $data['health_code'] = json_encode($health_code);
+            }else{
+                $data['h_status'] = 0;
+                $appoint_info->health_audit = $h_status == 4;
             }
 
             $data['health_result'] = json_encode($health_result);
@@ -1988,24 +2003,29 @@ class IndexController extends WebBaseController
                 }
             }
             $trip_result = $this->baiduService->trip_code(file_get_contents(base_path() . "/public" . $trip_code[0]['response']['path']));
+            $trip_msg = [];
+            $trip_status = 0;
             if(!array_key_exists('error_msg',$trip_result) && !array_key_exists('error_code',$trip_result)){
                 if(array_key_exists('途经地',$trip_result['result'])){
                     $fangyi_area = explode("\r\n",config('aix.fangyi.fangyi_zhaokao.fangyi_zhaokao.risk_area'));
                     $result = array_intersect($fangyi_area,$trip_result['result']['途经地'][0]['word']);
                     if(count($result) > 0){
-                        return ['status' => 0, 'msg' => '抱歉，您的行程中包含系统设置中高风险地区！'];
+                        array_push($trip_msg,'抱歉，您的行程中包含系统设置中高风险地区！');
+                        $trip_status = 0;
                     }
                 }
                 if(array_key_exists('风险性',$trip_result['result']) && $trip_result['result']['风险性']){
-                    return ['status' => 0, 'msg' => '抱歉，您的行程可能含有风险！'];
+                    array_push($trip_msg,'抱歉，您的行程可能含有风险！');
+                    $trip_status = 0;
                 }
                 if(array_key_exists('更新时间',$trip_result['result'])){
                     $time = strtotime($health_result['更新时间'][0]['word'][0]);
                     if($time > strtotime($recruit->pen_health_start) || $recruit < ($recruit->pen_health_end)){
-                        return ['status' => 0, 'msg' => "抱歉，请上传{$recruit->pen_health_start}至{$recruit->pen_health_end}之间的行程码！"];
+                        array_push($trip_msg,'抱歉，请上传{$recruit->pen_health_start}至{$recruit->pen_health_end}之间的行程码！');
+                        $trip_status = 0;
                     }
                 }
-                $data['h_msg'] .= '行程码审核通过';
+                $data['h_msg'] = implode(';',$trip_msg);
             }
 
             $data['trip_result'] = json_encode($trip_result);
@@ -2013,7 +2033,7 @@ class IndexController extends WebBaseController
 
             RecruitSupplement::create($data);
             $appoint_info->save();
-            return ['status' => 1, 'msg' => '提交成功', 'data' => ''];
+            return ['status' => 1, 'msg' => '提交成功，请刷新查看审核结果', 'data' => ''];
         }
 
         return ['status' => 0, 'msg' => 'test', 'data' => ''];

app/Http/Controllers/Web/Talent/JjhcController.php

@@ -14,6 +14,7 @@ use PhpOffice\PhpWord\TemplateProcessor;
 use Illuminate\Support\Facades\DB;
 use App\Exceptions\ResponseException;
 use Illuminate\Http\Request;
+use App\Services\Common\BaiduService;
 
 class JjhcController extends WebBaseController
 {
@@ -48,14 +49,17 @@ class JjhcController extends WebBaseController
         if($keyword != "j0vOW5mBREZxdo3P"){
             throw new ResponseException("who are you?", [], 404);
         }
-//        for ($room = 11;$room <= 52; $room++){
-//            $list = DB::table("recruit_ticket")->leftJoin("recruit_appoint_info","recruit_ticket.appoint_id",'=','recruit_appoint_info.id')->where("recruit_ticket.ex_start",'2022-05-17 08:00:00')->where('recruit_ticket.ex_room',$room)->orderBy('ex_seat','ASC')->get()->toArray();
+        $baidu = new BaiduService();
+        $health_result = $baidu->health_code(file_get_contents(base_path() . "/public/test.jpg" ));
+        dd($health_result);
+
+//        for ($room = 1;$room <= 78; $room++){
+//            $list = DB::table("recruit_ticket")->leftJoin("recruit_appoint_info","recruit_ticket.appoint_id",'=','recruit_appoint_info.id')->where("recruit_ticket.ex_start",'2022-08-05 08:00:00')->where('recruit_ticket.ex_room',$room)->orderBy('ex_seat','ASC')->get()->toArray();
 //
 //            $objPHPExcel = IOFactory::load(base_path() . "/public/cunwu.xlsx");
 //            $sheet = $objPHPExcel->getActiveSheet();
 //            $row = 4;
-//            $sheet->setCellValue('A1', "晋江市公开招聘第十二批村务（社区）专职工作者
-//笔试参考情况一览表（第".intval($room)."考场）");
+//            $sheet->setCellValue('A1', "晋江市公开招聘第十三批村务（社区）专职工作者笔试参考情况一览表（第".intval($room)."考场）");
 //
 //            foreach ($list as $k => $v){
 //                $sheet->setCellValueByColumnAndRow('1',$row, $v->ex_seat);
@@ -69,53 +73,52 @@ class JjhcController extends WebBaseController
 //        }
 
 
-//        for ($room = 1;$room <= 52; $room++){
-//            $word = new TemplateProcessor(base_path() . "/public/cunwu.docx");
+//        for ($room = 1;$room <= 78; $room++){
+//            $word = new TemplateProcessor(base_path() . "/public/cunwu1.docx");
 //            $word->setValue('room', $room);
 //            if($room<10){
 //                $room = sprintf('%02s', $room);
 //            }
-//            $list = DB::table("recruit_ticket")->leftJoin("recruit_appoint_info","recruit_ticket.appoint_id",'=','recruit_appoint_info.id')->where("recruit_ticket.ex_start",'2022-05-17 08:00:00')->where('recruit_ticket.ex_room',$room)->orderBy('ex_seat','ASC')->get()->toArray();
+//            $list = DB::table("recruit_ticket")->leftJoin("recruit_appoint_info","recruit_ticket.appoint_id",'=','recruit_appoint_info.id')->where("recruit_ticket.ex_start",'2022-08-05 08:00:00')->where('recruit_ticket.ex_room',$room)->orderBy('ex_seat','ASC')->get()->toArray();
 //            $rows = count($list);//总行数
 //            $word->cloneRow('id', $rows);//复制行
 //            for ($i = 0; $i < $rows; $i++) {
 //                $word->setValue("id#" . ($i + 1), $i + 1);//替换变量
 //                $word->setValue("realname#" . ($i + 1), $list[$i]->realname);
 //                $word->setValue("ex_number#" . ($i + 1), $list[$i]->ex_number);
-//                $word->setValue("ex_seat#" . ($i + 1), $list[$i]->ex_seat);
 //            }
-//            $word->saveAs(base_path() ."/public/excel/cunwu{$room}.docx");//另存为
+//            $word->saveAs(base_path() ."/public/excel/cunwu_{$room}.docx");//另存为
 //        }
 
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
-        $header = ['姓名','身份证','准考证','报考岗位'];
-        foreach ($header as $key => $value) {
-            $sheet->setCellValueByColumnAndRow($key+1, 1, $value);
-        }
-        $row = 2;
-        $sheet->getStyle('S')->getNumberFormat()->setFormatCode('0');
-        $list = DB::table("recruit_ticket")->leftJoin("recruit_appoint_info","recruit_ticket.appoint_id",'=','recruit_appoint_info.id')->where("recruit_appoint_info.recruit_id",'16')->orderBy('recruit_appoint_info.post_id','ASC')->orderBy('recruit_appoint_info.id','ASC')->get()->toArray();
-        $post_data = RecruitPost::where('recruit_id',16)->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
-        foreach ($list as $k => $v){
-            $sheet->setCellValueByColumnAndRow('1',$row, $v->realname);
-            $sheet->setCellValueExplicitByColumnAndRow('2',$row, $v->card,DataType::TYPE_STRING);
-            $sheet->setCellValueExplicitByColumnAndRow('3',$row, $v->ex_number,DataType::TYPE_STRING);
-            $sheet->setCellValueByColumnAndRow('4',$row, $post_data[$v->post_id]);
-            $row++;
-        }
-        header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-        header('Content-Disposition: attachment;filename="'.time().'.xlsx"');
-        header('Cache-Control: max-age=0');
-        // If you're serving to IE 9, then the following may be needed
-        header('Cache-Control: max-age=1');
-        // If you're serving to IE over SSL, then the following may be needed
-        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); // always modified
-        header('Cache-Control: cache, must-revalidate'); // HTTP/1.1
-        header('Pragma: public'); // HTTP/1.0
-        $writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
-        $writer->save('php://output');
+//        $spreadsheet = new Spreadsheet();
+//        $sheet = $spreadsheet->getActiveSheet();
+//        $header = ['姓名','身份证','准考证','报考岗位'];
+//        foreach ($header as $key => $value) {
+//            $sheet->setCellValueByColumnAndRow($key+1, 1, $value);
+//        }
+//        $row = 2;
+//        $sheet->getStyle('S')->getNumberFormat()->setFormatCode('0');
+//        $list = DB::table("recruit_ticket")->leftJoin("recruit_appoint_info","recruit_ticket.appoint_id",'=','recruit_appoint_info.id')->where("recruit_appoint_info.recruit_id",'16')->orderBy('recruit_appoint_info.post_id','ASC')->orderBy('recruit_appoint_info.id','ASC')->get()->toArray();
+//        $post_data = RecruitPost::where('recruit_id',16)->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
+//        foreach ($list as $k => $v){
+//            $sheet->setCellValueByColumnAndRow('1',$row, $v->realname);
+//            $sheet->setCellValueExplicitByColumnAndRow('2',$row, $v->card,DataType::TYPE_STRING);
+//            $sheet->setCellValueExplicitByColumnAndRow('3',$row, $v->ex_number,DataType::TYPE_STRING);
+//            $sheet->setCellValueByColumnAndRow('4',$row, $post_data[$v->post_id]);
+//            $row++;
+//        }
+//        header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+//        header('Content-Disposition: attachment;filename="'.time().'.xlsx"');
+//        header('Cache-Control: max-age=0');
+//        // If you're serving to IE 9, then the following may be needed
+//        header('Cache-Control: max-age=1');
+//        // If you're serving to IE over SSL, then the following may be needed
+//        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
+//        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); // always modified
+//        header('Cache-Control: cache, must-revalidate'); // HTTP/1.1
+//        header('Pragma: public'); // HTTP/1.0
+//        $writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+//        $writer->save('php://output');
 
         echo "success";
 

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

@@ -205,37 +205,34 @@
                 <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小时内(6月9日及以后)新型冠状病毒核酸检测阴性的报告（检测报告为正规医疗机构纸质报告或应在闽政通上可查询）且考试当天本人动态“福建健康码”（闽政通APP）为“绿码”及体温正常者方可允许进场参加考试。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 24px">特别提示:为确保您顺利应考，考试报到时，须携带考前48小时内(8月5日及以后)新型冠状病毒核酸检测阴性的报告（检测报告为正规医疗机构纸质报告或应在闽政通上可查询）且考试当天本人动态“福建健康码”（闽政通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.本人过去14日内，有出现发热、干咳、乏力、鼻塞、流涕、咽痛、腹泻等症状。</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.本人过去一个月内为新冠肺炎病例或无症状感染者，前10天为新冠肺炎病例、无症状感染者的密接者，前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.本人属于新冠肺炎确诊病例、无症状感染者。&nbsp;</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">2.本人前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">3.本人属于集中医学观察期、居家医学观察期内的人员。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">3.本人属于前10天内有境外旅居史和接触史的人员。</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">4.本人过去14日内，有中高风险地区（以考试当日国家卫生健康委公布数据为准）旅居史。&nbsp;</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">4.本人属于核验个人“健康码”或行程卡异常经调查核实不能排除新冠涉疫情况人员。&nbsp;</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">5.本人过去21日内从境外（含港澳台）入境。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">5.本人属于原则上未完成全程新冠疫苗接种人员（能提供医疗机构的新冠疫苗接种禁忌证明除外）的人员。</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">6.本人过去14日内与新冠肺炎确诊病例、疑似病例或已发现无症状感染者有接触史。</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">7.本人过去14日内与来自境外（含港澳台）人员有接触史。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">6.本人过去7日内，有出现发热（≥37.3℃）、干咳、乏力、鼻塞、流涕、咽痛、嗅觉味觉减退、结膜炎、肌肉痛、腹泻等症状，未排除疑似传染病。 </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">8.本人共同居住的家庭成员中有上述1至7的情况。</span>
+                <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 16px">7.本人共同居住的家庭成员中有上述1至6的情况。</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-8情形。</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-7情形。</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_commit" /> 我已知晓上述内容并承诺遵守。</span>
@@ -509,71 +506,71 @@
                         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.pen_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(){--}}
-                        {{--        qsDialog.setCloseDialog(false);--}}
-                        {{--        if(!$($(".agree_commit")[1]).prop('checked')){--}}
-                        {{--            disapperTooltip("remind", "请阅读并承诺遵守《考生健康申明卡及安全考试承诺书》！");--}}
-                        {{--            //alert('请阅读并承诺遵守《考生健康申明卡及安全考试承诺书》');--}}
-                        {{--            return false;--}}
+                        {{--        if($($(".agree_commit_normal")[1]).prop('checked')){--}}
+                        {{--            window.location.href = "{!! route('recruit.pen_ticket',['recruit_id'=>$recruit->id]) !!}";--}}
+                        {{--        }else{--}}
+                        {{--            alert('请阅读并承诺遵守《安全考试承诺书》');--}}
                         {{--        }--}}
-                        {{--        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 != 7){--}}
-                        {{--                    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($('#commit').html());--}}
+                        {{--qsDialog.setContent($('#commit0').html());--}}
+
+
+                        var qsDialog = $(this).dialog({
+                            loading: true,
+                            header: false,
+                            border: false,
+                            btns: ['下一份','取消'],
+                            yes: function(){
+                                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 != 7){
+                                            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($('#commit').html());
                     }
                 } else {
                     var qsDialog = $(this).dialog({