Browse Source

人才购房系统

linwu 3 năm trước cách đây
mục cha
commit
7f68d84bb7

+ 47 - 6
app/Admin/Controllers/Content/BuyHouseController.php

@@ -85,8 +85,15 @@ class BuyHouseController extends Controller
                 return '';
             }
         });
-        $grid->status('状态')->display(function () use ($status_text) {
-            return $status_text[$this->status];
+        $grid->status('状态')->display(function () {
+            $time = time();
+            if (strtotime($this->apply_time_start) > $time) {
+                return '未开始';
+            }
+            if (strtotime($this->apply_time_end) < $time) {
+                return '已结束';
+            }
+            return '申报中';
         });
         $grid->declare_time('申报时间')->display(function () {
             return date('Y-m-d', strtotime($this->declare_time));
@@ -111,6 +118,10 @@ class BuyHouseController extends Controller
             if ($actions->row['is_sock'] == 1) {
                 $actions->append("&nbsp;<button class='btn btn-primary btn-xs sock' data-id=" . $actions->row['id'] . ">释放名额</button>");
             }
+            if (strtotime($actions->row['supply_time']) <= time() && $actions->row['sync_status'] == 2) {
+                $actions->append("&nbsp;<button class='btn btn-default btn-xs select_house' data-id=" . $actions->row['id'] . ">选房顺序号</button>");
+                $actions->append("&nbsp;<button class='btn btn-warning btn-xs sync' data-id=" . $actions->row['id'] . ">同步到选房系统</button>");
+            }
         });
 
         $grid->filter(function ($filter) {
@@ -118,8 +129,15 @@ class BuyHouseController extends Controller
             $filter->like('name', '项目名称');
             $status_option = ['全部', '未开始', '申报中', '已结束'];
             $filter->where(function ($query) {
-                if ($this->input > 0) {
-                    $query->where('status', '=', $this->input);
+                $date = date('Y-m-d H:i:s');
+                if ($this->input == 1) {
+                    $query->where('apply_time_start', '>', $date);
+                }
+                if ($this->input == 2) {
+                    $query->where('apply_time_start', '<', $date)->where('apply_time_end', '>', $date);
+                }
+                if ($this->input == 3) {
+                    $query->where('apply_time_end', '<', $date);
                 }
             }, '状态', 'status')->radio($status_option);
         });
@@ -140,7 +158,6 @@ class BuyHouseController extends Controller
         $form->datetime('apply_time_end', '报名结束时间')->rules('required', ['required' => '报名结束时间不能为空。'])->setWidth(4)->setMustMark();
         $form->datetime('supply_time', '补件截止时间')->rules('required', ['required' => '补件截止时间不能为空。'])->setWidth(4)->setMustMark();
         $form->text('address', '地址')->rules('required|max:100', ['required' => '地址不能为空。', 'max' => '地址长度不能大于100。'])->setWidth(8)->setMustMark();
-        $form->radio('status', '状态')->rules('required', ['required' => '请选择状态。'])->options([1 => '未开始', 2 => '申报中', 3 => '已结束'])->setWidth(8)->setMustMark();
         $form->image('small_img', '缩略图')->uniqueName()->rules('image|mimes:jpeg,bmp,png', ['image' => '缩略图请选择图片文件。', 'mimes' => '请选择jpeg,bmp,png格式的缩略图上传。'])->setWidth(4);
         $form->textarea('describe', '描述')->rules('required|max:1024', ['required' => '描述不能为空。', 'max' => '描述长度不能大于1024。'])->setWidth(8)->setMustMark();
         $form->editor('content', '内容')->rules('required', ['required' => '内容不能为空。'])->setMustMark();
@@ -172,7 +189,6 @@ class BuyHouseController extends Controller
         $form->datetime('apply_time_end', '报名结束时间')->rules('required', ['required' => '报名结束时间不能为空。'])->setWidth(4)->setMustMark();
         $form->datetime('supply_time', '补件截止时间')->rules('required', ['required' => '补件截止时间不能为空。'])->setWidth(4)->setMustMark();
         $form->text('address', '地址')->rules('required|max:100', ['required' => '地址不能为空。', 'max' => '地址长度不能大于100。'])->setWidth(8)->setMustMark();
-        $form->radio('status', '状态')->rules('required', ['required' => '请选择状态。'])->options([1 => '未开始', 2 => '申报中', 3 => '已结束'])->setWidth(8)->setMustMark();
         $form->image('small_img', '缩略图')->uniqueName()->rules('image|mimes:jpeg,bmp,png', ['image' => '缩略图请选择图片文件。', 'mimes' => '请选择jpeg,bmp,png格式的缩略图上传。'])->setWidth(4);
         $form->textarea('describe', '描述')->rules('required|max:1024', ['required' => '描述不能为空。', 'max' => '描述长度不能大于1024。'])->setWidth(8)->setMustMark();
         $form->editor('content', '内容')->rules('required', ['required' => '内容不能为空。'])->setMustMark();
@@ -255,4 +271,29 @@ class BuyHouseController extends Controller
 
         return response()->json(['code' => 1]);
     }
+
+    /**
+     * 同步选房系统
+     */
+    public function sync(Request $request)
+    {
+        $id = $request->id;
+
+        if (empty($id)) {
+            return response()->json(['code' => 0, 'content' => '数据异常']);
+        }
+
+        $house = TalentHouse::find($id);
+        if (strtotime($house['supply_time']) > time()) {
+            return response()->json(['code' => 0, 'content' => '报名还未结束']);
+        }
+        if ($house['sync_status'] == 1) {
+            return response()->json(['code' => 1]);
+        }
+
+        //TODO:同步选房系统,等接口
+        TalentHouse::where('id', $id)->update(['sync_status' => 1]);
+
+        return response()->json(['code' => 1]);
+    }
 }

+ 196 - 0
app/Admin/Controllers/Content/BuyHouseSelectController.php

@@ -0,0 +1,196 @@
+<?php
+
+namespace App\Admin\Controllers\Content;
+
+use App\Admin\Exports\Content\SelectHouseExport;
+use App\Http\Controllers\Controller;
+use App\Models\TalentHouseApply;
+use Encore\Admin\Controllers\HasResourceActions;
+use Encore\Admin\Grid;
+use Encore\Admin\Layout\Content;
+use Illuminate\Http\Request;
+
+class BuyHouseSelectController extends Controller
+{
+    use HasResourceActions;
+
+    private $marry = ['未知', '未婚', '已婚', '离异', '丧偶'];
+
+    /**
+     * Index interface.
+     *
+     * @param Content $content
+     * @return Content
+     */
+    public function index($id,Content $content)
+    {
+        return $content
+            ->header('选房顺序号')
+            ->description(' ')
+            ->body(view('admin.content.buy_house_select')->with(['grid' => $this->grid($id)]));
+    }
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid($id)
+    {
+        $grid = new Grid(new TalentHouseApply());
+
+        $grid->model()->where('house_id',$id)->where('status',2)->orderBy('select_house_no', 'ASC');
+
+        $grid->id('ID');
+        $grid->name('姓名');
+        $grid->mobile('联系电话');
+        $grid->talent_level('人才层次');
+        $grid->select_house_no('顺序号')->display(function (){
+            if ($this->select_house_no == 999999) {
+                return '无';
+            }
+            return $this->select_house_no;
+        });
+
+        $grid->actions(function ($actions) {
+            $actions->append("&nbsp;<button class='btn btn-primary btn-xs detail' id=" . $actions->row['id'] . ">详情</button>");
+            if ($actions->row['select_house_no'] == 999999) {
+                $actions->append("<button class='btn btn-default btn-xs select_no' data-code=" . $actions->row['id'] . ">填写顺序号</button>");
+            }
+        });
+
+        $grid->filter(function ($filter) {
+            $filter->disableIdFilter();
+            $filter->like('name', '姓名');
+            $filter->like('mobile', '电话');
+        });
+
+        $grid->disableExport(false); //显示导出按钮
+        $grid->exporter(new SelectHouseExport()); //传入自己在第1步创建的导出类
+
+        return $grid;
+    }
+
+    /**
+     * 详情
+     */
+    public function detail(Request $request)
+    {
+        $id   = $request->id;
+        $info = TalentHouseApply::find($id);;
+        $info->family     = json_decode($info->family);
+        $info->marry_text = $this->marry[$info->marry];
+
+        //layer相册层
+        $photos = [
+            'certificates'       => [],
+            'marry_prove'        => [],
+            'household_register' => [],
+            'work_prove'         => [],
+        ];
+        if (!empty(json_decode($info->certificates))) {
+            $info->certificates = json_decode($info->certificates);
+            $photo_data         = [];
+            foreach ($info->certificates as $k => $v) {
+                $photo_data[] = [
+                    'alt' => $v->name,
+                    'pid' => $v->uid,
+                    'src' => $v->response->path,
+                ];
+            }
+            $photos['certificates'] = [
+                'title' => '证件信息',
+                'id'    => 1,
+                'start' => 0,
+                'data'  => $photo_data,
+            ];
+        } else {
+            $info->certificates = [];
+        }
+        if (!empty(json_decode($info->marry_prove))) {
+            $info->marry_prove = json_decode($info->marry_prove);
+            $photo_data        = [];
+            foreach ($info->marry_prove as $k => $v) {
+                $photo_data[] = [
+                    'alt' => $v->name,
+                    'pid' => $v->uid,
+                    'src' => $v->response->path,
+                ];
+            }
+            $photos['marry_prove'] = [
+                'title' => '婚姻证明',
+                'id'    => 1,
+                'start' => 0,
+                'data'  => $photo_data,
+            ];
+        } else {
+            $info->marry_prove = [];
+        }
+        if (!empty(json_decode($info->household_register))) {
+            $info->household_register = json_decode($info->household_register);
+            $photo_data               = [];
+            foreach ($info->household_register as $k => $v) {
+                $photo_data[] = [
+                    'alt' => $v->name,
+                    'pid' => $v->uid,
+                    'src' => $v->response->path,
+                ];
+            }
+            $photos['household_register'] = [
+                'title' => '户口本',
+                'id'    => 1,
+                'start' => 0,
+                'data'  => $photo_data,
+            ];
+        } else {
+            $info->household_register = [];
+        }
+        if (!empty(json_decode($info->work_prove))) {
+            $info->work_prove = json_decode($info->work_prove);
+            $photo_data       = [];
+            foreach ($info->work_prove as $k => $v) {
+                $photo_data[] = [
+                    'alt' => $v->name,
+                    'pid' => $v->uid,
+                    'src' => $v->response->path,
+                ];
+            }
+            $photos['work_prove'] = [
+                'title' => '在职证明',
+                'id'    => 1,
+                'start' => 0,
+                'data'  => $photo_data,
+            ];
+        } else {
+            $info->work_prove = [];
+        }
+        $html = view('admin.ajax.buy_house_detail')->with(['info' => $info, 'photos' => $photos])->render();
+        return response()->json(['code' => 1, 'data' => $html]);
+    }
+
+    /**
+     * 选房顺序号
+     */
+    public function select(Request $request)
+    {
+        $id   = $request->id;
+        $select_house_no   = $request->select_house_no;
+        $url    = empty($request->url) ? admin_base_path('content/buy_house') : $request->url;
+
+        $apply = TalentHouseApply::find($id);
+        if ($apply->select_house_no != 999999) {
+            admin_toastr('数据错误,请重试', 'error');
+        } else {
+            $check = TalentHouseApply::where('select_house_no',$select_house_no)->where('house_id',$apply['house_id'])->first();
+            if ($check) {
+                admin_toastr('该顺序号已存在!', 'error');
+            } else {
+                $apply->select_house_no = $select_house_no;
+                $apply->save();
+                admin_toastr('操作成功', 'success');
+            }
+        }
+
+        return redirect($url);
+    }
+}

+ 20 - 20
app/Admin/Controllers/Recruit/RecruitController.php

@@ -720,11 +720,11 @@ class RecruitController extends Controller
         Permission::check('recruit_getUserinfo');
         $id = $request->id;
         $data = RecruitAppointInfo::where('recruit_appoint_info.id',$id)
-                ->join('recruit_post', 'recruit_appoint_info.post_id', '=', 'recruit_post.id', 'left')
-                ->join('recruit_appoint_expand_special', 'recruit_appoint_info.id', '=', 'recruit_appoint_expand_special.recruit_appoint_id', 'left')
-                ->join('recruit_appoint_detail', 'recruit_appoint_detail.recruit_appoint_id', '=', 'recruit_appoint_info.id', 'left')
-                ->select('recruit_appoint_info.*', 'recruit_post.name', 'recruit_post.code', 'recruit_appoint_detail.train', 'recruit_appoint_detail.rewards_and_punishments', 'recruit_appoint_detail.introduce', 'recruit_appoint_expand_special.point_apply', 'recruit_appoint_expand_special.condition', 'recruit_appoint_expand_special.material')
-                ->first();
+            ->join('recruit_post', 'recruit_appoint_info.post_id', '=', 'recruit_post.id', 'left')
+            ->join('recruit_appoint_expand_special', 'recruit_appoint_info.id', '=', 'recruit_appoint_expand_special.recruit_appoint_id', 'left')
+            ->join('recruit_appoint_detail', 'recruit_appoint_detail.recruit_appoint_id', '=', 'recruit_appoint_info.id', 'left')
+            ->select('recruit_appoint_info.*', 'recruit_post.name', 'recruit_post.code', 'recruit_appoint_detail.train', 'recruit_appoint_detail.rewards_and_punishments', 'recruit_appoint_detail.introduce', 'recruit_appoint_expand_special.point_apply', 'recruit_appoint_expand_special.condition', 'recruit_appoint_expand_special.material')
+            ->first();
         $recruit = Recruit::where('id',$data->recruit_id)->first();
         $recruit->forms = explode(',', $recruit->forms);
         $data->family = json_decode($data->family);
@@ -1840,8 +1840,8 @@ class RecruitController extends Controller
         }
 
         $list = $model->select($select)
