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

app/Admin/Controllers/Health/IndexController.php

@@ -27,6 +27,7 @@ class IndexController extends Controller
      */
     public function index(Content $content)
     {
+        Permission::check('presentation');
         return $content
             ->header('宣讲会管理')
             ->description('')
@@ -154,7 +155,7 @@ class IndexController extends Controller
 
     public function appointList(Content $content, Request $request)
     {
-        Permission::check('presentation_appoint_list');
+        Permission::check('health_appoint_list');
         $id = $request->id;
         $presentation = Presentation::find($id);
         if (empty($presentation)) {
@@ -211,7 +212,7 @@ class IndexController extends Controller
     }
 
     public function qjwjInfoList(Content $content, Request $request){
-        Permission::check('presentation_appoint_list');
+        Permission::check('qjwjInfoList');
 
         $search_data = $request->all();
 
@@ -233,6 +234,9 @@ class IndexController extends Controller
             ->paginate($perpage);
 
         foreach ($list as $k => $v){
+            $v->native_place_cn = get_district_cn($v->native_place);
+            $v->education = get_category($v->education);
+            $v->pro_type = get_category_major($v->pro_type);
             if($v->sex == 0){
                 $list[$k]['sex'] = '女';
             }else{
@@ -254,8 +258,21 @@ class IndexController extends Controller
             ]));
     }
 
+    public function qjwjStatus(Request $request){
+
+        $info = QjwjAppoint::where(['id' => $request->id])->first();
+        if($info){
+            $info->status = 1;
+            $info->save();
+            return response()->json(['status' => 1, 'msg' => '跳转下载中！', 'data' => 'ok', 'url' => $info->attachment]);
+        }else{
+            return response()->json(['status' => 0, 'msg' => '找不到记录！', 'data' => 'fail']);
+        }
+        //return "/storage/recruit/word/" . $recruit->name_en . '/' .$appoint->audit .$word_url;
+    }
+
     public function jyyxInfoList(Content $content, Request $request){
-        Permission::check('presentation_appoint_list');
+        Permission::check('jyyxInfoList');
 
         $search_data = $request->all();
 
@@ -277,11 +294,7 @@ class IndexController extends Controller
             ->paginate($perpage);
 
         foreach ($list as $k => $v){
-            if($v->sex == 0){
-                $list[$k]['sex'] = '女';
-            }else{
-                $list[$k]['sex'] = '男';
-            }
+
             if($v->status == 0){
                 $list[$k]['status'] = '未下载';
             }else{
@@ -291,15 +304,28 @@ class IndexController extends Controller
 
         return $content
             ->header('信息管理')
-            ->description('就业单身人员信息列表')
+            ->description('就业意向人员信息列表')
             ->body(view('admin.health.jyyx_appoint_list')->with([
                 'list' => $list,
                 'search_data' => $search_data
             ]));
     }
 
+    public function jyyxStatus(Request $request){
+
+        $info = JyyxAppoint::where(['id' => $request->id])->first();
+        if($info){
+            $info->status = 1;
+            $info->save();
+            return response()->json(['status' => 1, 'msg' => '跳转下载中！', 'data' => 'ok', 'url' => $info->attachment]);
+        }else{
+            return response()->json(['status' => 0, 'msg' => '找不到记录！', 'data' => 'fail']);
+        }
+        //return "/storage/recruit/word/" . $recruit->name_en . '/' .$appoint->audit .$word_url;
+    }
+
     public function postInfoList(Content $content, Request $request){
-        Permission::check('presentation_appoint_list');
+        Permission::check('postInfoList');
 
         $search_data = $request->all();
 
@@ -316,11 +342,14 @@ class IndexController extends Controller
         }
         $perpage = 20;
         $list = PostAppoint::where($where)
-            ->select('*')
+            ->leftJoin("jobs","jobs.id",'=','post_appoint.job_id')
+            ->select('post_appoint.*','jobs.jobs_name','jobs.company_name')
             ->orderBy('updated_at','desc')
             ->paginate($perpage);
 
         foreach ($list as $k => $v){
+            $v->native_place_cn = get_district_cn($v->native_place);
+            $v->education = get_category($v->education);
             if($v->sex == 0){
                 $list[$k]['sex'] = '女';
             }else{
@@ -341,4 +370,17 @@ class IndexController extends Controller
                 'search_data' => $search_data
             ]));
     }
+
+    public function postStatus(Request $request){
+
+        $info = PostAppoint::where(['id' => $request->id])->first();
+        if($info){
+            $info->status = 1;
+            $info->save();
+            return response()->json(['status' => 1, 'msg' => '跳转下载中！', 'data' => 'ok', 'url' => $info->attachment]);
+        }else{
+            return response()->json(['status' => 0, 'msg' => '找不到记录！', 'data' => 'fail']);
+        }
+        //return "/storage/recruit/word/" . $recruit->name_en . '/' .$appoint->audit .$word_url;
+    }
 }

