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

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

@@ -138,7 +138,8 @@ class IndexController extends WebBaseController
 
             if($face_ticket && $appoint_info->face_audit == -1){
                 $face_health = RecruitSupplement::where("appoint_id",$appoint_info->id)->where("type","face")->where('h_status',1)->first();
-                if(!$face_health){
+                if(!$face_health && $recruit->face_epidemic){
+                    $appoint_info->face_ticket = -2;
                     $time = time();
                     if(strtotime($recruit->face_health_start) < $time && strtotime($recruit->face_health_end) > $time){
                         $appoint_info->face_ticket = -2;
@@ -146,7 +147,12 @@ class IndexController extends WebBaseController
                         $appoint_info->face_ticket = -3;
                     }
                 }else{
-                    $appoint_info->face_ticket = 1;
+                    $time = time();
+                    if(strtotime($recruit->face_health_start) < $time && strtotime($recruit->face_health_end) > $time){
+                        $appoint_info->face_ticket = 1;
+                    }else{
+                        $appoint_info->face_ticket = -1;
+                    }
                 }
 
             }else{
@@ -1372,15 +1378,15 @@ class IndexController extends WebBaseController
             return $this->showMessage('请登录！', route('home'), true, '上一页', '3');
         }
         $recruit_id = $request->input('recruit_id');
+        $recruit = Recruit::where('id',$recruit_id)->first();
         $appoint_info = RecruitAppointInfo::where('uid',$uid)->where('recruit_id',$recruit_id)->first();
         if($appoint_info){
             $face_ticket = RecruitTicket::where('appoint_id',$appoint_info->id)->where('ex_type',3)->first();
             if($face_ticket){
                 $health = RecruitSupplement::where('appoint_id',$appoint_info->id)->first();
-                if(!$health || $health->h_status == 0){
+                if((!$health || $health->h_status == 0) && $recruit->pen_epidemic){
                     return $this->showMessage('健康审核信息未通过！', route('home'), true, '上一页', '3');
-                }
-                $time = time();
+                }$time = time();
                 if(strtotime($face_ticket->ex_start) < $time && strtotime($face_ticket->ex_end) > $time){
                     RecruitTicket::where('id',$face_ticket->id)->update(['ex_status' => 1]);
                     $recruit = Recruit::where('id',$recruit_id)->first();

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

@@ -718,10 +718,10 @@
                 var isVisitorutype = "{{$utype}}"; //判断是企业还是个人
                 var face_ticket = "{{$appoint_info->face_ticket}}";
                 if ((isVisitor > 0)) {
-                    if (isApply != 1) {
-                        disapperTooltip("remind", "抱歉，您没有报名！");
-                        return false;
-                    }
+                    // if (isApply != 1) {
+                    //     disapperTooltip("remind", "抱歉，您没有报名！");
+                    //     return false;
+                    // }
                     if(face_ticket == 0){
                         disapperTooltip("remind", "您暂无可打印的准考证！");
                         return false;
@@ -758,63 +758,64 @@
                         {{--    }--}}
                         {{--});--}}
                         {{--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($recruit->id == 21)
-                                            if(total != 6){
-                                                disapperTooltip("remind", "请勾选以上项目！");
-                                                return false;
-                                            }
-                                        @else
-                                            if(total != 6){
-                                                disapperTooltip("remind", "请勾选以上项目！");
-                                                return false;
-                                            }
-                                        @endif
+                            window.location.href = "{!! route('recruit.face_ticket',['recruit_id'=>$recruit->id,'uid'=>$uid]) !!}";
+                        {{--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($recruit->id == 21)--}}
+                        {{--                    if(total != 6){--}}
+                        {{--                        disapperTooltip("remind", "请勾选以上项目！");--}}
+                        {{--                        return false;--}}
+                        {{--                    }--}}
+                        {{--                @else--}}
+                        {{--                    if(total != 6){--}}
+                        {{--                        disapperTooltip("remind", "请勾选以上项目！");--}}
+                        {{--                        return false;--}}
+                        {{--                    }--}}
+                        {{--                @endif--}}
 
-                                        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.face_ticket',['recruit_id'=>$recruit->id,'uid'=>$uid]) !!}";
-                                    }
-                                });
-                                dialog_1.setContent($('#commit1').html())
-                            }
-                        });
-                        qsDialog.setContent($('#commit').html());
+                        {{--                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.face_ticket',['recruit_id'=>$recruit->id,'uid'=>$uid]) !!}";--}}
+                        {{--            }--}}
+                        {{--        });--}}
+                        {{--        dialog_1.setContent($('#commit1').html())--}}
+                        {{--    }--}}
+                        {{--});--}}
+                        {{--qsDialog.setContent($('#commit').html());--}}
                     }
                 } else {
                     var qsDialog = $(this).dialog({