人才库3

app/admin/controller/Talent.php

@@ -163,6 +163,9 @@ class Talent extends AdminController {
             $info['rs'] = $content;
         }
         $info["process"] = $process;
+        if ($process == 7) {
+            //如果有变更记录，这此处获取最初一条记录的旧值并覆盖$info中的新值
+        }
         if (in_array($info["checkState"], [TalentState::BASE_VERIFY_FAIL, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS, TalentState::BASE_REVERIFY_REJECT, TalentState::BASE_REVERIFY_FAIL])) {
             return view("talentInfo_base_check", ["info" => $info]);
         } else {
@@ -1855,6 +1858,13 @@ class Talent extends AdminController {
         $names["deptPass"] = "部门通过";
         $names["deptReject"] = "部门驳回";
         $names["deptWait"] = "部门待审";
+        $names["breakFaithName"] = "曾被相关主管部门列为失信个人";
+        $names["identifyMonth"] = "公布入选月份";
+        $names["certificateNo"] = "人才编号";
+        $names["activeName"] = "离职状态";
+        $names["cur_quit_time"] = "离职时间";
+        $names["first_submit_time"] = "首次确认提交时间";
+        $names["new_submit_time"] = "最新确认提交时间";
         $list = VerifyApi::getExportDatas($process, $params);
         if ($process == 4 && VerifyApi::chkUserInSuperDeptUsers()) {
             $fields[] = "first_dept_check_time";

app/admin/view/talent/library.html

@@ -357,12 +357,12 @@
                             </button>
                             {/if}
                             {if condition="chkCommission('/admin/talent/editBasicInfo','/talentInfo/editBasicInfo')"}
-                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.editBasicInfo()" id="">
+                            <button type="button" class="btn btn-sm btn-primary " onclick="alert('暂时未开放');return;TalentInfo.editBasicInfo()" id="">
                                 <i class="fa fa-edit"></i>&nbsp;修改信息
                             </button>
                             {/if}
                             {if condition="chkCommission('/admin/talent/selectFirstInfo','/talentInfo/selectFirstInfo')"}
-                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.TalentInfo.selectFirstInfo()" id="">
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.selectFirstInfo()" id="">
                                 <i class="fa fa-history"></i>&nbsp;查看首次申报信息
                             </button>
                             {/if}
@@ -448,6 +448,13 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_branch_name"><span>开户银行网点</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_account"><span>银行账号</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="breakFaithName"><span>曾被相关主管部门列为失信个人</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyMonth"><span>公布入选月份</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="certificateNo"><span>人才编号</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="activeName"><span>离职状态</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="cur_quit_time"><span>离职时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="first_submit_time"><span>首次确认提交时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="new_submit_time"><span>最新确认提交时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="checkState"><span>审核状态</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="checkMsg"><span>审核意见</span></li>
                             </ul>

app/common/api/DictApi.php

@@ -316,7 +316,17 @@ class DictApi {
                 $stepName = '<span class="label label-inverse">发放人才码</span>';
                 break;
             default:
-                $stepName = '<span class="label">用户操作</span>';
+                switch ($step) {
+                    case 60:
+                        $stepName = '<span class="label">取消优秀人才</span>';
+                        break;
+                    case 65:
+                        $stepName = '<span class="label">恢复优秀人才</span>';
+                        break;
+                    default:
+                        $stepName = '<span class="label">用户操作</span>';
+                        break;
+                }
                 break;
         }
         return $stepName;

app/common/api/MenuApi.php

@@ -212,6 +212,7 @@ class MenuApi {
         //$menus[] = ["type" => [1, 2], "code" => "rcrdsb", "pcode" => "rcrd", "name" => "人才认定申报", "url" => "/enterprise/talent", "icon" => "fa-thumbs-up", "status" => 1];
         $menus[] = ["type" => [1, 2], "code" => "rcrdsbnew", "pcode" => "rcrd", "name" => "人才认定申报(新)", "url" => "/enterprise/talent/index/isMix/1", "icon" => "fa-thumbs-up", "status" => 1];
         //$menus[] = ["type" => [1, 2], "code" => "rczrzlbc", "pcode" => "rcrd", "name" => "人才直认资料补充", "url" => "/enterprise/talent/zrIndex", "icon" => "fa-thumbs-up", "status" => 1];
+        $menus[] = ["type" => [2], "code" => "yxrck", "pcode" => "rcrd", "name" => "优秀人才库", "url" => "/enterprise/talent_library/index", "icon" => "fa-thumbs-up", "status" => 1];
         $menus[] = ["type" => [2], "code" => "jfsb", "pcode" => "rcrd", "name" => "积分申报", "url" => "/enterprise/integral/index", "icon" => "fa-credit-card", "status" => 1];
         $menus[] = ["type" => [1, 2], "code" => "yxrck", "pcode" => "rcrd", "name" => "优秀人才库", "url" => "", "icon" => "fa-thumbs-up", "status" => 1];
         $menus[] = ["type" => [1, 2], "code" => "lzsb", "pcode" => "rcrd", "name" => "离职申报", "url" => "", "icon" => "fa-thumbs-up", "status" => 1];

app/common/api/VerifyApi.php

@@ -443,7 +443,7 @@ class VerifyApi {
             $where[] = ["ti.active", "=", $params["active"]];
         }
         if ($params["breakFaith"]) {
-            $where[] = ["ti.breakFaith", "=", $params["breakFaith"]];
+            $where[] = ["ti.break_faith", "=", $params["breakFaith"]];
         }
 
         $process = $params["process"];
@@ -587,7 +587,7 @@ class VerifyApi {
         $exportFields = $params["export"];
         $fields = [];
         foreach ($exportFields as $field) {
-            if (!in_array($field, ["industryFieldNew", "enterpriseName", "enterpriseTag", "street", "talent_arrange_category", "checkMsg"])) {
+            if (!in_array($field, ["industryFieldNew", "enterpriseName", "enterpriseTag", "street", "talent_arrange_category", "checkMsg", "breakFaithName", "activeName"])) {
                 $fields[] = "ti." . $field;
             }
         }
@@ -599,6 +599,8 @@ class VerifyApi {
         $fields[] = "tl.description as checkMsg";
         $fields[] = "tc.name as talentConditionName";
         $fields[] = "tl.description as checkMsg";
+        $fields[] = "if(ti.break_faith=1,'是','否') as breakFaithName";
+        $fields[] = "if(ti.active=2,'离职','在职') as activeName";
         if (in_array("card_type", $exportFields)) {
             $cardTypes = DictApi::selectByParentCode("card_type");
         }
@@ -653,7 +655,14 @@ class VerifyApi {
 
         $where = [];
         $whereRaw = "";
-        $where[] = ["e.type", "=", session("user")["type"]];
+        $user = session("user");
+        if ($user["usertype"] == 1) {
+            $where[] = ["e.type", "=", $user["type"]];
+        } else if ($user["usertype"] == 2) {
+            $where[] = ["e.id", "=", $user["uid"]];
+        } else {
+            
+        }
         if ($params["all"] != 1) {
             if ($params["name"]) {
                 $where[] = ["ti.name", "like", "%{$params["name"]}%"];
@@ -725,6 +734,12 @@ class VerifyApi {
                 $params["isMatchZhiren"] = $params["isMatchZhiren"] == 1 ?: 0;
                 $where[] = ["ti.isMatchZhiren", "=", $params["isMatchZhiren"]];
             }
+            if ($params["active"]) {
+                $where[] = ["ti.active", "=", $params["active"]];
+            }
+            if ($params["breakFaith"]) {
+                $where[] = ["ti.break_faith", "=", $params["breakFaith"]];
+            }
             if ($params["company_id"]) {
                 $where[] = ["tc.companyIds", "like", "%" . $params["company_id"] . "%"];
             }
@@ -861,7 +876,7 @@ class VerifyApi {
                     }
                     break;
                 case 7:
-                    $where[] = ["tl.state", "=", TalentState::CERTIFICATED];
+                    $where[] = ["ti.checkState", "=", TalentState::CERTIFICATED];
                     break;
             }
         } else {

app/common/controller/Api.php

@@ -241,8 +241,10 @@ class Api extends BaseController {
                         $new_item["stateName"] = '<span class="label label-primary">审核通过</span>';
                     } else if (in_array($item["state"], [TalentState::FST_SAVE, TalentState::SCND_SAVE])) {
                         $new_item["stateName"] = '<span class="label">保存未提交</span>';
-                    } else if ($item["state"] == 0) {
-                        $new_item["stateName"] = '<span class="label">添加附件</span>';
+                    } else if (!$item["state"]) {
+                        if ($item["typeFileId"]) {
+                            $new_item["stateName"] = '<span class="label">添加附件</span>';
+                        }
                     } else {
                         if (($item["last_state"] == TalentState::BASE_REJECT && $item["state"] == TalentState::FST_SUBMIT) || ($item["last_state"] == TalentState::FST_VERIFY_REJECT && $item["state"] == TalentState::SCND_SUBMIT)) {
                             $new_item["stateName"] = '<span class="label label-success">待审核（重新提交）</span>';
@@ -262,7 +264,7 @@ class Api extends BaseController {
                         if ($item["last_state"] && $item["new_state"]) {
                             $new_item["stateChange"] = sprintf("%s -> %s", DictApi::getTalentInfoStateName($item["last_state"], $list[$key + 1]["step"]), DictApi::getTalentInfoStateName($item["new_state"], $list[$key - 1]["step"], $item["last_state"]));
                         } else {
-                            $new_item["stateChange"] = "";
+                            $new_item["stateChange"] = $item["stateChange"] ?: "";
                         }
                     }
                     break;

app/enterprise/controller/TalentLibrary.php

@@ -10,6 +10,8 @@ namespace app\enterprise\controller;
 
 use app\enterprise\common\EnterpriseController;
 use app\enterprise\api\TalentApi;
+use app\common\api\DictApi;
+use app\common\api\VerifyApi;
 
 /**
  * Description of TalentLibrary
@@ -19,7 +21,7 @@ use app\enterprise\api\TalentApi;
 class TalentLibrary extends EnterpriseController {
 
     public function index() {
-        return view();
+        return view("", ["type" => $this->user["type"]]);
     }
 
     public function list() {
@@ -27,4 +29,45 @@ class TalentLibrary extends EnterpriseController {
         return json($res);
     }
 
+    public function export() {
+        $setting = [];
+
+        $params = $this->request->param();
+        $fields = $params["export"];
+        if (!$fields)
+            return json(["msg" => "请选择要导出的数据"]);
+        $names = DictApi::getTalentFields(4, in_array("isMatchZhiren", $fields));
+        $names["industryFieldNew"] = "产业领域";
+        $names["enterpriseName"] = "单位名称";
+        $names["enterpriseTag"] = "单位标签";
+        $names["street"] = "所属镇街";
+        $names["breakFaithName"] = "曾被相关主管部门列为失信个人";
+        $names["identifyMonth"] = "公布入选月份";
+        $names["certificateNo"] = "人才编号";
+        $names["activeName"] = "离职状态";
+        $names["cur_quit_time"] = "离职时间";
+        $names["first_submit_time"] = "首次确认提交时间";
+        $names["new_submit_time"] = "最新确认提交时间";
+        $list = VerifyApi::getExportDatas(7, $params);
+        foreach ($fields as $field) {
+            $columns[] = $names[$field];
+        }
+        $datas = [];
+        for ($i = 0; $i < count($list); $i++) {
+            $data = [];
+            for ($n = 0; $n < count($fields); $n++) {
+                $cellValue = $list[$i][$fields[$n]];
+                $data[] = $cellValue;
+            }
+            $datas[] = $data;
+        }
+        $setting["freeze"] = "A2";
+        $setting["filter"] = sprintf("A1:%s1", getExcelColumnByIndex(count($columns) - 1));
+        if ($datas) {
+            export($columns, $datas, "人才认定申报列表导出", $setting);
+            exit();
+        }
+        echo "<script>parent.layer.alert('没有可以导出的数据');window.history.go(-1);</script>";
+    }
+
 }

app/enterprise/view/talent_library/index.html

@@ -83,6 +83,7 @@
                                     </select>
                                 </div>
                             </div>
+                            {eq name="type" value="1"}
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">
                                     <div class="input-group-btn">
@@ -90,10 +91,11 @@
                                             人才标签
                                         </button>
                                     </div>
-                                    <select class="form-control" id="talentType">
+                                    <select class="form-control" id="talent_type">
                                     </select>
                                 </div>
                             </div>
+                            {/eq}
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">
                                     <div class="input-group-btn">
@@ -115,12 +117,12 @@
                             </div>
                         </div>
                         <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
-                            <button type="button" class="btn btn-sm btn-primary" onclick="TalentInfo.updatePhoto()">
+                            <!--<button type="button" class="btn btn-sm btn-primary" onclick="TalentInfo.updatePhoto()">
                                 <i class="fa fa-photo"></i>&nbsp;修改头像
                             </button>
                             <button type="button" class="btn btn-sm btn-primary" onclick="TalentInfo.updatePhoneModal()">
                                 <i class="fa fa-edit"></i>&nbsp;修改手机号码
-                            </button>
+                            </button>-->
                             <button type="button" class="btn btn-sm btn-primary" onclick="TalentInfo.showExportModal()">
                                 <i class="fa fa-file-excel-o"></i>&nbsp;导出
                             </button>
@@ -189,94 +191,63 @@
                     <div class="form-group" id="field">
                         <div id="field_info">
                             <ul>
-                                @if(type==1){
-                                <li style="width:12%"><input type="checkbox" value="name"><span>姓名</span></li>
-                                <li style="width:12%"><input type="checkbox" value="sexName"><span>性别</span></li>
-                                <li style="width:12%"><input type="checkbox" value="birthday"><span>出生日期</span></li>
-                                <li style="width:12%"><input type="checkbox" value="nationalityName"><span>国籍/地区</span></li>
-                                <li style="width:12%"><input type="checkbox" value="provinceName"><span>籍贯省</span></li>
-                                <li style="width:12%"><input type="checkbox" value="cityName"><span>籍贯市</span></li>
-                                <li style="width:12%"><input type="checkbox" value="countyName"><span>籍贯县</span></li>
-                                <li style="width:12%"><input type="checkbox" value="nationName"><span>民族</span></li>
-                                <li style="width:12%"><input type="checkbox" value="politicsName"><span>政治面貌</span></li>
-                                <li style="width:12%"><input type="checkbox" value="cardTypeName"><span>证件类型</span></li>
-                                <li style="width:12%"><input type="checkbox" value="idCard"><span>证件号码</span></li>
-                                <li style="width:24%"><input type="checkbox" value="firstInJJTime"><span>首次来晋工作时间</span></li>
-                                <li style="width:12%"><input type="checkbox" value="enterpriseName"><span>企业名称</span></li>
-                                <li style="width:12%"><input type="checkbox" value="industryFieldName"><span>行业领域</span></li>
-                                <li style="width:12%"><input type="checkbox" value="streetName"><span>所属镇街</span></li>
-                                <li style="width:12%"><input type="checkbox" value="sourceName"><span>申报来源</span></li>
-                                <li style="width:12%"><input type="checkbox" value="fromCityName"><span>入选来源县市</span></li>
-                                <li style="width:12%"><input type="checkbox" value="qzBatch"><span>入选名单批次</span></li>
-                                <li style="width:24%"><input type="checkbox" value="certificateStartTime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" value="qzgccrcActiveTime"><span>泉州高层次人才证书的有效期</span></li>
-                                <li style="width:12%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>
-                                <li style="width:12%"><input type="checkbox" value="identifyConditionText"><span>认定条件</span></li>
-                                <li style="width:12%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>
-                                <li style="width:12%"><input type="checkbox" value="talentTypeName"><span>人才标签</span></li>
-                                <li style="width:24%"><input type="checkbox" value="letterTime"><span>首次来晋行政介绍信时间</span></li>
-                                <li style="width:12%"><input type="checkbox" value="introductionModeName"><span>引进方式</span></li>
-                                <li style="width:24%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>
-                                <li style="width:12%"><input type="checkbox" value="post"><span>职务</span></li>
-                                <li style="width:24%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>
-                                <li style="width:12%"><input type="checkbox" value="educationName"><span>最高学历</span></li>
-                                <li style="width:12%"><input type="checkbox" value="major"><span>专业</span></li>
-                                <li style="width:12%"><input type="checkbox" value="title"><span>职称</span></li>
-                                <li style="width:12%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>是否有留学经历</span></li>
-                                <li style="width:12%"><input type="checkbox" value="phone"><span>手机号码</span></li>
-                                <li style="width:12%"><input type="checkbox" value="email"><span>电子邮箱</span></li>
-                                <li style="width:12%"><input type="checkbox" value="bank"><span>开户银行</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>
-                                <li style="width:12%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>
-                                <li style="width:12%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>
-                                <li style="width:24.5%"><input type="checkbox" value="breakFaithName"><span>曾被相关主管部门列为失信个人</span></li>
-                                <li style="width:12%"><input type="checkbox" value="identifyMonth"><span>公布入选月份</span></li>
-                                <li style="width:12%"><input type="checkbox" value="certificateNO"><span>人才编号</span></li>
-                                <li style="width:12%"><input type="checkbox" value="activeName"><span>离职状态</span></li>
-                                <li style="width:12%"><input type="checkbox" value="quitTime"><span>离职时间</span></li>
-                                @}
-                                @if(type==2){
-                                <li style="width:12%"><input type="checkbox" value="enterpriseName"><span>企业名称</span></li>
-                                <li style="width:12%"><input type="checkbox" value="name"><span>姓名</span></li>
-                                <li style="width:12%"><input type="checkbox" value="sexName"><span>性别</span></li>
-                                <li style="width:12%"><input type="checkbox" value="birthday"><span>出生日期</span></li>
-                                <li style="width:12%"><input type="checkbox" value="nationName"><span>民族</span></li>
-                                <li style="width:12%"><input type="checkbox" value="cardTypeName"><span>证件类型</span></li>
-                                <li style="width:12%"><input type="checkbox" value="idCard"><span>证件号码</span></li>
-                                <li style="width:12%"><input type="checkbox" value="nationalityName"><span>国籍/地区</span></li>
-                                <li style="width:12%"><input type="checkbox" value="politicsName"><span>政治面貌</span></li>
-                                <li style="width:12%"><input type="checkbox" value="streetName"><span>所属镇街</span></li>
-                                <li style="width:12%"><input type="checkbox" value="provinceName"><span>籍贯省</span></li>
-                                <li style="width:12%"><input type="checkbox" value="cityName"><span>籍贯市</span></li>
-                                <li style="width:12%"><input type="checkbox" value="countyName"><span>籍贯县</span></li>
-                                <li style="width:12%"><input type="checkbox" value="educationName"><span>最高学历</span></li>
-                                <li style="width:12%"><input type="checkbox" value="graduateSchool"><span>毕业学校</span></li>
-                                <li style="width:12%"><input type="checkbox" value="major"><span>专业</span></li>
-                                <li style="width:12%"><input type="checkbox" value="post"><span>职务</span></li>
-                                <li style="width:12%"><input type="checkbox" value="phone"><span>手机号码</span></li>
-                                <li style="width:12%"><input type="checkbox" value="email"><span>电子邮箱</span></li>
-                                <li style="width:12%"><input type="checkbox" value="bank"><span>开户银行</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>
-                                <li style="width:12%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>
-                                <li style="width:12%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>
-                                <li style="width:12%"><input type="checkbox" value="identifyConditionText"><span>认定条件</span></li>
-                                <li style="width:12%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>
-                                <li style="width:12%"><input type="checkbox" value="title"><span>职称</span></li>
-                                <li style="width:12%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>
-                                <li style="width:24.5%"><input type="checkbox" value="studyAbroadName"><span>是否有留学经历</span></li>
-                                <li style="width:36%"><input type="checkbox" value="breakFaithName"><span>曾被相关主管部门列为失信个人</span></li>
-                                <li style="width:12%"><input type="checkbox" value="identifyMonth"><span>公布入选月份</span></li>
-                                <li style="width:12%"><input type="checkbox" value="certificateNO"><span>人才编号</span></li>
-                                <li style="width:12%"><input type="checkbox" value="activeName"><span>离职状态</span></li>
-                                <li style="width:12%"><input type="checkbox" value="quitTime"><span>离职时间</span></li>
-                                @}
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="name"><span>姓名</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="card_type"><span>证件类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="card_number"><span>证件号码</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="sex"><span>性别</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="birthday"><span>出生日期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="nation"><span>民族</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="politics"><span>政治面貌</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="nationality"><span>国籍/地区</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="province"><span>籍贯省</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="city"><span>籍贯市</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="county"><span>籍贯县</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="enterpriseTag"><span>单位标签</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="enterpriseName"><span>单位名称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="street"><span>所属镇街</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="industryFieldNew"><span>产业领域</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="talent_type"><span>人才类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="tax_insurance_month"><span>在我市缴交社保或个税月份</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="labor_contract_rangetime"><span>劳动合同起止时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_way"><span>工资发放渠道</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_month"><span>工资发放月份</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="fst_work_time"><span>来晋时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="pre_import_type"><span>预引进类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="return"><span>流出晋江满3年后又返回晋江的</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="apply_year"><span>申报年度</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="phone"><span>手机号码</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="email"><span>电子邮箱</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="highest_degree"><span>最高学历</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="graduate_school"><span>毕业院校</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="major"><span>专业</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="study_abroad"><span>是否有留学经历</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="abroad_school"><span>留学毕业院校</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="abroad_major"><span>留学专业</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="import_way"><span>引进方式</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="cur_entry_time"><span>本单位入职时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="position"><span>本单位现任职务</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="pro_qua"><span>职业资格</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="professional"><span>专业技术职称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="isMatchZhiren"><span>是否直认人才</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="source"><span>申报来源</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_city"><span>入选来源地级市</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_county"><span>入选来源县市区</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange"><span>人才层次</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange_category"><span>人才条款</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="talent_condition"><span>认定条件</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyGetTime"><span>认定条件取得时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="annual_salary"><span>年薪</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="bank"><span>开户银行</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="bank_branch_name"><span>开户银行网点</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="bank_account"><span>银行账号</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="breakFaithName"><span>曾被相关主管部门列为失信个人</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyMonth"><span>公布入选月份</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="certificateNo"><span>人才编号</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="activeName"><span>离职状态</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="cur_quit_time"><span>离职时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="first_submit_time"><span>首次确认提交时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="new_submit_time"><span>最新确认提交时间</span></li>
                             </ul>
                         </div>
                         <div class="form-group" style="text-align: center">

public/static/modular/gate/talentInfo/talentInfo_library.js

@@ -19,7 +19,7 @@ TalentInfo.initColumn = function () {
     }
     return [
         {field: 'selectItem', radio: true},
-        {title: '申报年度', field: 'year', visible: true, align: 'center', valign: 'middle', width: '80px'},
+        {title: '申报年度', field: 'apply_year', visible: true, align: 'center', valign: 'middle', width: '80px'},
         {title: '离职状态', field: 'active', visible: true, align: 'center', valign: 'middle', width: '80px',
             formatter: function (value, row, index) {
                 if (value == 1) {
@@ -52,17 +52,17 @@ TalentInfo.initColumn = function () {
         },
         {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "80px"},
         {title: '人才标签', field: 'talentTypeName', visible: isShow, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "80px"},
-        {title: '证件号码', field: 'idCard', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
+        {title: '证件号码', field: 'card_number', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
         {title: '认定条件', field: 'identifyConditionText', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
         {title: '认定条件名称', field: 'identifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
         {title: '认定条件证书取得时间', field: 'identifyGetTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
         {title: '人才证书有效期', field: 'identifyGetTime', visible: isShow, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '150px',
             formatter: function (value, row, index) {
-                return row.certificateStartTime + "至" + row.qzgccrcActiveTime;
+                return row.certificateGetTime + "至" + row.certificateExpireTime;
             }
         },
         {title: '公布入选月份', field: 'identifyMonth', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
-        {title: '人才编号', field: 'certificateNO', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '人才编号', field: 'certificateNo', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
         {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "80px",
             formatter: function (value, row, index) {
                 return "<span class='label label-success' onclick=\"TalentInfo.showLog('" + value + "')\" >" +
@@ -133,7 +133,7 @@ TalentInfo.formParams = function () {
     queryData['sex'] = $("#sex").val();
     queryData['nation'] = $("#nation").val();
     queryData['nationality'] = $("#nationality").val();
-    queryData['talentType'] = $("#talentType").val();
+    queryData['talent_type'] = $("#talent_type").val();
     queryData['talent_arrange'] = $("#talent_arrange").val();
     return queryData;
 }
@@ -154,7 +154,7 @@ TalentInfo.reset = function () {
     $("#sex").val("");
     $("#nation").val("");
     $("#nationality").val("");
-    $("#talentType").val("");
+    $("#talent_type").val("");
     $("#talent_arrange").val("");
 }
 
@@ -258,19 +258,15 @@ TalentInfo.showExportModal = function () {
 //导出
 TalentInfo.export = function () {
     var operation = function () {
-        var names = '';
-        var fieldCodes = '';
-        $("#field_info li input").each(function (index) {
-            if ($(this).is(":checked")) {
-                fieldCodes = fieldCodes + $(this).val() + ",";
-                names = names + $(this).next().text() + ",";
+        var queryData = TalentInfo.formParams();
+        var params = $("#exportForm").serialize();
+        var url = "/enterprise/talent_library/export?" + params;
+        Object.keys(queryData).forEach(function (key, index) {
+            if (typeof queryData[key] != "undefined" && queryData[key]) {
+                url += "&" + key + "=" + queryData[key];
             }
-        });
-        var arr = {"names": names, "fieldCodes": fieldCodes, "name": $("#name").val(), "idCard": $("#idCard").val(), "sex": $("#sex").val(), "nation": $("#nation").val(),
-            "nationality": $("#nationality").val(), "talentType": $("#talentType").val(), "talentArrange": $("#talentArrange").val()};
-        window.location.href = Feng.setUrlParam(Feng.ctxPath + "/api/talentInfoExport/export", arr);
-        // window.location.href = Feng.ctxPath + "/api/talentInfoExport/export?names=" + names + "&fieldCodes=" + fieldCodes + "&name=" + $("#name").val() + "&idCard=" + $("#idCard").val()
-        //     + "&sex=" + $("#sex").val()+ "&nation=" + $("#nation").val()+ "&nationality=" + $("#nationality").val()+ "&talentType=" + $("#talentType").val()+ "&talentArrange=" + $("#talentArrange").val();
+        })
+        window.location.href = url;
     };
     Feng.confirm("确定要导出数据吗？", operation);
 }
@@ -306,10 +302,10 @@ $(function () {
     TalentInfo.table = table.init();
     //批量加载字典表数据
     var arr = [
-        {"name": "nation", "code": "un_nation"},
-        {"name": "talentArrange", "code": "un_talentLevel"},
-        {"name": "nationality", "code": "un_nationality"},
-        {"name": "talentType", "code": "un_jbt_talentType"}];
+        {"name": "nation", "code": "nation"},
+        {"name": "nationality", "code": "nationality"},
+        {"name": "talent_type", "code": "talent_type"},
+        {"name": "talent_arrange", "code": "talent_arrange"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
 });
 

public/static/modular/talentIdentify/talentInfo/talentInfo_library.js

@@ -91,6 +91,7 @@ TalentInfo.check = function () {
  * 打开查看人才认定-初级审核详情
  */
 TalentInfo.openTalentInfoDetail = function () {
+    var process = 6;
     if (this.check()) {
         var index = layer.open({
             type: 2,
@@ -98,7 +99,7 @@ TalentInfo.openTalentInfoDetail = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentInfo/talentInfo_toCommonCheck/' + TalentInfo.seItem.id + '/5'
+            content: '/admin/talent/common_check/id/' + TalentInfo.seItem.id + '/process/' + process,
         });
         layer.full(index);
         TalentInfo.layerIndex = index;
@@ -175,11 +176,11 @@ TalentInfo.export = function () {
     });
     var name = $("#name").val();
     var sex = $("#sex").val();
-    var idCard = $("#idCard").val();
+    var idCard = $("#card_number").val();
     var nation = $("#nation").val();
     var nationality = $("#nationality").val();
-    var talentType = $("#talentType").val();
-    var talentArrange = $("#talentArrange").val();
+    var talentType = $("#talent_type").val();
+    var talentArrange = $("#talent_arrange").val();
     var active = $("#active").val();
     $("#exportModal").modal('hide');
     var url = Feng.ctxPath + "/talentInfoExport/libraryExport?name=" + name + "&names=" + names + "&values=" + values
@@ -257,6 +258,7 @@ TalentInfo.callBack = function (data) {
  * 查看首次申报基础信息
  */
 TalentInfo.selectFirstInfo = function () {
+    var process = $("#process").val();
     if (this.check()) {
         var index = layer.open({
             type: 2,
@@ -264,7 +266,7 @@ TalentInfo.selectFirstInfo = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentInfo/talentInfo_toCommonCheck/' + TalentInfo.seItem.id + '/6'
+            content: '/admin/talent/common_check/id/' + TalentInfo.seItem.id + '/process/' + process,
         });
         layer.full(index);
         TalentInfo.layerIndex = index;