-                ->orderBy('recruit_appoint_info.updated_at','desc')
-                ->get();
+            ->orderBy('recruit_appoint_info.updated_at','desc')
+            ->get();
 
         if(count($list)){
             $spreadsheet = new Spreadsheet();
@@ -2129,9 +2129,9 @@ class RecruitController extends Controller
                 if(empty($v->word_url)){
                     $item[] = "暂无";
                 }else{
-                    $item[] = "https://www.jucai.gov.cn/" . $v->word_url;     
+                    $item[] = "https://www.jucai.gov.cn/" . $v->word_url;
                 }
-                
+
                 array_push($data,$item);
             }
 
@@ -2294,10 +2294,10 @@ class RecruitController extends Controller
         switch ($type){
             case 'pen':
                 $list = RecruitAppointInfo::where('recruit_appoint_info.recruit_id',$recruit_id)
-                        ->where('recruit_appoint_info.audit',3)
-                        ->where('recruit_appoint_info.pen_audit',-1)
-                        ->join('recruit_ticket', 'recruit_appoint_info.id', '=', 'recruit_ticket.appoint_id')
-                        ->select('recruit_appoint_info.*','recruit_ticket.ex_number')->orderBy('post_id','asc')->get();
+                    ->where('recruit_appoint_info.audit',3)
+                    ->where('recruit_appoint_info.pen_audit',-1)
+                    ->join('recruit_ticket', 'recruit_appoint_info.id', '=', 'recruit_ticket.appoint_id')
+                    ->select('recruit_appoint_info.*','recruit_ticket.ex_number')->orderBy('post_id','asc')->get();
                 $post_data = RecruitPost::where('recruit_id',$recruit_id)->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
                 $data = [];
                 foreach ($list as $k => $v){
@@ -2342,13 +2342,13 @@ class RecruitController extends Controller
                 break;
             case 'face':
                 $list = RecruitAppointInfo::where('recruit_appoint_info.recruit_id',$recruit_id)
-                        ->where('recruit_appoint_info.audit',3)
-                        ->where('recruit_appoint_info.face_audit',-1)
-                        ->where(function($query){
-                            $query->where('recruit_appoint_info.pen_audit',1)
-                                ->orWhere('recruit_appoint_info.pen_audit',3);
-                        })
-                        ->join('recruit_ticket', 'recruit_appoint_info.id', '=', 'recruit_ticket.appoint_id')->select('recruit_appoint_info.*','recruit_ticket.ex_number')->orderBy('post_id','asc')->get();
+                    ->where('recruit_appoint_info.audit',3)
+                    ->where('recruit_appoint_info.face_audit',-1)
+                    ->where(function($query){
+                        $query->where('recruit_appoint_info.pen_audit',1)
+                            ->orWhere('recruit_appoint_info.pen_audit',3);
+                    })
+                    ->join('recruit_ticket', 'recruit_appoint_info.id', '=', 'recruit_ticket.appoint_id')->select('recruit_appoint_info.*','recruit_ticket.ex_number')->orderBy('post_id','asc')->get();
 
                 $post_data = RecruitPost::where('recruit_id',$recruit_id)->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
                 $data = [];

+ 58 - 0
app/Admin/Exports/Content/SelectHouseExport.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Admin\Exports\Content;
+
+use App\Admin\Exports\ViewExport;
+use Illuminate\Contracts\View\View;
+use Illuminate\Support\Collection;
+
+class SelectHouseExport extends ViewExport
+{
+    /**
+     * 设置文件名
+     * @return string
+     */
+    public function getFilename(): string
+    {
+        return "select_house.xlsx";
+    }
+
+    /**
+     * 渲染对应的视图
+     * @param Collection $data 导出的数据
+     * @return View
+     */
+    public function getView(Collection $data): View
+    {
+        $res = [];
+        foreach ($data as $row) {
+            $result            = [];
+            $result['child']   = '';
+            $result['id_card'] = '';
+
+            $family = empty($row->family) ? '' : json_decode($row->family, true);
+
+            if (!empty($family)) {
+                $child   = [];
+                $id_card = [];
+                foreach ($family as $v) {
+                    if (strpos($v['relation'], '未成年子女') !== false) {
+                        $child[]   = $v['realname'];
+                        $id_card[] = $v['idcard'];
+                    }
+                }
+                $result['child']   = implode('/', $child);
+                $result['id_card'] = implode('/', $id_card);
+            }
+
+            $result['register_no']   = '';
+            $result['mobile']        = $row->mobile;
+            $result['marry']         = $row->marry > 1 ? '是' : '否';
+            $result['select_status'] = $row->select_house_no == 999999 ? '否' : '是';
+
+            $res[] = $result;
+        }
+
+        return view('admin.content.export_select_house', ['data' => $res]);
+    }
+}

+ 17 - 15
app/Admin/routes.php

@@ -143,25 +143,25 @@ Route::group([
         $router->get('ajax/getpromotion', 'AjaxController@getPromotion')->name('ajax.getpromotion');
         //个人推广
         $router->get('ajax/getresume', 'AjaxController@getResume')->name('ajax.getresume');
-        
+
         $router->resource('template/company', CompanyTemplateController::class)->names('template.company');
         $router->resource('template/person', PersonTemplateController::class)->names('template.person');
-        
+
         $router->resource('template/home', HomeTemplateController::class)->names('template.home');
-    
+
         $router->resource('consultant', ConsultantController::class);
-        
+
         $router->post('consultantSet', 'CompanyController@consultantSet')->name('consultant.set');
-        
+
         $router->post('consultantSetUpdate', 'CompanyController@consultantSetUpdate')->name('consultant.set.update');
-        
+
         $router->get('consultantList', 'ConsultantController@consultantList')->name('consultant.list');
-        
-        
+
+
         $router->post('consultantReset', 'ConsultantController@consultantReset')->name('consultant.reset');
 
-        
-        
+
+
     });
 
     //个人管理
@@ -286,11 +286,11 @@ Route::group([
 
         $router->post('feedback/audit', 'FeedbackController@audit')->name('feedback.audit');
         $router->resource('feedback', FeedbackController::class);
-    
+
         $router->resource('complaint/adviser', ComplaintAdviserController::class);
-    
+
         $router->post('complaint/auditAdviser', 'ComplaintAdviserController@auditAdviser');
-        
+
         $router->post('complaint/auditAdviserR', 'ComplaintAdviserController@auditAdviserR')->name('admin.complaint.auditAdviserR');
 
 
@@ -323,6 +323,10 @@ Route::group([
         //人才购房
         $router->resource('buy_house', BuyHouseController::class)->names('content.buy_house');
         $router->any('buy_house/sock', 'BuyHouseController@sock')->name('content.buy_house.sock');
+        $router->any('buy_house/sync', 'BuyHouseController@sync')->name('content.buy_house.sync');
+        $router->get('buy_house_select/index/{id}', 'BuyHouseSelectController@index')->name('content.buy_house_select');
+        $router->get('buy_house_select/detail', 'BuyHouseSelectController@detail')->name('content.buy_house_select.detail');
+        $router->post('buy_house_select/select', 'BuyHouseSelectController@select')->name('content.buy_house_select.select');
         $router->get('buy_house_rs', 'BuyHouseRsController@index')->name('content.buy_house_rs');
         $router->get('buy_house_rs/detail', 'BuyHouseRsController@detail')->name('content.buy_house_rs.detail');
         $router->post('buy_house_rs/audit', 'BuyHouseRsController@audit')->name('content.buy_house_rs.audit');
@@ -436,8 +440,6 @@ Route::group([
         $router->get('out_zip', 'RecruitController@out_zip')->name('recruit.out_zip');
         $router->get('out_excel', 'RecruitController@out_excel')->name('recruit.out_excel');
         $router->post('appoint_audit', 'RecruitController@appoint_audit')->name('recruit.appoint_audit');
-        $router->get('ajax_supplement', 'RecruitController@ajax_supplement')->name('recruit.ajax_supplement');
-        $router->post('supplement', 'RecruitController@supplement')->name('recruit.supplement');
         $router->post('modify_appoint_info', 'RecruitController@modify_appoint_info')->name('recruit.modify_appoint_info');
         $router->get('seat_sticker', 'RecruitController@seat_sticker')->name('recruit.seat_sticker');
         $router->get('sign_table', 'RecruitController@sign_table')->name('recruit.sign_table');

+ 6 - 6
app/Http/Controllers/Web/Recruit/IndexController.php

@@ -1096,12 +1096,12 @@ class IndexController extends WebBaseController
             $info->edu_type = (string)$info->edu_type;
             $info->is_push = (string)$info->is_push;
             $info->family = empty($info->family) ? [[
-                'relation' => '',
-                'realname' => '',
-                'birthday' => '',
-                'political_affiliation' => '',
-                'work' => ''
-            ]] : json_decode($info->family);
+                                                        'relation' => '',
+                                                        'realname' => '',
+                                                        'birthday' => '',
+                                                        'political_affiliation' => '',
+                                                        'work' => ''
+                                                    ]] : json_decode($info->family);
         }
         $recruit_id = $request->input('recruit_id',0);
         return view('app.person.recruit_info',[

+ 38 - 38
app/Jobs/TicketJob.php

@@ -188,7 +188,7 @@ class TicketJob implements ShouldQueue
                     case '0'://不需要额外数据
                         $list = RecruitAppointInfo::where('recruit_id',$this->recruit_id)->where('audit',3)->where('face_audit',-1)->where(function($query){
                             $query->where('pen_audit',1)
-                                  ->orWhere('pen_audit',3);
+                                ->orWhere('pen_audit',3);
                         })->orderBy('post_id','asc')->orderBy('created_at','asc')->get()->toArray();
                         $post_data = RecruitPost::where('recruit_id',$this->recruit_id)->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
                         if($list){
@@ -218,13 +218,13 @@ class TicketJob implements ShouldQueue
                     case '2':
                         $ticket_data_list = $this->data['list'];
                         $list = RecruitAppointInfo::where('recruit_id',$this->recruit_id)
-                                ->where('audit',3)
-                                ->where('face_audit',-1)
-                                ->where(function($query){
-                                    $query->where('recruit_appoint_info.pen_audit',1)
-                                        ->orWhere('recruit_appoint_info.pen_audit',3);
-                                })
-                                ->orderBy('post_id','asc')->orderBy('created_at','asc')->get()->toArray();
+                            ->where('audit',3)
+                            ->where('face_audit',-1)
+                            ->where(function($query){
+                                $query->where('recruit_appoint_info.pen_audit',1)
+                                    ->orWhere('recruit_appoint_info.pen_audit',3);
+                            })
+                            ->orderBy('post_id','asc')->orderBy('created_at','asc')->get()->toArray();
                         $post_data = RecruitPost::where('recruit_id',$this->recruit_id)->where('status',1)->selectRaw('id, CONCAT(code," ",name) as post')->pluck('post', 'id');
 
                         foreach ($list as $k => $v){
@@ -270,37 +270,37 @@ class TicketJob implements ShouldQueue
                 }
                 break;
             case 'pen_result':
-                    $list = $this->data;
-                    foreach ($list as $k => $v){
-                        if(!array_key_exists('id',$v) || intval($v['id']) <= 0){
-                            continue;
-                        }
-                        $appoint_info = RecruitAppointInfo::where('recruit_appoint_info.id',$v['id'])->where('recruit_appoint_info.recruit_id',$this->recruit_id)->join('recruit_ticket', 'recruit_appoint_info.id', '=', 'recruit_ticket.appoint_id')->select('recruit_appoint_info.*','recruit_ticket.ex_number')->first();
-                        if(!$appoint_info){
-                            continue;
-                        }
-                        if($appoint_info->realname != $v['realname'] || $appoint_info->card != $v['card'] || $appoint_info->ex_number != $v['ex_number']){
-                            //数据污染,路过处理
-                            continue;
-                        }
-                        if($v['next'] == '是'){
-                            $update['pen_audit'] = 1;
-                            $status = -1;
-                        }else{
-                            $update['pen_audit'] = 0;
-                            $status = 3;
-                        }
-                        if(!is_numeric($v['record']) && empty($v['record'])){
-                            $update['pen_audit'] = 2;
-                            $status = 3;
-                        }
-                        if(in_array(4,explode(',',$recruit->step))){
-                            $update['computer_audit'] = $status;
-                        }else{
-                            $update['face_audit'] = $status;
-                        }
-                        RecruitAppointInfo::where('id',$v['id'])->update($update);
+                $list = $this->data;
+                foreach ($list as $k => $v){
+                    if(!array_key_exists('id',$v) || intval($v['id']) <= 0){
+                        continue;
+                    }
+                    $appoint_info = RecruitAppointInfo::where('recruit_appoint_info.id',$v['id'])->where('recruit_appoint_info.recruit_id',$this->recruit_id)->join('recruit_ticket', 'recruit_appoint_info.id', '=', 'recruit_ticket.appoint_id')->select('recruit_appoint_info.*','recruit_ticket.ex_number')->first();
+                    if(!$appoint_info){
+                        continue;
+                    }
+                    if($appoint_info->realname != $v['realname'] || $appoint_info->card != $v['card'] || $appoint_info->ex_number != $v['ex_number']){
+                        //数据污染,路过处理
+                        continue;
+                    }
+                    if($v['next'] == '是'){
+                        $update['pen_audit'] = 1;
+                        $status = -1;
+                    }else{
+                        $update['pen_audit'] = 0;
+                        $status = 3;
                     }
+                    if(!is_numeric($v['record']) && empty($v['record'])){
+                        $update['pen_audit'] = 2;
+                        $status = 3;
+                    }
+                    if(in_array(4,explode(',',$recruit->step))){
+                        $update['computer_audit'] = $status;
+                    }else{
+                        $update['face_audit'] = $status;
+                    }
+                    RecruitAppointInfo::where('id',$v['id'])->update($update);
+                }
                 break;
         }
     }

+ 0 - 36
database/migrations/2021_06_15_124839_create_jobs_table.php

@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateJobsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('jobs', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('queue')->index();
-            $table->longText('payload');
-            $table->unsignedTinyInteger('attempts');
-            $table->unsignedInteger('reserved_at')->nullable();
-            $table->unsignedInteger('available_at');
-            $table->unsignedInteger('created_at');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('jobs');
-    }
-}

+ 0 - 36
database/migrations/2021_06_15_124926_create_jobs_table.php

@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateJobsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('jobs', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('queue')->index();
-            $table->longText('payload');
-            $table->unsignedTinyInteger('attempts');
-            $table->unsignedInteger('reserved_at')->nullable();
-            $table->unsignedInteger('available_at');
-            $table->unsignedInteger('created_at');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('jobs');
-    }
-}

+ 0 - 35
database/migrations/2021_06_15_125107_create_failed_jobs_table.php

@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateFailedJobsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('failed_jobs', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->text('connection');
-            $table->text('queue');
-            $table->longText('payload');
-            $table->longText('exception');
-            $table->timestamp('failed_at')->useCurrent();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('failed_jobs');
-    }
-}

+ 227 - 227
public/themes/default/views/app/recruit/show.blade.php

@@ -90,8 +90,8 @@
                 <div style="clear: both;"></div>
             </ul>
             <div class="content_right_notice" style="margin-top: 20px;">
-                @if($public_notice_switch)
-                    <!--标题-->
+            @if($public_notice_switch)
+                <!--标题-->
                     <div class="right_notice_title">
                         <b></b>
                         <span class="tit">最新公告</span>
@@ -204,153 +204,153 @@
                 <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">
-                <form class="commit_step_1">
+            <form class="commit_step_1">
                 <table width="100%">
                     <tbody>
-                        <tr>
-                            <td style="line-height: 37px" width="90%">
-                                1.本人过去14日内,是否出现发热、干咳、乏力、鼻塞、流涕、咽痛、腹泻等症状。
-                            </td>
-                            <td>
-                                <input type="radio"  name="q1" value="1" />是
-                            </td>
-                            <td>
-                                <input type="radio"  name="q1" value="0" />否
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="line-height: 37px">
-                                2.本人是否属于新冠肺炎确诊或疑似病例、无症状感染者。
-                            </td>
-                            <td>
-                                <input type="radio"  name="q2" value="1" />是
-                            </td>
-                            <td>
-                                <input type="radio"  name="q2" value="0" />否
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="line-height: 37px">
-                                3.本人过去14日内,是否在居住地有被隔离或曾被隔离且未做核酸检测。
-                            </td>
-                            <td>
-                                <input type="radio"  name="q3" value="1" />是
-                            </td>
-                            <td>
-                                <input type="radio"  name="q3" value="0" />否
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="line-height: 37px">
-                                4.本人过去14日内,是否从省外中高风险地区入闽。
-                            </td>
-                            <td>
-                                <input type="radio"  name="q4" value="1" />是
-                            </td>
-                            <td>
-                                <input type="radio"  name="q4" value="0" />否
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="line-height: 37px">
-                                5.本人一个月内是否从境外(含港澳台)入闽。
-                            </td>
-                            <td>
-                                <input type="radio"  name="q5" value="1" />是
-                            </td>
-                            <td>
-                                <input type="radio"  name="q5" value="0" />否
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="line-height: 37px">
-                                6.本人过去14日内是否与新冠肺炎确诊病例、疑似病例或已发现无症状感染者有接触史。
-                            </td>
-                            <td>
-                                <input type="radio"  name="q6" value="1" />是
-                            </td>
-                            <td>
-                                <input type="radio"  name="q6" value="0" />否
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="line-height: 37px">
-                                7.本人过去14日内是否与来自境外(含港澳台)人员有接触史。
-                            </td>
-                            <td>
-                                <input type="radio"  name="q7" value="1" />是
-                            </td>
-                            <td>
-                                <input type="radio"  name="q7" value="0" />否
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="line-height: 37px">
-                                8.过去14日内,本人的工作(实习)岗位是否属于医疗机构医务人员、公共场所服务人员、口岸检疫排查人员、公共交通驾驶员、铁路航空乘务人员、进口冷链一条线从业人员。
-                            </td>
-                            <td>
-                                <input type="radio"  name="q8" value="1" />是
-                            </td>
-                            <td>
-                                <input type="radio"  name="q8" value="0" />否
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="line-height: 37px">
-                                9.本人“八闽健康码”是否为橙码、红码。
-                            </td>
-                            <td>
-                                <input type="radio"  name="q9" value="1" />是
-                            </td>
-                            <td>
-                                <input type="radio"  name="q9" value="0" />否
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="line-height: 37px">
-                                10.共同居住家庭成员中是否为新冠肺炎确诊或疑似病例、无症状感染者、密切接触者。
-                            </td>
-                            <td>
-                                <input type="radio"  name="q10" value="1" />是
-                            </td>
-                            <td>
-                                <input type="radio"  name="q10" value="0" />否
-                            </td>
-                        </tr>
+                    <tr>
+                        <td style="line-height: 37px" width="90%">
+                            1.本人过去14日内,是否出现发热、干咳、乏力、鼻塞、流涕、咽痛、腹泻等症状。
+                        </td>
+                        <td>
+                            <input type="radio"  name="q1" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q1" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            2.本人是否属于新冠肺炎确诊或疑似病例、无症状感染者。
+                        </td>
+                        <td>
+                            <input type="radio"  name="q2" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q2" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            3.本人过去14日内,是否在居住地有被隔离或曾被隔离且未做核酸检测。
+                        </td>
+                        <td>
+                            <input type="radio"  name="q3" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q3" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            4.本人过去14日内,是否从省外中高风险地区入闽。
+                        </td>
+                        <td>
+                            <input type="radio"  name="q4" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q4" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            5.本人一个月内是否从境外(含港澳台)入闽。
+                        </td>
+                        <td>
+                            <input type="radio"  name="q5" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q5" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            6.本人过去14日内是否与新冠肺炎确诊病例、疑似病例或已发现无症状感染者有接触史。
+                        </td>
+                        <td>
+                            <input type="radio"  name="q6" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q6" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            7.本人过去14日内是否与来自境外(含港澳台)人员有接触史。
+                        </td>
+                        <td>
+                            <input type="radio"  name="q7" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q7" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            8.过去14日内,本人的工作(实习)岗位是否属于医疗机构医务人员、公共场所服务人员、口岸检疫排查人员、公共交通驾驶员、铁路航空乘务人员、进口冷链一条线从业人员。
+                        </td>
+                        <td>
+                            <input type="radio"  name="q8" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q8" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            9.本人“八闽健康码”是否为橙码、红码。
+                        </td>
+                        <td>
+                            <input type="radio"  name="q9" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q9" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            10.共同居住家庭成员中是否为新冠肺炎确诊或疑似病例、无症状感染者、密切接触者。
+                        </td>
+                        <td>
+                            <input type="radio"  name="q10" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q10" value="0" />否
+                        </td>
+                    </tr>
                     </tbody>
                 </table>
             </form>
             </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>--}}
-{{--            </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>--}}
-{{--            </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.本人过去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">4.本人过去14日内,从省外中高风险地区入闽。&nbsp;&nbsp;&nbsp;&nbsp;&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.本人疫情期间从境外(含港澳台)入闽。&nbsp;&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">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>--}}
-{{--            </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.过去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">9.本人“八闽健康码”为橙码。&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&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">10.共同居住家庭成员中有上述1至7的情况。</span><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 18px">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>--}}
-{{--            </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>--}}
+            {{--            </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>--}}
+            {{--            </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.本人过去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">4.本人过去14日内,从省外中高风险地区入闽。&nbsp;&nbsp;&nbsp;&nbsp;&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.本人疫情期间从境外(含港澳台)入闽。&nbsp;&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">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>--}}
+            {{--            </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.过去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">9.本人“八闽健康码”为橙码。&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&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">10.共同居住家庭成员中有上述1至7的情况。</span><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 18px">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>--}}
+            {{--            </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:微软雅黑">以上项目中如有“是”的,考试报到时,必须携带考前7天内新型冠状病毒检测阴性的报告。</span></span>
             </p>
@@ -360,9 +360,9 @@
             <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>
             </p>
-{{--            <p style="margin-top:8px;margin-left:0;text-indent:0;text-autospace:ideograph-numeric;text-align:center;line-height:37px">--}}
-{{--                <button class="print" disabled="disabled">打印准考证</button>--}}
-{{--            </p>--}}
+            {{--            <p style="margin-top:8px;margin-left:0;text-indent:0;text-autospace:ideograph-numeric;text-align:center;line-height:37px">--}}
+            {{--                <button class="print" disabled="disabled">打印准考证</button>--}}
+            {{--            </p>--}}
             <p>
                 <br/>
             </p>
@@ -379,87 +379,87 @@
             </p>
             <p style="margin-bottom: 0;margin-left: 0;text-indent: 14px;line-height: 37px">
             <form class="commit_step_2">
-            <table width="100%">
-                <tbody>
-                <tr>
-                    <td style="line-height: 37px" width="90%">
-                        1.本人是否为曾因犯罪受过刑事处罚或曾被开除公职的人员;
-                    </td>
-                    <td>
-                        <input type="radio"  name="q11" value="1" />是
-                    </td>
-                    <td>
-                        <input type="radio"  name="q11" value="0" />否
-                    </td>
-                </tr>
-                <tr>
-                    <td style="line-height: 37px">
-                        2.本人是否为被开除中国共产党党籍的人员;
-                    </td>
-                    <td>
-                        <input type="radio"  name="q12" value="1" />是
-                    </td>
-                    <td>
-                        <input type="radio"  name="q12" value="0" />否
-                    </td>
-                </tr>
-                <tr>
-                    <td style="line-height: 37px">
-                        3.本人是否为在近三年内被认定有人事考试作弊行为的人员;
-                    </td>
-                    <td>
-                        <input type="radio"  name="q13" value="1" />是
-                    </td>
-                    <td>
-                        <input type="radio"  name="q13" value="0" />否
-                    </td>
-                </tr>
-                <tr>
-                    <td style="line-height: 37px">
-                        4.本人是否为被依法列为失信联合惩戒对象的人员;
-                    </td>
-                    <td>
-                        <input type="radio"  name="q14" value="1" />是
-                    </td>
-                    <td>
-                        <input type="radio"  name="q14" value="0" />否
-                    </td>
-                </tr>
-                <tr>
-                    <td style="line-height: 37px">
-                        5.本人是否为现役军人;
-                    </td>
-                    <td>
-                        <input type="radio"  name="q15" value="1" />是
-                    </td>
-                    <td>
-                        <input type="radio"  name="q15" value="0" />否
-                    </td>
-                </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>
-                </tbody>
-            </table>
+                <table width="100%">
+                    <tbody>
+                    <tr>
+                        <td style="line-height: 37px" width="90%">
+                            1.本人是否为曾因犯罪受过刑事处罚或曾被开除公职的人员;
+                        </td>
+                        <td>
+                            <input type="radio"  name="q11" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q11" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            2.本人是否为被开除中国共产党党籍的人员;
+                        </td>
+                        <td>
+                            <input type="radio"  name="q12" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q12" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            3.本人是否为在近三年内被认定有人事考试作弊行为的人员;
+                        </td>
+                        <td>
+                            <input type="radio"  name="q13" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q13" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            4.本人是否为被依法列为失信联合惩戒对象的人员;
+                        </td>
+                        <td>
+                            <input type="radio"  name="q14" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q14" value="0" />否
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="line-height: 37px">
+                            5.本人是否为现役军人;
+                        </td>
+                        <td>
+                            <input type="radio"  name="q15" value="1" />是
+                        </td>
+                        <td>
+                            <input type="radio"  name="q15" value="0" />否
+                        </td>
+                    </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>
+                    </tbody>
+                </table>
             </form>
             </p>
             {{--            <p style="margin-bottom: 0;margin-left: 0;text-indent: 14px;line-height: 37px">--}}

BIN
public/word/example_internship.docx


+ 23 - 0
resources/views/admin/content/buy_house.blade.php

@@ -74,8 +74,31 @@
             },
         })
     });
+    //同步到选房系统
+    $('.sync').on('click', function () {
+        let id = $(this).data('id');
+        $.ajax({
+            url: "{{admin_base_path('/content/buy_house/sync')}}",
+            data:{'id':id,'_token':'{{csrf_token()}}'},
+            method: 'POST',
+            dataType:'json',
+            success:function (res) {
+                if (res.code == 0) {
+                    $('#notice').addClass('in');
+                    $('#notice').css('display', 'block');
+                    $('#error_content').html(res.content);
+                } else {
+                    location.reload();
+                }
+            },
+        })
+    });
     $('.close_modal').on('click',function () {
         $('#notice').addClass('out');
         $('#notice').css('display', 'none');
     })
+    $('.select_house').click(function(){
+        let id = $(this).data('id');
+        location.href = "{{admin_base_path('/content/buy_house_select/index')}}/"+id;
+    });
 </script>

+ 117 - 0
resources/views/admin/content/buy_house_select.blade.php

@@ -0,0 +1,117 @@
+{!! $grid->render() !!}
+<style>
+    p#vtip { display: none; position: absolute; padding: 10px; left: 5px; font-size: 0.8em; background-color: white; border: 1px solid #a6c9e2; -moz-border-radius: 5px; -webkit-border-radius: 5px; z-index: 9999 }
+    p#vtip #vtipArrow { position: absolute; top: -10px; left: 5px }
+</style>
+<div class="modal fade" id="house_select" tabindex="-1" role="dialog" aria-labelledby="ModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" id="myModalLabel12">填写顺序号</h4>
+            </div>
+            <div class="modal-body">
+                <div class="modal-body">
+                    <form method="POST" action="{{route('content.buy_house_select.select')}}" id="auditForm" class="form-horizontal" accept-charset="UTF-8" pjax-container="1" id="dialog-form-5cc19c85d0a5f">
+                        <div class="box-body fields-group">
+                            <div class="form-group  ">
+                                <label for="reason" class="col-sm-2  control-label">顺序号</label>
+                                <div class="col-sm-8">
+                                    <input name="select_house_no" type="number" class="form-control select_house_no" placeholder="输入顺序号" />
+                                </div>
+                            </div>
+                        </div>
+                        <input type="hidden" name="id" id="id" value="" />
+                        <input type="hidden" name="url" id="url" value="{{url()->full()}}" />
+                        <input type="hidden" name="_token" value="{{ csrf_token() }}">
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    {{--<button type="button" class="btn btn-default" data-dismiss="modal"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span>取消</button>--}}
+                    <button type="button" id="dialog-submit-5cc19c85d0a5f" class="btn btn-primary" data-loading-text="提交中..."><span class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span>确认</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="modal fade" id="dialog" tabindex="-1" role="dialog" aria-labelledby="ModalLabel">
+    <div class="modal-dialog" role="document" style="width:1200px;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" id="myModalLabel1">业务</h4>
+            </div>
+            <div class="modal-body">
+
+                <div class="contentfade" style="height: 700px;overflow: auto;">
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    this.vtip = function() {
+        this.xOffset = -10; // x distance from mouse
+        this.yOffset = 15; // y distance from mouse
+        $(".vtip").unbind().hover(
+            function(e) {
+                this.t = $(this).attr("title");
+                this.title = '';
+                this.top = (e.pageY + yOffset);
+                this.left = (e.pageX + xOffset);
+                $('body').css("cursor","help");
+                $('p#vtip').width()>450?$('p#vtip').width(450):'';
+                $('body').append( '<p id="vtip">' + this.t + '</p>' );
+                $('p#vtip').css("top", this.top+"px").css("left", this.left+"px").fadeIn(0);
+            },
+            function() {
+                this.title = this.t;
+                $('body').css("cursor","");
+                $("p#vtip").fadeOut("slow").remove();
+            }
+        ).mousemove(
+            function(e) {
+                this.top = (e.pageY + yOffset);
+                this.left = (e.pageX + xOffset);
+                $("p#vtip").css("top", this.top+"px").css("left", this.left+"px");
+            }
+        );
+
+    };
+    $(document).ready(function() {
+        vtip();
+    });
+    $(document).off("click",'.select_no').on('click','.select_no',function () {
+        $('#id').val($(this).data('code'));
+        $('#house_select').addClass('in');
+        $('#house_select').css('display', 'block');
+        $(' #house_select .contentfade').html('');
+    });
+    $(document).off("click","#house_select .btn-primary").on('click',"#house_select .btn-primary",function () {
+        $('#auditForm').submit();
+    });
+    $(".close").off().on('click', function () {
+        $(this).closest(".modal").removeClass('in');
+        $(this).closest(".modal").hide();
+    });
+
+    $('.detail').on('click', function () {
+        $("#myModalLabel1").html('详情');
+        var id = $(this).attr('id');
+        $('#dialog').addClass('in');
+        $('#dialog').css('display', 'block');
+        $('.contentfade').html('');
+        $.ajax({
+            url: "{{admin_base_path('/content/buy_house_select/detail')}}",
+            data:{'id':id,'_token':'{{csrf_token()}}'},
+            // dataType:'json',
+            success:function (res) {
+                $('.contentfade').html(res.data);
+            },
+        })
+    });
+</script>

+ 54 - 0
resources/views/admin/content/export_select_house.blade.php

@@ -0,0 +1,54 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+      xmlns:x="urn:schemas-microsoft-com:office:excel"
+      xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+    <meta http-equiv=Content-Type content="text/html; charset=utf-8">
+    <meta name=ProgId content=Excel.Sheet>
+    <meta name=Generator content="Microsoft Excel 15">
+    <style>
+        table {
+            mso-displayed-decimal-separator: "\.";
+            mso-displayed-thousand-separator: "\,";
+        }
+        .title {
+            font-weight:700;
+            font-size:20px;
+            text-align: center;
+        }
+        th {
+            color:red;
+        }
+        td {
+            text-align: center;
+            vnd.ms-excel.numberformat:@;
+        }
+    </style>
+</head>
+
+<body>
+
+<div align=center x:publishsource="Excel">
+    <table border=1 cellpadding=0 cellspacing=0 style='border-collapse:collapse;table-layout:fixed;'>
+        <tr>
+            <th>未成年子女</th>
+            <th>身份证号码</th>
+            <th>户籍号</th>
+            <th>联系电话</th>
+            <th>婚姻情况</th>
+            <th>可选房</th>
+        </tr>
+        @foreach($data as $v)
+            <tr>
+                <td>{{$v['child']}}</td>
+                <td>{{$v['id_card']}}</td>
+                <td>{{$v['register_no']}}</td>
+                <td>{{$v['mobile']}}</td>
+                <td>{{$v['marry']}}</td>
+                <td>{{$v['select_status']}}</td>
+            </tr>
+        @endforeach
+    </table>
+</div>
+</body>
+</html>

+ 97 - 97
resources/views/admin/recruit/ajax_supplement.blade.php

@@ -23,104 +23,104 @@
             无记录
         </div>
     @else
-    <form id="J_interviewWrap">
-        <input type="hidden" name="_token" value="{{ csrf_token() }}" />
-        <input name="ids" type="hidden" value="{{$ids}}"/>
-        <h1 style="text-align: center;line-height: 60px;">
-            材料补登审核
-        </h1>
-        <table cellspacing="0" width="100%" class="table_form">
-            <tr style="height:52px;page-break-inside:avoid">
-                <td valign="center">
-                    身份证原件(正、反面)
-                </td>
-                <td valign="center" colspan="11">
-                    <div style="padding: 10px 0">
-                        @foreach($info->identification as $k => $v)
-                            @if(!empty($v))
-                                <img class="attchment" data-key="{{$k}}" data-name="identification"
-                                     src="{{ $v->response->path }}" width="200"/>
-                            @endif
-                        @endforeach
-                    </div>
-                </td>
-            </tr>
-            <tr style="height:52px;page-break-inside:avoid">
-                <td valign="center">
-                    户口簿(户主页及本人页)
-                </td>
-                <td valign="center" colspan="11">
-                    <div style="padding: 10px 0">
-                        @foreach($info->household_register as $k => $v)
-                            @if(!empty($v))
-                                <img class="attchment" data-key="{{$k}}" data-name="household_register"
-                                     src="{{ $v->response->path }}" width="200"/>
-                            @endif
-                        @endforeach
-                    </div>
-                </td>
-            </tr>
-            <tr style="height:52px;page-break-inside:avoid">
-                <td valign="center">
-                    毕业证书及学信网《教育部学历证书电子注册备案表》
-                </td>
-                <td valign="center" colspan="11">
-                    <div style="padding: 10px 0">
-                        @foreach($info->education_certification as $k => $v)
-                            @if(!empty($v))
-                                <img class="attchment" data-key="{{$k}}" data-name="education_certification"
-                                     src="{{ $v->response->path }}" width="200"/>
-                            @endif
-                        @endforeach
-                    </div>
-                </td>
-            </tr>
-            <tr style="height:52px;page-break-inside:avoid">
-                <td valign="center">
-                    泉州市申请办理有关手续计生情况审核登记表
-                </td>
-                <td valign="center" colspan="11">
-                    <div style="padding: 10px 0">
-                        @foreach($info->family_planning as $k => $v)
-                            @if(!empty($v))
-                                <img class="attchment" data-key="{{$k}}" data-name="family_planning"
-                                     src="{{ $v->response->path }}" width="200"/>
-                            @endif
-                        @endforeach
-                    </div>
-                </td>
-            </tr>
-            <tr style="height:52px;page-break-inside:avoid">
-                <td valign="center">
-                    社会管理综合治理审核登记表
-                </td>
-                <td valign="center" colspan="11">
-                    <div style="padding: 10px 0">
-                        @foreach($info->manage as $k => $v)
-                            @if(!empty($v))
-                                <img class="attchment" data-key="{{$k}}" data-name="manage"
-                                     src="{{ $v->response->path }}" width="200"/>
-                            @endif
-                        @endforeach
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td height="25">审核状态:</td>
-                <td>
-                    <label> <input type="radio" name="status" checked="checked" value="1"/> 通过 </label>&nbsp;&nbsp;
-                    <label> <input type="radio" name="status" value="-1"/> 不通过 </label>
-                </td>
-            </tr>
-            <tr id="reason">
-                <td height="25">备注:</td>
-                <td>
-                    <textarea maxlength="300" name="reason" cols="50" style="font-size:12px"></textarea>
-                </td>
-            </tr>
-        </table>
+        <form id="J_interviewWrap">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+            <input name="ids" type="hidden" value="{{$ids}}"/>
+            <h1 style="text-align: center;line-height: 60px;">
+                材料补登审核
+            </h1>
+            <table cellspacing="0" width="100%" class="table_form">
+                <tr style="height:52px;page-break-inside:avoid">
+                    <td valign="center">
+                        身份证原件(正、反面)
+                    </td>
+                    <td valign="center" colspan="11">
+                        <div style="padding: 10px 0">
+                            @foreach($info->identification as $k => $v)
+                                @if(!empty($v))
+                                    <img class="attchment" data-key="{{$k}}" data-name="identification"
+                                         src="{{ $v->response->path }}" width="200"/>
+                                @endif
+                            @endforeach
+                        </div>
+                    </td>
+                </tr>
+                <tr style="height:52px;page-break-inside:avoid">
+                    <td valign="center">
+                        户口簿(户主页及本人页)
+                    </td>
+                    <td valign="center" colspan="11">
+                        <div style="padding: 10px 0">
+                            @foreach($info->household_register as $k => $v)
+                                @if(!empty($v))
+                                    <img class="attchment" data-key="{{$k}}" data-name="household_register"
+                                         src="{{ $v->response->path }}" width="200"/>
+                                @endif
+                            @endforeach
+                        </div>
+                    </td>
+                </tr>
+                <tr style="height:52px;page-break-inside:avoid">
+                    <td valign="center">
+                        毕业证书及学信网《教育部学历证书电子注册备案表》
+                    </td>
+                    <td valign="center" colspan="11">
+                        <div style="padding: 10px 0">
+                            @foreach($info->education_certification as $k => $v)
+                                @if(!empty($v))
+                                    <img class="attchment" data-key="{{$k}}" data-name="education_certification"
+                                         src="{{ $v->response->path }}" width="200"/>
+                                @endif
+                            @endforeach
+                        </div>
+                    </td>
+                </tr>
+                <tr style="height:52px;page-break-inside:avoid">
+                    <td valign="center">
+                        泉州市申请办理有关手续计生情况审核登记表
+                    </td>
+                    <td valign="center" colspan="11">
+                        <div style="padding: 10px 0">
+                            @foreach($info->family_planning as $k => $v)
+                                @if(!empty($v))
+                                    <img class="attchment" data-key="{{$k}}" data-name="family_planning"
+                                         src="{{ $v->response->path }}" width="200"/>
+                                @endif
+                            @endforeach
+                        </div>
+                    </td>
+                </tr>
+                <tr style="height:52px;page-break-inside:avoid">
+                    <td valign="center">
+                        社会管理综合治理审核登记表
+                    </td>
+                    <td valign="center" colspan="11">
+                        <div style="padding: 10px 0">
+                            @foreach($info->manage as $k => $v)
+                                @if(!empty($v))
+                                    <img class="attchment" data-key="{{$k}}" data-name="manage"
+                                         src="{{ $v->response->path }}" width="200"/>
+                                @endif
+                            @endforeach
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="25">审核状态:</td>
+                    <td>
+                        <label> <input type="radio" name="status" checked="checked" value="1"/> 通过 </label>&nbsp;&nbsp;
+                        <label> <input type="radio" name="status" value="-1"/> 不通过 </label>
+                    </td>
+                </tr>
+                <tr id="reason">
+                    <td height="25">备注:</td>
+                    <td>
+                        <textarea maxlength="300" name="reason" cols="50" style="font-size:12px"></textarea>
+                    </td>
+                </tr>
+            </table>
 
-    </form>
+        </form>
     @endif
 </div>
 <style>

+ 15 - 15
resources/views/admin/recruit/appoint_list.blade.php

@@ -90,7 +90,7 @@
                                     <select class="form-control" name="post_id" id="post_id">
                                         <option value=''>不限</option>
                                         @foreach($post as $k => $v)
-                                        <option value='{{$k}}' @if(array_key_exists('post_id',$search_data) && $search_data['post_id'] == $k) selected @endif>{{$v}}</option>
+                                            <option value='{{$k}}' @if(array_key_exists('post_id',$search_data) && $search_data['post_id'] == $k) selected @endif>{{$v}}</option>
                                         @endforeach
                                     </select>
                                 </div>
@@ -362,15 +362,15 @@
                                                         @endif
                                                     </P>
                                                 @endif
-                                                    @if(in_array('6',explode(',',$recruit->step)) && $v->current >= 2 & $v->reexamine_audit != 3)
-                                                        <P>复试准考证:
-                                                            @if($v->reexamine_print)
-                                                                <span style=" color: #67c23a;">已打印</span>
-                                                            @else
-                                                                <span style=" color: #ff2424;">未打印</span><br />
-                                                            @endif
-                                                        </P>
-                                                    @endif
+                                                @if(in_array('6',explode(',',$recruit->step)) && $v->current >= 2 & $v->reexamine_audit != 3)
+                                                    <P>复试准考证:
+                                                        @if($v->reexamine_print)
+                                                            <span style=" color: #67c23a;">已打印</span>
+                                                        @else
+                                                            <span style=" color: #ff2424;">未打印</span><br />
+                                                        @endif
+                                                    </P>
+                                                @endif
                                             </td>
                                             <td>
                                                 <a href="javascript:;" data-url="{{ route('recruit.show_log') }}" data-param="{{$v->id}}" hidefocus="true" class="ButExamineLog">查看</a>
@@ -409,15 +409,15 @@
                                     <td>
 
                                         <input name="ButtonADD" type="button" class="btn btn-sm  btn-warning" recruit_id="{{$recruit->id}}" id="ButtonAudit" value="批量报名审核" />
-{{--                                        <input name="ButDel" type="button" class="btn btn-sm  btn-info ButPen" onclick="employ()" recruit_id="{{$recruit->id}}" value="入职聘用" />--}}
+                                        {{--                                        <input name="ButDel" type="button" class="btn btn-sm  btn-info ButPen" onclick="employ()" recruit_id="{{$recruit->id}}" value="入职聘用" />--}}
                                         <input name="ButDel" type="button" class="btn btn-sm  btn-info" onclick="record()" value="上传成绩" />
 
                                         <input name="ButDel" type="button" class="btn btn-sm  btn-info ButPen" onclick="card()" value="准考证生成" />
-{{--                                        <input name="ButDel" type="button" class="btn btn-sm  btn-info ButPen" onclick="delcard()" value="准考证撤销" />--}}
+                                        {{--                                        <input name="ButDel" type="button" class="btn btn-sm  btn-info ButPen" onclick="delcard()" value="准考证撤销" />--}}
                                         {{--                                        @if(Encore\Admin\Facades\Admin::user()->can('auth_recruit_outexcel'))--}}
-{{--                                        <a href="{{route('recruit.out_zip',['where'=>\Request::getRequestUri(),'id'=>$recruit->id])}}" target="_blank">--}}
-{{--                                            <input name="ButDel" type="button" class="btn btn-sm  btn-info ButPen" recruit_id="{{$recruit->id}}" value="导出word版简历(压缩包)" />--}}
-{{--                                        </a>--}}
+                                        {{--                                        <a href="{{route('recruit.out_zip',['where'=>\Request::getRequestUri(),'id'=>$recruit->id])}}" target="_blank">--}}
+                                        {{--                                            <input name="ButDel" type="button" class="btn btn-sm  btn-info ButPen" recruit_id="{{$recruit->id}}" value="导出word版简历(压缩包)" />--}}
+                                        {{--                                        </a>--}}
                                         <a href="{{route('recruit.out_excel',['where'=>\Request::getRequestUri(),'id'=>$recruit->id])}}" target="_blank">
                                             <input id="out_excel" name="ButDel" type="button" class="btn btn-sm  btn-info ButPen" data-recruit_id="{{$recruit->id}}" value="汇总表" />
                                         </a>

+ 1 - 1
routes/web.php

@@ -883,7 +883,7 @@ Route::group([
 });
 
 Route::group([
-   'prefix' =>  '/jjhc',
+    'prefix' =>  '/jjhc',
 ], function (Router $router){
     $router->get('/test', 'Web\Talent\JjhcController@test')->name('talent.jjhc.test');
 });