Browse Source

人才库雏形

sugangqiang 2 years ago
parent
commit
3aa7a0c619

+ 23 - 1
app/admin/controller/Talent.php

@@ -181,6 +181,23 @@ class Talent extends AdminController {
         return view("", ["message" => $message, "enterprises" => $enterprises]);
     }
 
+    /**
+     * 优秀人才库
+     * @auth {{/talentInfo/gotoIndex/5}}
+     */
+    public function library() {
+        $enterprises = EnterpriseApi::getSimpleList();
+        $conditions = TalentConditionApi::getList([1, 2, 3, 4, 5, 6, 7], $this->user["type"]);
+        $industry_field_new = array_column(DictApi::findChildDictByCode("industry_field"), "code");
+        foreach ($industry_field_new as &$field) {
+            $field .= "_field";
+        }
+        $parent_industry_fields = implode(",", $industry_field_new);
+        $where[] = ["d2.code", "in", $parent_industry_fields];
+        $industry_field_old = \app\common\model\Dict::alias("d1")->field("d1.*,d2.`name` as pname")->leftJoin("new_talent_dict d2", "d1.pid=d2.id")->order("name asc")->where($where)->select();
+        return view("", ["enterprises" => $enterprises, "talent_conditions" => $conditions, "industry_field_old" => $industry_field_old]);
+    }
+
     public function selectNeedCheckData() {
         $params = $this->request->param();
         return json(["code" => 200, "obj" => VerifyApi::getPublicList($params)]);
@@ -396,7 +413,7 @@ class Talent extends AdminController {
 
                 $record_data = [
                     'id' => $recordId,
-                    'bizId' => $recordId,
+                    'bizId' => $result["msgId"],
                     'type' => 2,
                     'smsType' => 1,
                     'phone' => $phone,
@@ -643,6 +660,7 @@ class Talent extends AdminController {
                     $data["id"] = $talent_info["id"];
                     $data["certificateNo"] = $max_no;
                     $data["checkState"] = TalentState::CERTIFICATED;
+                    $data["isEffect"] = 1;
                     $data["isPublic"] = 5;
                     Db::table("new_talent_info")->update($data);
 
@@ -1620,6 +1638,10 @@ class Talent extends AdminController {
         $this->commonExport(6);
     }
 
+    public function libraryListExport() {
+        $this->commonExport(7);
+    }
+
     private function commonExport($process) {
         $params = $this->request->param();
         $fields = $params["export"];

+ 1 - 1
app/admin/view/talent/dept_verify.html

@@ -368,7 +368,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(1)">导出</button>
+                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(4)">导出</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
             </div>
         </div>

+ 1 - 1
app/admin/view/talent/fst_verify.html

@@ -446,7 +446,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(1)">导出</button>
+                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(3)">导出</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
             </div>
         </div>

+ 462 - 0
app/admin/view/talent/library.html

@@ -0,0 +1,462 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .layui-layer-btn .layui-layer-btn1 {
+        border-color: #009688;
+        background-color: #009688;
+        color: #fff;
+    }
+    ul li{
+        list-style: none;
+        display:inline-block;
+        margin-bottom: 5px;
+    }
+    #field ul li input{
+        vertical-align:middle;
+        margin-top:1px;
+    }
+</style>
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>优秀人才库</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row row-lg">
+                    <div class="col-sm-12">
+                        <div class="row">
+                            <input type="hidden" id="type" value="${user.type}">
+                            <input type="hidden" id="process" value="7">
+                            <input type="hidden" id="title" value="优秀人才库">
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">姓名
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="name" placeholder="" />
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">证件号码
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="card_number" placeholder="" />
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            性别
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="sex">
+                                        <option value=""></option>
+                                        <option value="1">男</option>
+                                        <option value="2">女</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            民族
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nation">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">申报年度
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="apply_year" placeholder="">
+                                </div>                            
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">手机
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="phone" placeholder="">
+                                </div>                            
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">电子邮箱
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="email" placeholder="">
+                                </div>                            
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">审核状态
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="checkState">
+                                        <option value="">---请选择---</option>
+                                        <option value="-1">保存未提交</option>
+                                        <option value="5">重新提交</option>
+                                        <option value="1">待审核</option>
+                                        <option value="2">审核驳回</option>
+                                        <option value="3">审核通过</option>
+                                        <option value="4">审核失败</option>
+                                    </select>
+                                </div>                            
+                            </div>
+                        </div>
+                        <div class="row highSearch" style="display: none">
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            国籍/地区
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nationality">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            籍贯省
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="province">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            政治面貌
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="politics">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            单位名称
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="enterprise_id">
+                                        {volist name="enterprises" id="item"}
+                                        <option value="{$item.id}">{$item.name}</option>
+                                        {/volist}
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            所属街道
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="street">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            产业领域
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="industry_field">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            行业领域
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="industry_field_old">
+                                        <option value="">---请选择---</option>
+                                        {volist name="industry_field_old" id="field"}
+                                        <option value="{$field.code}">{$field.name}</option>
+                                        {/volist}
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            单位标签
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="enterprise_tag">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            人才类型
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="talent_type">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">引进方式
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="import_way">
+                                    </select>
+                                </div>                            
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">最高学历
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="highest_degree">
+                                    </select>
+                                </div>                            
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">是否有留学经历
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="study_abroad">
+                                        <option value="">---请选择---</option>
+                                        <option value="1">是</option>
+                                        <option value="2">否</option>
+                                    </select>
+                                </div>                            
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">是否直认
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="isMatchZhiren">
+                                        <option value="">---请选择---</option>
+                                        <option value="1">是</option>
+                                        <option value="2">否</option>
+                                    </select>
+                                </div>                            
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            申报来源
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="source">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            人才层次
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="talent_arrange">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            人才条款
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="talent_condition">
+                                        <option value="">--请选择--</option>
+                                        {volist name="talent_conditions" id="condition"}
+                                        <option value="{$condition.id}">{$condition.name}</option>
+                                        {/volist}
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-sm-12" style="text-align: center">
+                                <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();
+                                        $(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
+                                <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();
+                                        $('.highSearch').hide();
+                                        $(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="TalentInfo.search()">搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="TalentInfo.reset()">重置</button>
+                            </div>
+                        </div>
+                        <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
+                            {if condition="chkCommission('/admin/talent/libraryCancel','/talentInfo/libraryCancle')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.cancle()" id="">
+                                <i class="fa fa-remove"></i>&nbsp;取消优秀人才
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talent/libraryRecovery','/talentInfo/libraryRecovery')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.recovery()" id="">
+                                <i class="fa fa-mail-reply"></i>&nbsp;恢复优秀人才
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talent/libraryExport','/talentInfo/libraryExport')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.showExportModal()" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talent/libraryDownload','/talentInfo/libraryDownload')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.download()" id="">
+                                <i class="fa fa-download"></i>&nbsp;下载
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talent/libraryDetail','/talentInfo/libraryDetail')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openTalentInfoDetail()" id="">
+                                <i class="fa fa-eye"></i>&nbsp;查看
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talent/editBasicInfo','/talentInfo/editBasicInfo')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="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="">
+                                <i class="fa fa-history"></i>&nbsp;查看首次申报信息
+                            </button>
+                            {/if}
+                        </div>
+                        <table id="TalentInfoTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                            <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                            </thead>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!--导出模态框-->
+<div class="modal fade " id="commonExportModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog modal-lg" role="document" style="min-width: 1000px">
+        <div class="modal-content animated flipInY">
+            <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="firstModalLabel">导出</h4>
+            </div>
+            <div class="modal-body">
+                <form id="exportForm" action="/talentInfoExport/publicExport" target="hiddenIframe" class="form-horizontal">
+                    <div class="form-group" id="field">
+                        <div id="field_info">
+                            <ul>
+                                <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="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="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="source"><span>申报来源</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_pubtime"><span>福建省高层次人才证书发证日期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_exptime"><span>福建省高层次人才证书有效期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_pubtime"><span>泉州高层次人才证书发证日期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><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="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="checkState"><span>审核状态</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="checkMsg"><span>审核意见</span></li>
+                            </ul>
+                        </div>
+                        <div class="form-group" style="text-align: center">
+                            <button type="button" class="btn btn-primary" onclick="TalentInfo.checkAll()">全选</button>
+                            <button type="button" class="btn btn-success" onclick="TalentInfo.unCheckAll()">反选</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(1)">导出</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_first.js"></script>-->
+<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_library.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

+ 1 - 1
app/admin/view/talent/pre_list.html

@@ -656,7 +656,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(4)">导出</button>
+                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(6)">导出</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
             </div>
         </div>

+ 1 - 1
app/admin/view/talent/re_verify.html

@@ -373,7 +373,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(1)">导出</button>
+                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(5)">导出</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
             </div>
         </div>

+ 9 - 2
app/common/api/VerifyApi.php

@@ -411,6 +411,9 @@ class VerifyApi {
                         $where[] = ["ti.checkState", "=", $params["checkState"]];
                     }
                     break;
+                case 7:
+                    $where[] = ["ti.checkState", "=", TalentState::CERTIFICATED];
+                    break;
             }
             $count = Talent::alias("ti")
                             ->leftJoin("un_enterprise e", "e.id=ti.enterprise_id")
@@ -525,6 +528,9 @@ class VerifyApi {
             case 6:
                 $where = "ti.checkState >= " . TalentState::REVERIFY_PASS;
                 break;
+            case 7:
+                $where = "ti.checkState = " . TalentState::CERTIFICATED;
+                break;
         }
         $list = Talent::alias("ti")
                         ->field($fields)
@@ -607,8 +613,9 @@ class VerifyApi {
                 break;
             case TalentState::PUBLISH_PASS:
                 $data["isPublic"] = 4;
-                $data["certificateGetTime"] = $batch;
-                $data["certificateExpireTime"] = date("Y-m-d", strtotime(sprintf("%s +6 years", $batch)));
+                $data["identifyMonth"] = $batch;
+                $data["certificateGetTime"] = $batch; //时间待定
+                $data["certificateExpireTime"] = date("Y-m-d", strtotime(sprintf("%s +6 years", $batch))); //时间待定
                 break;
             case TalentState::PUBLISH_FAIL:
                 $data["isPublic"] = 4;

+ 4 - 1
public/static/modular/talentIdentify/talentInfo/talentInfo_common.js

@@ -182,6 +182,9 @@ TalentInfo.export = function (process) {
         case 6:
             commonExport = "preListExport";
             break;
+        case 7:
+            commonExport = "libraryListExport";
+            break;
     }
     $("#commonExportModal").modal('hide');
     var params = $("#exportForm").serialize();
@@ -205,7 +208,7 @@ TalentInfo.init = function () {
         {"name": "talent_arrange", "code": "talent_arrange"},
         {"name": "source", "code": "source"},
         {"name": "street", "code": "street"},
-        {"name": "enterprise_tag", "code": "enterprise_tag"},];
+        {"name": "enterprise_tag", "code": "enterprise_tag"}, ];
     Feng.findChildDictBatch(JSON.stringify(arr));
     //TalentInfo.getIdentifyCondition();
     TalentInfo.getProvince();

+ 110 - 107
public/static/modular/talentIdentify/talentInfo/talentInfo_library.js

@@ -2,8 +2,8 @@
  * 人才认定申报管理初始化
  */
 var TalentInfo = {
-    id: "TalentInfoTable",	//表格id
-    seItem: null,		//选中的条目
+    id: "TalentInfoTable", //表格id
+    seItem: null, //选中的条目
     table: null,
     layerIndex: -1
 };
@@ -14,59 +14,60 @@ var TalentInfo = {
 TalentInfo.initColumn = function () {
     var type = $("#usertype").val();
     var isShow = true;
-    if(type==2){
+    if (type == 2) {
         isShow = false;
-    };
+    }
+    ;
     return [
         {field: 'selectItem', radio: true},
-        {title: '申报年度', field: '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){
+        {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) {
                     return '<span style="color:#6495ED">在职</span>';
-                }if(value==2){
+                }
+                if (value == 2) {
                     return '<span style="color:#FF82AB">离职</span>';
                 }
             }
         },
-        {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle',width:'150px'},
-        {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle',width:'120px',
-            formatter : function(value,row,index){
-                if(row.sex==1){
-                    return value+'<span style="color:#6495ED">【男】</span>';
-                }if(row.sex==2){
-                    return value+'<span style="color:#FF82AB">【女】</span>';
+        {title: '企业名称', field: 'enterprise_name', visible: true, align: 'center', valign: 'middle', width: '150px'},
+        {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle', width: '120px',
+            formatter: function (value, row, index) {
+                if (row.sex == 1) {
+                    return value + '<span style="color:#6495ED">【男】</span>';
+                }
+                if (row.sex == 2) {
+                    return value + '<span style="color:#FF82AB">【女】</span>';
                 }
             }
         },
-        {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle',width:'100px'},
-        {title: '人才标签', field: 'talentTypeName', visible: isShow, align: 'center', valign: 'middle',width:'100px'},
-        {title: '证件号码', field: 'idCard', visible: true, align: 'center', valign: 'middle',width:'150px','class': 'uitd_showTip'},
-        {title: '认定条件', field: 'identifyConditionText', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:'150px'},
-        {title: '认定条件名称', field: 'identifyConditionName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:'100px'},
-        {title: '人才证书有效期', field: 'identifyGetTime', visible: isShow, align: 'center', valign: 'middle','class': 'uitd_showTip',width:'150px',
-            formatter:function (value,row,index) {
-                return row.certificateStartTime + "至" + row.qzgccrcActiveTime ;
+        {title: '证件号码', field: 'card_number', visible: true, align: 'center', valign: 'middle', width: '150px', 'class': 'uitd_showTip'},
+        {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle', width: '100px'},
+        {title: '认定条件', field: 'talentConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '150px'},
+        {title: '人才证书有效期', field: 'identifyGetTime', visible: isShow, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '150px',
+            formatter: function (value, row, index) {
+                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: 'isEffect', visible: isShow, align: 'center', valign: 'middle',width:'120px',
-            formatter : function (value,row,index){
-                if(value==1){
+        {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: 'isEffect', visible: isShow, align: 'center', valign: 'middle', width: '120px',
+            formatter: function (value, row, index) {
+                if (value == 1) {
                     return '有效';
-                }else if(value == 4){
+                } else if (value == 4) {
                     return "失效";
-                }else{
+                } else {
                     return "已过期";
                 }
             }
         },
-        {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+"')\" >" +
-                    "<i class=\"fa fa-book\"></i>日志" +
-                    "</span>";
+        {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 + "')\" >" +
+                        "<i class=\"fa fa-book\"></i>日志" +
+                        "</span>";
             }
         }
     ];
@@ -76,10 +77,10 @@ TalentInfo.initColumn = function () {
  */
 TalentInfo.check = function () {
     var selected = $('#' + this.id).bootstrapTable('getSelections');
-    if(selected.length == 0){
+    if (selected.length == 0) {
         Feng.info("请先选中表格中的某一记录!");
         return false;
-    }else{
+    } else {
         TalentInfo.seItem = selected[0];
         return true;
     }
@@ -97,7 +98,7 @@ TalentInfo.openTalentInfoDetail = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentInfo/talentInfo_toCommonCheck/' + TalentInfo.seItem.id+'/5'
+            content: Feng.ctxPath + '/talentInfo/talentInfo_toCommonCheck/' + TalentInfo.seItem.id + '/5'
         });
         layer.full(index);
         TalentInfo.layerIndex = index;
@@ -106,24 +107,24 @@ TalentInfo.openTalentInfoDetail = function () {
 
 
 //取消优秀人才
-TalentInfo.cancle = function(){
-    if(this.check()){
-        if(TalentInfo.seItem.isEffect == 4){
+TalentInfo.cancle = function () {
+    if (this.check()) {
+        if (TalentInfo.seItem.isEffect == 4) {
             Feng.info("无法重复取消");
-            return ;
+            return;
         }
-        var operation = function(){
-            var ajax = new $ax(Feng.ctxPath + "/talentInfo/removeFromLibrary", function (data) {
-                if(data.code==200){
+        var operation = function () {
+            var ajax = new $ax(Feng.ctxPath + "/admin/talent/removeFromLibrary", function (data) {
+                if (data.code == 200) {
                     Feng.success(data.msg);
                     TalentInfo.table.refresh();
-                }else{
+                } else {
                     Feng.error(data.msg);
                 }
             }, function (data) {
                 Feng.error("取消优秀人才失败!" + data.responseJSON.message + "!");
             });
-            ajax.setData({"id":TalentInfo.seItem.id});
+            ajax.setData({"id": TalentInfo.seItem.id});
             ajax.start();
         }
         Feng.confirm("一旦取消将无法恢复,确认取消吗?", operation);
@@ -133,24 +134,24 @@ TalentInfo.cancle = function(){
 /**
  * 恢复优秀人才
  */
-TalentInfo.recovery = function(){
-    if(this.check()){
-        if(TalentInfo.seItem.isEffect != 4){
+TalentInfo.recovery = function () {
+    if (this.check()) {
+        if (TalentInfo.seItem.isEffect != 4) {
             Feng.info("无法恢复有效数据");
-            return ;
+            return;
         }
-        var operation = function(){
-            var ajax = new $ax(Feng.ctxPath + "/talentInfo/recovery", function (data) {
-                if(data.code==200){
+        var operation = function () {
+            var ajax = new $ax(Feng.ctxPath + "/admin/talent/recovery", function (data) {
+                if (data.code == 200) {
                     Feng.success(data.msg);
                     TalentInfo.table.refresh();
-                }else{
+                } else {
                     Feng.error(data.msg);
                 }
             }, function (data) {
                 Feng.error("恢复优秀人才失败!" + data.responseJSON.message + "!");
             });
-            ajax.setData({"id":TalentInfo.seItem.id});
+            ajax.setData({"id": TalentInfo.seItem.id});
             ajax.start();
         }
         Feng.confirm("确认恢复吗?", operation);
@@ -158,16 +159,16 @@ TalentInfo.recovery = function(){
 }
 
 //公示导出
-TalentInfo.showExportModal = function(){
+TalentInfo.showExportModal = function () {
     $("#exportForm")[0].reset();
     $("#exportModal").modal("show");
 }
 //公示导出提交
-TalentInfo.export = function(){
+TalentInfo.export = function () {
     var names = '';
     var values = '';
-    $("#field_info li input").each(function(index){
-        if($(this).is(":checked")){
+    $("#field_info li input").each(function (index) {
+        if ($(this).is(":checked")) {
             values = values + $(this).val() + ",";
             names = names + $(this).next().text() + ",";
         }
@@ -181,63 +182,64 @@ TalentInfo.export = function(){
     var talentArrange = $("#talentArrange").val();
     var active = $("#active").val();
     $("#exportModal").modal('hide');
-    var url = Feng.ctxPath + "/talentInfoExport/libraryExport?name="+name+"&names="+names+"&values="+values
-        +"&sex="+sex+"&idCard="+idCard+"&nation="+nation+"&nationality="+nationality
-        +"&talentType="+talentType+"&talentArrange="+talentArrange+"&active="+active;
+    var url = Feng.ctxPath + "/talentInfoExport/libraryExport?name=" + name + "&names=" + names + "&values=" + values
+            + "&sex=" + sex + "&idCard=" + idCard + "&nation=" + nation + "&nationality=" + nationality
+            + "&talentType=" + talentType + "&talentArrange=" + talentArrange + "&active=" + active;
     window.location.href = encodeURI(encodeURI(url));
 }
 
-TalentInfo.editBasicInfo = function(){
-    if(this.check()){
+TalentInfo.editBasicInfo = function () {
+    if (this.check()) {
         layer.open({
             type: 1,
-            id:"neewFieldFormModel",
+            id: "neewFieldFormModel",
             title: '审核',
             area: ['800px', '450px'], //宽高
             fix: false, //不固定
-            shade:0,
+            shade: 0,
             maxmin: true,
-            content:'<form id="editBaiscInfo">' +
-                '           <div class="form-group" style="margin: 10px;">' +
-                '           <label for="checkMsgNotPass" class="control-label" >引进方式</label>' +
-                '           <select class="form-control" id="introduceMode"></select>' +
-                '           </div>' +
-                '           <div class="form-group" style="margin: 10px;">' +
-                '            <label for="checkMsgNotPass" class="control-label" >是否同步至津补贴申报</label>' +
-                '            <select class="form-control" id="isSync">' +
-                '                 <option value="2">否</option>                                 '+
-                '                 <option value="1">是</option>                                 '+
-                '            </select>' +
-                '          </div>' +
-                '            </form>',
-            btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交' ,'<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+            content: '<form id="editBaiscInfo">' +
+                    '           <div class="form-group" style="margin: 10px;">' +
+                    '           <label for="checkMsgNotPass" class="control-label" >引进方式</label>' +
+                    '           <select class="form-control" id="introduceMode"></select>' +
+                    '           </div>' +
+                    '           <div class="form-group" style="margin: 10px;">' +
+                    '            <label for="checkMsgNotPass" class="control-label" >是否同步至津补贴申报</label>' +
+                    '            <select class="form-control" id="isSync">' +
+                    '                 <option value="2">否</option>                                 ' +
+                    '                 <option value="1">是</option>                                 ' +
+                    '            </select>' +
+                    '          </div>' +
+                    '            </form>',
+            btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             btnAlign: 'c',
             zIndex: layer.zIndex,
-            success:function(layero, index){
-                var arr = [{"name":"introduceMode","code":"un_introduction_mode"}];
+            success: function (layero, index) {
+                var arr = [{"name": "introduceMode", "code": "un_introduction_mode"}];
                 Feng.findChildDictBatch(JSON.stringify(arr));
             },
             yes: function (index, layero) {
                 var introduceMode = $("#introduceMode").val();
                 var isSync = $("#isSync").val();
-                if(Feng.isEmptyStr(introduceMode)){
-                    Feng.info("请选择引进方式");return ;
+                if (Feng.isEmptyStr(introduceMode)) {
+                    Feng.info("请选择引进方式");
+                    return;
                 }
-                var operation = function(){
+                var operation = function () {
                     var ajax = new $ax(Feng.ctxPath + "/talentInfo/editBasicInfo", function (data) {
-                        if(data.code==200){
+                        if (data.code == 200) {
                             Feng.success(data.msg);
                             TalentInfo.table.refresh();
                             layer.close(index);
-                        }else{
+                        } else {
                             Feng.error(data.msg);
                         }
                     }, function (data) {
                         Feng.error("修改失败!" + data.responseJSON.message + "!");
                     });
-                    ajax.set("id",TalentInfo.seItem.id);
-                    ajax.set("introductionMode",introduceMode);
-                    ajax.set("isSync",isSync);
+                    ajax.set("id", TalentInfo.seItem.id);
+                    ajax.set("introductionMode", introduceMode);
+                    ajax.set("isSync", isSync);
                     ajax.start();
                 }
                 Feng.confirm("确认修改吗?", operation);
@@ -247,14 +249,14 @@ TalentInfo.editBasicInfo = function(){
 }
 
 //回调
-TalentInfo.callBack = function (data){
+TalentInfo.callBack = function (data) {
     Feng.info(data.msg);
 }
 
 /**
  * 查看首次申报基础信息
  */
-TalentInfo.selectFirstInfo = function(){
+TalentInfo.selectFirstInfo = function () {
     if (this.check()) {
         var index = layer.open({
             type: 2,
@@ -262,7 +264,7 @@ TalentInfo.selectFirstInfo = function(){
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentInfo/talentInfo_toCommonCheck/' + TalentInfo.seItem.id+'/6'
+            content: Feng.ctxPath + '/talentInfo/talentInfo_toCommonCheck/' + TalentInfo.seItem.id + '/6'
         });
         layer.full(index);
         TalentInfo.layerIndex = index;
@@ -273,33 +275,34 @@ TalentInfo.selectFirstInfo = function(){
 
 $(function () {
     var defaultColunms = TalentInfo.initColumn();
-    var table = new BSTable(TalentInfo.id, "/talentInfo/list/5", defaultColunms);
+    var process = $("#process").val();
+    var table = new BSTable(TalentInfo.id, "/admin/talent/base_verify_list/process/" + process, defaultColunms);
     table.setPaginationType("server");
     table.setOnDblClickRow(function () {
         TalentInfo.openTalentInfoDetail();
     });
-    table.setRowStyle(function (row,index) {
-        if(row.isEffect==1){
+    table.setRowStyle(function (row, index) {
+        if (row.isEffect == 1) {
             return {};
         }
-        if(row.isEffect==2){
-            return {classes:'warning'};
+        if (row.isEffect == 2) {
+            return {classes: 'warning'};
         }
-        if(row.isEffect==3){
-            return {classes:'danger'};
+        if (row.isEffect == 3) {
+            return {classes: 'danger'};
         }
-        if(row.isEffect == 4){
+        if (row.isEffect == 4) {
             return {classes: 'info'}
         }
     });
     var t = TalentInfo.table = table.init();
     TalentInfo.init();
     //批量加载时间控件
-    $(".time").each(function(){
+    $(".time").each(function () {
         laydate.render({
-            elem: "#"+$(this).attr("id")
-            ,type: "date"
-            ,trigger: 'click'
+            elem: "#" + $(this).attr("id")
+            , type: "date"
+            , trigger: 'click'
         });
     });
 });

+ 3 - 0
public/static/modular/talentIdentify/talentInfo/talentInfo_prepare.js

@@ -64,6 +64,9 @@ TalentInfo.initColumn = function () {
                     case 14:
                         return "<span class='label label-success'>待核查征信</span>";
                         break;
+                    case 16:
+                        return "<span class='label label-danger'>复审失败</span>";
+                        break;
                     case 21:
                         return "<span class='label label-success'>待公示</span>";
                         break;