app/Admin/routes.php

@@ -520,5 +520,8 @@ Route::group([
         $router->get('qjwj_appoint_list', 'IndexController@qjwjInfoList')->name('Health.qjwj_appoint_list');//泉籍卫技人员信息列表
         $router->get('jyyx_appoint_list', 'IndexController@jyyxInfoList')->name('Health.jyyx_appoint_list');//就业意向人员信息列表
         $router->get('post_appoint_list', 'IndexController@postInfoList')->name('Health.post_appoint_list');//就业意向人员信息列表
+        $router->post('qjwjStatus', 'IndexController@qjwjStatus')->name('Health.qjwjStatus');//下载简历
+        $router->post('jyyxStatus', 'IndexController@jyyxStatus')->name('Health.jyyxStatus');//下载简历
+        $router->post('postStatus', 'IndexController@postStatus')->name('Health.postStatus');//下载简历
     });
 });

public/themes/default/views/mobile/app/health/jinjiang.blade.php

@@ -46,11 +46,13 @@
 </style>
 <link href="{{ theme_asset('mobile/css/personal.css') }}" rel="stylesheet">
 <link href="https://web.sdk.qcloud.com/player/tcplayer/release/v5.1.0/tcplayer.min.css" rel="stylesheet"/>
+
 @push('css')
 @endpush
 
 @push('js')
     <script src="https://web.sdk.qcloud.com/player/tcplayer/release/v5.1.0/tcplayer.v5.1.0.min.js"></script>
+    <script src="https://vjs.zencdn.net/8.16.1/video.min.js"></script>
 @endpush
 
 @section('content')
@@ -820,7 +822,8 @@
             poster: "{{ theme_asset('mobile/gangwanjihua.jpg') }}",
         });
 
