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

app/Admin/Controllers/Recruit/RecruitController.php

@@ -1558,7 +1558,7 @@ class RecruitController extends Controller
                         'employ_audit' => -1
                     ];
                     RecruitAppointInfo::where('id', $v)->update($appointinfo_data);
-                    $reason = $reason ?? '符合报考条件';
+                    $reason = $reason ?? '符合报考条件，资格审核将贯穿招聘全程。';
                     //写日志
                     $log = [
                         'type'  =>  2,
@@ -1628,7 +1628,7 @@ class RecruitController extends Controller
             $this->smsService->sendSms($appointinfo->mobile,'sms_recruit_register_error',array('reason'=>$reason));
         }
         if($status == 1){
-            $reason = $reason ?? '符合报考条件';
+            $reason = $reason ?? '符合报考条件，资格审核将贯穿招聘全程。';
             $info = RecruitSupplement::where('appoint_id', $ids)->where('type','supplement')->first();
             $appointinfo = RecruitAppointInfo::where('id', $ids)->first();
             //写日志

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

@@ -1021,8 +1021,6 @@
 
         $(".J_btnyes").on("click",function(){
             $('.J_btnyes').val('发送中...');
-            window.location.href="{{ route('recruit.appoint_list',['id'=>$recruit->id]) }}"
-            return false;
             $.post("{{ route('recruit.appoint_audit') }}", $('#J_interviewWrap').serialize(), function(result) {
                 if (result.status == 1) {
                     disapperTooltip('success', result.msg);