-        player.on('paly',function(){
+        player.on('paly',function(event){
+            console.log(event)
             player1.pause();
             player2.pause();
         });

resources/views/admin/health/jyyx_appoint_list.blade.php

@@ -4,42 +4,6 @@
             <div class="box">
                 {{ csrf_field() }}
                 <div class="box-body table-responsive">
-                    <div class="col-md-3 clearfix">
-                        <div class="box-body table-responsive" style="padding:5px;">
-                            <div class="form-group clearfix" style="margin-bottom:0;">
-                                <label for="prefix" class="control-label">性别：</label>
-                                <div style="float: left;width: 150px;">
-                                    <select class="form-control" name="sex" id="sex">
-                                        <option value=''>不限</option>
-                                        <option value='0' @if(array_key_exists('sex',$search_data) && $search_data['sex'] == '0') selected @endif>女</option>
-                                        <option value='1' @if(array_key_exists('sex',$search_data) && $search_data['sex'] == '1') selected @endif>男</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-3 clearfix">
-                        <div class="box-body table-responsive" style="padding:5px;">
-                            <div class="form-group clearfix" style="margin-bottom:0;">
-                                <label for="prefix" class="control-label">学历：</label>
-                                <div style="float: left;width: 150px;">
-                                    <select class="form-control" name="education" id="education">
-                                        <option value=''>不限</option>
-                                        <option value='小学' @if(array_key_exists('education',$search_data) && $search_data['education'] == '小学') selected @endif>小学</option>
-                                        <option value='初中' @if(array_key_exists('education',$search_data) && $search_data['education'] == '初中') selected @endif>初中</option>
-                                        <option value='技校' @if(array_key_exists('education',$search_data) && $search_data['education'] == '技校') selected @endif>技校</option>
-                                        <option value='职高' @if(array_key_exists('education',$search_data) && $search_data['education'] == '职高') selected @endif>职高</option>
-                                        <option value='高中' @if(array_key_exists('education',$search_data) && $search_data['education'] == '高中') selected @endif>高中</option>
-                                        <option value='中专' @if(array_key_exists('education',$search_data) && $search_data['education'] == '中专') selected @endif>中专</option>
-                                        <option value='专科' @if(array_key_exists('education',$search_data) && $search_data['education'] == '专科') selected @endif>专科</option>
-                                        <option value='本科' @if(array_key_exists('education',$search_data) && $search_data['education'] == '本科') selected @endif>本科</option>
-                                        <option value='硕士' @if(array_key_exists('education',$search_data) && $search_data['education'] == '硕士') selected @endif>硕士</option>
-                                        <option value='博士' @if(array_key_exists('education',$search_data) && $search_data['education'] == '博士') selected @endif>博士</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
                     <div class="col-md-3 clearfix">
                         <div class="box-body table-responsive" style="padding:5px;">
                             <div class="form-group clearfix" style="margin-bottom:0;">
@@ -70,14 +34,11 @@
                                     <th height="26" class="admin_list_tit">
                                         <input type="checkbox" name=" " title="全选/反选" id="chk" />
                                     </th>
-                                    <th>基础资料</th>
-                                    <th>电话</th>
-                                    <th>学历</th>
-                                    <th>学校</th>
-                                    <th>院系</th>
-                                    <th>专业类别</th>
-                                    <th>具体专业</th>
-                                    <th>操作</th>
+                                    <th width="150">姓名</th>
+                                    <th width="150">电话</th>
+                                    <th>备注</th>
+                                    <th width="150">下载情况</th>
+                                    <th width="150">操作</th>
                                 </tr>
                                 </thead>
                                 <tbody>
@@ -89,23 +50,14 @@
                                             </td>
                                             <td>
                                                 <span style="color: #0A246A; margin-right: 3px;">{!! $v->realname !!}</span>
-                                                <span style="color: #0A246A; margin-right: 3px;">{{$v->sex}}</span>
-                                                <span style="color:#be7707; margin-right: 3px;">{{$v->birthday}}</span>
-                                                <span style="color:#0A7CF7; margin-right: 3px;">{{$v->education}}</span>
-                                                <span style="color:#0F73AC; margin-right: 3px;">{{$v->native_place}}</span>
                                             </td>
                                             <td>
                                                 {{ $v->mobile }}
                                             </td>
-                                            <td>{!! $v->education !!}</td>
-                                            <td>{!! $v->school !!}</td>
-                                            <td>{!! $v->dep !!}</td>
-                                            <td>
-                                                {{ $v->pro_type }}
-                                            </td>
                                             <td>
-                                                {{ $v->pro_text }}
+                                                {{ $v->status }}
                                             </td>
+                                            <td>{!! $v->remark !!}</td>
                                             <td>
 
                                                 <button class='btn btn-primary btn-xs fetch_word' data-aid="{{$v->id}}" style="margin-bottom: 10px">下载简历</button>
@@ -212,15 +164,15 @@
             health($(this).data('param'),$(this).data("type"));
         });
         $(document).off("click",'.fetch_word').on('click','.fetch_word',function () {
-            var recruit_id = $(this).attr('data-rid'),appoint_id = $(this).attr('data-aid');
+            var appoint_id = $(this).attr('data-aid');
 
             var qsDialog = $(this).dialog({
-                title: 'word简历生成',
+                title: 'word简历下载',
                 loading: true,
                 showFooter: false,
                 yes: function() {
                     $('.J_btnyes').val('发送中...');
-                    $.post("{{ route('recruit.fetchword') }}", {_token:'{{ csrf_token() }}',recruit_id:recruit_id,appoint_id:appoint_id}, function(result) {
+                    $.post("{{ route('Health.jyyxStatus') }}", {_token:'{{ csrf_token() }}',id:appoint_id}, function(result) {
                         if (result.status == 1) {
                             disapperTooltip('success', result.msg);
                             window.location.href = result.url;
@@ -236,7 +188,7 @@
                 }
             });
             qsDialog.setCloseDialog(false);
-            qsDialog.setContent("重新生成会覆盖原有简历，请确认？");
+            qsDialog.setContent("即将下载简历，请确认？");
             qsDialog.showFooter(true);
         });
         $("#ButtonAudit").click(function() {

resources/views/admin/health/post_appoint_list.blade.php

@@ -72,11 +72,9 @@
                                     </th>
                                     <th>基础资料</th>
                                     <th>电话</th>
-                                    <th>学历</th>
-                                    <th>学校</th>
-                                    <th>院系</th>
-                                    <th>专业类别</th>
-                                    <th>具体专业</th>
+                                    <th>投递岗位</th>
+                                    <th>对应单位</th>
+                                    <th>下载状态</th>
                                     <th>操作</th>
                                 </tr>
                                 </thead>
@@ -92,20 +90,14 @@
                                                 <span style="color: #0A246A; margin-right: 3px;">{{$v->sex}}</span>
                                                 <span style="color:#be7707; margin-right: 3px;">{{$v->birthday}}</span>
                                                 <span style="color:#0A7CF7; margin-right: 3px;">{{$v->education}}</span>
-                                                <span style="color:#0F73AC; margin-right: 3px;">{{$v->native_place}}</span>
+                                                <span style="color:#0F73AC; margin-right: 3px;">{{$v->native_place_cn}}</span>
                                             </td>
                                             <td>
                                                 {{ $v->mobile }}
                                             </td>
-                                            <td>{!! $v->education !!}</td>
-                                            <td>{!! $v->school !!}</td>
-                                            <td>{!! $v->dep !!}</td>
-                                            <td>
-                                                {{ $v->pro_type }}
-                                            </td>
-                                            <td>
-                                                {{ $v->pro_text }}
-                                            </td>
+                                            <td>{!! $v->jobs_name !!}</td>
+                                            <td>{!! $v->company_name !!}</td>
+                                            <td>{!! $v->status !!}</td>
                                             <td>
 
                                                 <button class='btn btn-primary btn-xs fetch_word' data-aid="{{$v->id}}" style="margin-bottom: 10px">下载简历</button>
@@ -212,15 +204,15 @@
             health($(this).data('param'),$(this).data("type"));
         });
         $(document).off("click",'.fetch_word').on('click','.fetch_word',function () {
-            var recruit_id = $(this).attr('data-rid'),appoint_id = $(this).attr('data-aid');
+            var appoint_id = $(this).attr('data-aid');
 
             var qsDialog = $(this).dialog({
-                title: 'word简历生成',
+                title: 'word简历下载',
                 loading: true,
                 showFooter: false,
                 yes: function() {
                     $('.J_btnyes').val('发送中...');
-                    $.post("{{ route('recruit.fetchword') }}", {_token:'{{ csrf_token() }}',recruit_id:recruit_id,appoint_id:appoint_id}, function(result) {
+                    $.post("{{ route('Health.postStatus') }}", {_token:'{{ csrf_token() }}',id:appoint_id}, function(result) {
                         if (result.status == 1) {
                             disapperTooltip('success', result.msg);
                             window.location.href = result.url;
@@ -236,7 +228,7 @@
                 }
             });
             qsDialog.setCloseDialog(false);
-            qsDialog.setContent("重新生成会覆盖原有简历，请确认？");
+            qsDialog.setContent("即将下载简历，请确认？");
             qsDialog.showFooter(true);
         });
         $("#ButtonAudit").click(function() {

resources/views/admin/health/qjwj_appoint_list.blade.php

@@ -74,9 +74,9 @@
                                     <th>电话</th>
                                     <th>学历</th>
                                     <th>学校</th>
-                                    <th>院系</th>
                                     <th>专业类别</th>
                                     <th>具体专业</th>
+                                    <th>简历是否下载</th>
                                     <th>操作</th>
                                 </tr>
                                 </thead>
@@ -92,20 +92,22 @@
                                                 <span style="color: #0A246A; margin-right: 3px;">{{$v->sex}}</span>
                                                 <span style="color:#be7707; margin-right: 3px;">{{$v->birthday}}</span>
                                                 <span style="color:#0A7CF7; margin-right: 3px;">{{$v->education}}</span>
-                                                <span style="color:#0F73AC; margin-right: 3px;">{{$v->native_place}}</span>
+                                                <span style="color:#0F73AC; margin-right: 3px;">{{$v->native_place_cn}}</span>
                                             </td>
                                             <td>
                                                 {{ $v->mobile }}
                                             </td>
                                             <td>{!! $v->education !!}</td>
                                             <td>{!! $v->school !!}</td>
-                                            <td>{!! $v->dep !!}</td>
                                             <td>
                                                 {{ $v->pro_type }}
                                             </td>
                                             <td>
                                                 {{ $v->pro_text }}
                                             </td>
+                                            <td>
+                                                {{ $v->status }}
+                                            </td>
                                             <td>
 
                                                 <button class='btn btn-primary btn-xs fetch_word' data-aid="{{$v->id}}" style="margin-bottom: 10px">下载简历</button>
@@ -212,15 +214,15 @@
             health($(this).data('param'),$(this).data("type"));
         });
         $(document).off("click",'.fetch_word').on('click','.fetch_word',function () {
-            var recruit_id = $(this).attr('data-rid'),appoint_id = $(this).attr('data-aid');
+            var appoint_id = $(this).attr('data-aid');
 
             var qsDialog = $(this).dialog({
-                title: 'word简历生成',
+                title: 'word简历下载',
                 loading: true,
                 showFooter: false,
                 yes: function() {
                     $('.J_btnyes').val('发送中...');
-                    $.post("{{ route('recruit.fetchword') }}", {_token:'{{ csrf_token() }}',recruit_id:recruit_id,appoint_id:appoint_id}, function(result) {
+                    $.post("{{ route('Health.qjwjStatus') }}", {_token:'{{ csrf_token() }}',id:appoint_id}, function(result) {
                         if (result.status == 1) {
                             disapperTooltip('success', result.msg);
                             window.location.href = result.url;
@@ -236,7 +238,7 @@
                 }
             });
             qsDialog.setCloseDialog(false);
-            qsDialog.setContent("重新生成会覆盖原有简历，请确认？");
+            qsDialog.setContent("即将下载简历，请确认？");
             qsDialog.showFooter(true);
         });
         $("#ButtonAudit").click(function() {