完善管理端导出和搜索，及一些小问题修复

app/admin/controller/Talent.php

@@ -63,12 +63,13 @@ class Talent extends AdminController {
     }
 
     public function base_verify() {
-        return view();
+        $enterprises = EnterpriseApi::getSimpleList();
+        return view("", ["enterprises" => $enterprises]);
     }
 
     public function base_verify_list() {
-        $request = $this->request;
-        return json(VerifyApi::getList($request));
+        $params = $this->request->param();
+        return json(VerifyApi::getList($params));
     }
 
     /**
@@ -84,7 +85,8 @@ class Talent extends AdminController {
      * @auth {{/talentInfo/gotoIndex/1}}
      */
     public function fst_verify() {
-        return view();
+        $enterprises = EnterpriseApi::getSimpleList();
+        return view("", ["enterprises" => $enterprises]);
     }
 
     /**
@@ -116,7 +118,8 @@ class Talent extends AdminController {
      * @auth {{/talentInfo/gotoIndex/2}}
      */
     public function dept_verify() {
-        return view();
+        $enterprises = EnterpriseApi::getSimpleList();
+        return view("", ["enterprises" => $enterprises]);
     }
 
     /**
@@ -124,7 +127,8 @@ class Talent extends AdminController {
      * @auth {{/talentInfo/gotoIndex/3}}
      */
     public function re_verify() {
-        return view();
+        $enterprises = EnterpriseApi::getSimpleList();
+        return view("", ["enterprises" => $enterprises]);
     }
 
     /**
@@ -151,7 +155,8 @@ class Talent extends AdminController {
                 "phone" => "0595-82250007、0595-82250001", "email" => "jjjcdr@163.com"
             ];
         }
-        return view("", ["message" => $message]);
+        $enterprises = EnterpriseApi::getSimpleList();
+        return view("", ["message" => $message, "enterprises" => $enterprises]);
     }
 
     public function selectNeedCheckData() {
@@ -919,17 +924,17 @@ class Talent extends AdminController {
         }
 
         $smsapi = new ChuanglanSmsApi();
-        if($log['last_state'] == 1){ //TODO 审核结果判断待强哥修复
+        if ($log['last_state'] == 1) { //TODO 审核结果判断待强哥修复
             //基础信息审核通过，发送短信
             $template = "【晋江市人才服务平台】尊敬的用户，您提交的人才基础信息审核通过，请及时登录申报系统并进行人才认定的信息申报填写。";
-        }else{
+        } else {
             //基础信息审核通过，发送短信
             $template = "【晋江市人才服务平台】尊敬的用户，您提交的人才基础信息审核驳回，原因是：{$log['description']}，请及时登录申报系统修改并重新提交。";
         }
         $ep = EnterpriseApi::getOne($talent_info['enterprise_id']);
-        $result = $smsapi->sendSMS($ep->agentPhone,$template);
+        $result = $smsapi->sendSMS($ep->agentPhone, $template);
 
-        $result = json_decode($result,true);
+        $result = json_decode($result, true);
 
         $id = getStringId();
 
@@ -942,8 +947,8 @@ class Talent extends AdminController {
             'params' => '基础信息审核',
             'templateCode' => $template,
             'state' => $result['code'] == 0 ? 2 : 3,
-            'sendingDate' => date("Y-m-d H:i:s",time()),
-            'createTime' => date("Y-m-d H:i:s",time()),
+            'sendingDate' => date("Y-m-d H:i:s", time()),
+            'createTime' => date("Y-m-d H:i:s", time()),
             'msg' => $result['errorMsg']
         ];
 
@@ -1124,7 +1129,27 @@ class Talent extends AdminController {
         
     }
 
-    public function commonExport() {
+    public function baseVerifyListExport() {
+        $this->commonExport(1);
+    }
+
+    public function fstVerifyListExport() {
+        $this->commonExport(2);
+    }
+
+    public function deptVerifyListExport() {
+        $this->commonExport(3);
+    }
+
+    public function reVerifyListExport() {
+        $this->commonExport(4);
+    }
+
+    public function preListExport() {
+        $this->commonExport(5);
+    }
+
+    private function commonExport($process) {
         $params = $this->request->param();
         $fields = $params["export"];
         if (!$fields)
@@ -1135,7 +1160,8 @@ class Talent extends AdminController {
         $names["enterpriseTag"] = "单位标签";
         $names["street"] = "所属镇街";
         $names["checkState"] = "审核状态";
-        $list = VerifyApi::getExportDatas($fields);
+        $names["checkMsg"] = "审核意见";
+        $list = VerifyApi::getExportDatas($process, $fields);
         foreach ($fields as $field) {
             $columns[] = $names[$field];
         }
@@ -1151,7 +1177,7 @@ class Talent extends AdminController {
             export($columns, $datas);
             exit();
         }
-        echo "<script>parent.layer.alert('没有可以导出的数据');</script>";
+        echo "<script>parent.layer.alert('没有可以导出的数据');window.history.go(-1);</script>";
     }
 
     public function getPhones() {

app/admin/view/talent/base_verify.html

@@ -32,9 +32,7 @@
                             <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>
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">姓名</button>
                                     </div>
                                     <input type="text" class="form-control" id="name" placeholder="" />
                                 </div>
@@ -42,11 +40,10 @@
                             <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">证件号码
                                         </button>
                                     </div>
-                                    <input type="text" class="form-control" id="idCard" placeholder="" />
+                                    <input type="text" class="form-control" id="card_number" placeholder="" />
                                 </div>
                             </div>
                             <div class="col-sm-3">
@@ -94,7 +91,7 @@
                                             籍贯省
                                         </button>
                                     </div>
-                                    <select class="form-control" id="provinceCode">
+                                    <select class="form-control" id="province">
                                     </select>
                                 </div>
                             </div>
@@ -116,7 +113,10 @@
                                             单位名称
                                         </button>
                                     </div>
-                                    <select class="form-control" id="enterpriseId">
+                                    <select class="form-control" id="enterprise_id">
+                                        {volist name="enterprises" id="item"}
+                                        <option value="{$item.id}">{$item.name}</option>
+                                        {/volist}
                                     </select>
                                 </div>
                             </div>
@@ -124,10 +124,10 @@
                                 <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="industryField">
+                                    <select class="form-control" id="street">
                                     </select>
                                 </div>
                             </div>
@@ -135,28 +135,22 @@
                                 <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 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>
-                                    <input type="text" class="form-control" id="year" placeholder="">
-                                </div>                            </div>
-                            <div class="col-sm-3" style="display: none">
-                                <div class="input-group ">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">公布入选月份
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            人才类型
                                         </button>
                                     </div>
-                                    <input type="text"  class="form-control time" id="identifyMonth" name="identifyMonth"/>
+                                    <select class="form-control" id="talent_type">
+                                    </select>
                                 </div>
                             </div>
                         </div>
@@ -250,7 +244,12 @@
                                 <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="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">

app/admin/view/talent/dept_verify.html

@@ -46,7 +46,7 @@
                                                 type="button">证件号码
                                         </button>
                                     </div>
-                                    <input type="text" class="form-control" id="idCard" placeholder="" />
+                                    <input type="text" class="form-control" id="card_number" placeholder="" />
                                 </div>
                             </div>
                             <div class="col-sm-3">
@@ -74,6 +74,45 @@
                                     </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>
+                                    </select>
+                                </div>                            
+                            </div>
                         </div>
                         <div class="row highSearch" style="display: none">
                             <div class="col-sm-3">
@@ -94,7 +133,7 @@
                                             籍贯省
                                         </button>
                                     </div>
-                                    <select class="form-control" id="provinceCode">
+                                    <select class="form-control" id="province">
                                     </select>
                                 </div>
                             </div>
@@ -116,7 +155,21 @@
                                             单位名称
                                         </button>
                                     </div>
-                                    <select class="form-control" id="enterpriseId">
+                                    <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>
@@ -127,7 +180,7 @@
                                             产业领域
                                         </button>
                                     </div>
-                                    <select class="form-control" id="industryField">
+                                    <select class="form-control" id="industry_field">
                                     </select>
                                 </div>
                             </div>
@@ -135,28 +188,66 @@
                                 <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 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 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>
-                                    <input type="text" class="form-control" id="year" placeholder="">
-                                </div>                            </div>
-                            <div class="col-sm-3" style="display: none">
-                                <div class="input-group ">
+                                    <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            申报来源
                                         </button>
                                     </div>
-                                    <input type="text"  class="form-control time" id="identifyMonth" name="identifyMonth"/>
+                                    <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>
@@ -214,54 +305,58 @@
                     <div class="form-group" id="field">
                         <div id="field_info">
                             <ul>
-                                <li style="width:24%"><input type="checkbox" value="year"><span>申报年度</span></li>
-                                <li style="width:24%"><input type="checkbox" value="name"><span>姓名</span></li>
-                                <li style="width:24%"><input type="checkbox" value="sexName"><span>性别</span></li>
-                                <li style="width:24%"><input type="checkbox" value="birthday"><span>出生日期</span></li>
-                                <li style="width:24%"><input type="checkbox" value="nationalityName"><span>国籍/地区</span></li>
-                                <li style="width:24%"><input type="checkbox" value="provinceName"><span>籍贯省</span></li>
-                                <li style="width:24%"><input type="checkbox" value="cityName"><span>籍贯市</span></li>
-                                <li style="width:24%"><input type="checkbox" value="countyName"><span>籍贯县</span></li>
-                                <li style="width:24%"><input type="checkbox" value="nationName"><span>民族</span></li>
-                                <li style="width:24%"><input type="checkbox" value="politicsName"><span>政治面貌</span></li>
-                                <li style="width:24%"><input type="checkbox" value="cardTypeName"><span>证件类型</span></li>
-                                <li style="width:24%"><input type="checkbox" value="idCard"><span>证件号码</span></li>
-                                <li style="width:24%"><input type="checkbox" value="firstInJJTime"><span>首次来晋工作时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseName"><span>企业名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="industryFieldName"><span>产业领域</span></li>
-                                <li style="width:24%"><input type="checkbox" value="streetName"><span>所属镇街</span></li>
-                                <li style="width:24%"><input type="checkbox" value="sourceName"><span>申报来源</span></li>
-                                <li style="width:24%"><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:24%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyConditionText"><span>认定条件</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseTalentTypeName"><span>企业标签</span></li>
-                                <li style="width:24%"><input type="checkbox" value="letterTime"><span>首次来晋行政介绍信时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="introductionModeName"><span>引进方式</span></li>
-                                <li style="width:24%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>
-                                <li style="width:24%"><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:24%"><input type="checkbox" value="graduateSchool"><span>毕业院校)</span></li>
-                                <li style="width:24%"><input type="checkbox" value="major"><span>专业</span></li>
-                                <li style="width:24%"><input type="checkbox" value="title"><span>职称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>是否有留学经历</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>留学毕业院校</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>留学专业</span></li>
-                                <li style="width:24%"><input type="checkbox" value="phone"><span>手机号码</span></li>
-                                <li style="width:24%"><input type="checkbox" value="email"><span>电子邮箱</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bank"><span>开户银行</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="certificateNO"><span>人才编号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="firstSubmitTime"><span>首次确认提交时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="newSubmitTime"><span>最新确认提交时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="checkStateName"><span>审核状态</span></li>
-                                <li style="width:24%"><input type="checkbox" value="checkMsg"><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="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">

app/admin/view/talent/fst_verify.html

@@ -46,7 +46,7 @@
                                                 type="button">证件号码
                                         </button>
                                     </div>
-                                    <input type="text" class="form-control" id="idCard" placeholder="" />
+                                    <input type="text" class="form-control" id="card_number" placeholder="" />
                                 </div>
                             </div>
                             <div class="col-sm-3">
@@ -74,6 +74,46 @@
                                     </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="2">审核驳回</option>
+                                    </select>
+                                </div>                            
+                            </div>
                         </div>
                         <div class="row highSearch" style="display: none">
                             <div class="col-sm-3">
@@ -94,7 +134,7 @@
                                             籍贯省
                                         </button>
                                     </div>
-                                    <select class="form-control" id="provinceCode">
+                                    <select class="form-control" id="province">
                                     </select>
                                 </div>
                             </div>
@@ -116,7 +156,21 @@
                                             单位名称
                                         </button>
                                     </div>
-                                    <select class="form-control" id="enterpriseId">
+                                    <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>
@@ -127,7 +181,7 @@
                                             产业领域
                                         </button>
                                     </div>
-                                    <select class="form-control" id="industryField">
+                                    <select class="form-control" id="industry_field">
                                     </select>
                                 </div>
                             </div>
@@ -135,28 +189,66 @@
                                 <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 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 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>
-                                    <input type="text" class="form-control" id="year" placeholder="">
-                                </div>                            </div>
-                            <div class="col-sm-3" style="display: none">
-                                <div class="input-group ">
+                                    <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            申报来源
                                         </button>
                                     </div>
-                                    <input type="text"  class="form-control time" id="identifyMonth" name="identifyMonth"/>
+                                    <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>
@@ -234,54 +326,58 @@
                     <div class="form-group" id="field">
                         <div id="field_info">
                             <ul>
-                                <li style="width:24%"><input type="checkbox" value="year"><span>申报年度</span></li>
-                                <li style="width:24%"><input type="checkbox" value="name"><span>姓名</span></li>
-                                <li style="width:24%"><input type="checkbox" value="sexName"><span>性别</span></li>
-                                <li style="width:24%"><input type="checkbox" value="birthday"><span>出生日期</span></li>
-                                <li style="width:24%"><input type="checkbox" value="nationalityName"><span>国籍/地区</span></li>
-                                <li style="width:24%"><input type="checkbox" value="provinceName"><span>籍贯省</span></li>
-                                <li style="width:24%"><input type="checkbox" value="cityName"><span>籍贯市</span></li>
-                                <li style="width:24%"><input type="checkbox" value="countyName"><span>籍贯县</span></li>
-                                <li style="width:24%"><input type="checkbox" value="nationName"><span>民族</span></li>
-                                <li style="width:24%"><input type="checkbox" value="politicsName"><span>政治面貌</span></li>
-                                <li style="width:24%"><input type="checkbox" value="cardTypeName"><span>证件类型</span></li>
-                                <li style="width:24%"><input type="checkbox" value="idCard"><span>证件号码</span></li>
-                                <li style="width:24%"><input type="checkbox" value="firstInJJTime"><span>首次来晋工作时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseName"><span>企业名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="industryFieldName"><span>产业领域</span></li>
-                                <li style="width:24%"><input type="checkbox" value="streetName"><span>所属镇街</span></li>
-                                <li style="width:24%"><input type="checkbox" value="sourceName"><span>申报来源</span></li>
-                                <li style="width:24%"><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:24%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyConditionText"><span>认定条件</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseTalentTypeName"><span>企业标签</span></li>
-                                <li style="width:24%"><input type="checkbox" value="letterTime"><span>首次来晋行政介绍信时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="introductionModeName"><span>引进方式</span></li>
-                                <li style="width:24%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>
-                                <li style="width:24%"><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:24%"><input type="checkbox" value="graduateSchool"><span>毕业院校)</span></li>
-                                <li style="width:24%"><input type="checkbox" value="major"><span>专业</span></li>
-                                <li style="width:24%"><input type="checkbox" value="title"><span>职称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>是否有留学经历</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>留学毕业院校</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>留学专业</span></li>
-                                <li style="width:24%"><input type="checkbox" value="phone"><span>手机号码</span></li>
-                                <li style="width:24%"><input type="checkbox" value="email"><span>电子邮箱</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bank"><span>开户银行</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="certificateNO"><span>人才编号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="firstSubmitTime"><span>首次确认提交时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="newSubmitTime"><span>最新确认提交时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="checkStateName"><span>审核状态</span></li>
-                                <li style="width:24%"><input type="checkbox" value="checkMsg"><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="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">

app/admin/view/talent/pre_list.html

@@ -19,12 +19,14 @@
     <div class="col-sm-12">
         <div class="ibox float-e-margins">
             <div class="ibox-title">
-                <h5>人才认定申报</h5>
+                <h5>预备人才库</h5>
             </div>
             <div class="ibox-content">
                 <div class="row row-lg">
                     <div class="col-sm-12">
                         <input type="hidden" id="usertype" value="${user.type}">
+                        <input type="hidden" id="process" value="5">
+                        <input type="hidden" id="title" value="预备人才库">
                         <div class="row">
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">
@@ -39,7 +41,8 @@
                             <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">证件号码
                                         </button>
                                     </div>
                                     <input type="text" class="form-control" id="card_number" placeholder="" />
@@ -70,62 +73,64 @@
                                     </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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">申报年度
                                         </button>
                                     </div>
-                                    <select class="form-control" id="nationality">
-                                    </select>
-                                </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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">手机
                                         </button>
                                     </div>
-                                    <select class="form-control" id="province">
-                                        <option value="">请选择</option>
-                                    </select>
-                                </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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">电子邮箱
                                         </button>
                                     </div>
-                                    <select class="form-control" id="politics">
-                                    </select>
-                                </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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">审核状态
                                         </button>
                                     </div>
-                                    <select class="form-control" id="enterprise_id">
-                                        <option value="">请选择</option>
+                                    <select class="form-control" id="checkState">
+                                        <option value="">---请选择---</option>
+                                        <option value="11">待核查征信</option>
+                                        <option value="21">待公示</option>
+                                        <option value="23">公示中</option>
+                                        <option value="24">待公布</option>
+                                        <option value="26">待发证</option>
+                                        <option value="28">已发证</option>
+                                        <option value="13">复核不通过</option>
+                                        <option value="22">征信不通过</option>
+                                        <option value="25">公示审核不通过</option>
+                                        <option value="27">公布不通过</option>
                                     </select>
-                                </div>
+                                </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="industry_field">
+                                    <select class="form-control" id="nationality">
                                     </select>
                                 </div>
                             </div>
@@ -133,67 +138,35 @@
                                 <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 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>
-                                    <input type="text" class="form-control" id="major" 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="professional" 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="study_abroad">
-                                        <option value="">请选择</option>
-                                        <option value="2">否</option>
-                                        <option value="1">是</option>
+                                    <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>
-                                    <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="talent_type">
+                                    <select class="form-control" id="enterprise_id">
+                                        {volist name="enterprises" id="item"}
+                                        <option value="{$item.id}">{$item.name}</option>
+                                        {/volist}
                                     </select>
                                 </div>
                             </div>
@@ -201,10 +174,10 @@
                                 <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 class="form-control" id="street">
                                     </select>
                                 </div>
                             </div>
@@ -212,10 +185,10 @@
                                 <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">
+                                    <select class="form-control" id="industry_field">
                                     </select>
                                 </div>
                             </div>
@@ -223,102 +196,68 @@
                                 <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="address">
+                                    <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">引进方式
                                         </button>
                                     </div>
-                                    <select class="form-control" id="active">
-                                        <option value="">请选择</option>
-                                        <option value="1">在职</option>
-                                        <option value="2">离职</option>
+                                    <select class="form-control" id="import_way">
                                     </select>
-                                </div>
+                                </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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">最高学历
                                         </button>
                                     </div>
-                                    <select class="form-control" id="checkState">
+                                    <select class="form-control" id="highest_degree">
                                     </select>
-                                </div>
+                                </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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">是否有留学经历
                                         </button>
                                     </div>
-                                    <select class="form-control" id="isPublic">
-                                        <option value="">请选择</option>
-                                        <option value="1">待核查征信</option>
-                                        <option value="2">待公示</option>
-                                        <option value="3">公示中</option>
-                                        <option value="4">待公布</option>
-                                        <option value="5">待发证</option>
-                                        <option value="6">已发证</option>
+                                    <select class="form-control" id="study_abroad">
+                                        <option value="">---请选择---</option>
+                                        <option value="1">是</option>
+                                        <option value="2">否</option>
                                     </select>
-                                </div>
+                                </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="breakFaith">
-                                        <option value="">请选择</option>
-                                        <option value="2">否</option>
-                                        <option value="1">是</option>
+                                    <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>
-                                    <input type="text" class="form-control" id="apply_year" placeholder="" />
-                                </div>
-                            </div>
-                            <div class="col-sm-3" style="display: none">
                                 <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="isEffect">
-                                        <option value="">请选择</option>
-                                        <option value="1">有效</option>
-                                        <option value="3">人才证书过期</option>
-                                        <option value="4">已取消</option>
+                                    <select class="form-control" id="talent_arrange">
                                     </select>
                                 </div>
                             </div>
-                            <div class="col-sm-3" style="display: none">
-                                <div class="input-group ">
-                                    <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 time" id="identifyMonth" name="identifyMonth"/>
-                                </div>
-                            </div>
                         </div>
                         <div class="row">
                             <div class="col-sm-12" style="text-align: center">
@@ -655,61 +594,58 @@
                     <div class="form-group" id="field">
                         <div id="field_info">
                             <ul>
-                                <li style="width:24%"><input type="checkbox" value="year"><span>申报年度</span></li>
-                                <li style="width:24%"><input type="checkbox" value="name"><span>姓名</span></li>
-                                <li style="width:24%"><input type="checkbox" value="sexName"><span>性别</span></li>
-                                <li style="width:24%"><input type="checkbox" value="birthday"><span>出生日期</span></li>
-                                <li style="width:24%"><input type="checkbox" value="nationalityName"><span>国籍/地区</span></li>
-                                <li style="width:24%"><input type="checkbox" value="provinceName"><span>籍贯省</span></li>
-                                <li style="width:24%"><input type="checkbox" value="cityName"><span>籍贯市</span></li>
-                                <li style="width:24%"><input type="checkbox" value="countyName"><span>籍贯县</span></li>
-                                <li style="width:24%"><input type="checkbox" value="nationName"><span>民族</span></li>
-                                <li style="width:24%"><input type="checkbox" value="politicsName"><span>政治面貌</span></li>
-                                <li style="width:24%"><input type="checkbox" value="cardTypeName"><span>证件类型</span></li>
-                                <li style="width:24%"><input type="checkbox" value="idCard"><span>证件号码</span></li>
-                                <li style="width:24%"><input type="checkbox" value="firstInJJTime"><span>首次来晋工作时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseName"><span>企业名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="industryFieldName"><span>行业领域</span></li>
-                                <li style="width:24%"><input type="checkbox" value="streetName"><span>所属镇街</span></li>
-                                <li style="width:24%"><input type="checkbox" value="sourceName"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" value="ourCitySourceName"><span>公布入选来源</span></li>
-                                <li style="width:24%"><input type="checkbox" value="fromCityName"><span>入选来源县市</span></li>
-                                <li style="width:24%"><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:24%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyConditionText"><span>认定条件</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseTalentTypeName"><span>企业标签</span></li>
-                                <li style="width:24%"><input type="checkbox" value="talentTypeName"><span>人才标签</span></li>
-                                <li style="width:24%"><input type="checkbox" value="letterTime"><span>首次来晋行政介绍信时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="introductionModeName"><span>引进方式</span></li>
-                                <li style="width:24%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>
-                                <li style="width:24%"><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:24%"><input type="checkbox" value="lastYearWages"><span>上一年度年薪(元)</span></li>
-                                <li style="width:12%"><input type="checkbox" value="educationName"><span>最高学历</span></li>
-                                <li style="width:24%"><input type="checkbox" value="graduateSchool"><span>毕业院校)</span></li>
-                                <li style="width:24%"><input type="checkbox" value="major"><span>专业</span></li>
-                                <li style="width:24%"><input type="checkbox" value="title"><span>职称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>是否有留学经历</span></li>
-                                <li style="width:24%"><input type="checkbox" value="phone"><span>手机号码</span></li>
-                                <li style="width:24%"><input type="checkbox" value="email"><span>电子邮箱</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bank"><span>开户银行</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="breakFaithName"><span>曾被相关主管部门列为失信个人</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyMonth"><span>公布入选月份</span></li>
-                                <li style="width:24%"><input type="checkbox" value="certificateNO"><span>人才编号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="firstSubmitTime"><span>首次确认提交时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="newSubmitTime"><span>最新确认提交时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="checkStateName"><span>审核状态</span></li>
-                                <li style="width:24%"><input type="checkbox" value="isPublicName"><span>公示状态</span></li>
-                                <li style="width:24%"><input type="checkbox" value="checkMsg"><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="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">

app/admin/view/talent/re_verify.html

@@ -46,7 +46,7 @@
                                                 type="button">证件号码
                                         </button>
                                     </div>
-                                    <input type="text" class="form-control" id="idCard" placeholder="" />
+                                    <input type="text" class="form-control" id="card_number" placeholder="" />
                                 </div>
                             </div>
                             <div class="col-sm-3">
@@ -74,6 +74,46 @@
                                     </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="-1">审核不通过</option>
+                                    </select>
+                                </div>                            
+                            </div>
                         </div>
                         <div class="row highSearch" style="display: none">
                             <div class="col-sm-3">
@@ -94,7 +134,7 @@
                                             籍贯省
                                         </button>
                                     </div>
-                                    <select class="form-control" id="provinceCode">
+                                    <select class="form-control" id="province">
                                     </select>
                                 </div>
                             </div>
@@ -116,7 +156,21 @@
                                             单位名称
                                         </button>
                                     </div>
-                                    <select class="form-control" id="enterpriseId">
+                                    <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>
@@ -127,7 +181,7 @@
                                             产业领域
                                         </button>
                                     </div>
-                                    <select class="form-control" id="industryField">
+                                    <select class="form-control" id="industry_field">
                                     </select>
                                 </div>
                             </div>
@@ -135,28 +189,66 @@
                                 <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 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 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>
-                                    <input type="text" class="form-control" id="year" placeholder="">
-                                </div>                            </div>
-                            <div class="col-sm-3" style="display: none">
-                                <div class="input-group ">
+                                    <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            申报来源
                                         </button>
                                     </div>
-                                    <input type="text"  class="form-control time" id="identifyMonth" name="identifyMonth"/>
+                                    <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>
@@ -219,54 +311,58 @@
                     <div class="form-group" id="field">
                         <div id="field_info">
                             <ul>
-                                <li style="width:24%"><input type="checkbox" value="year"><span>申报年度</span></li>
-                                <li style="width:24%"><input type="checkbox" value="name"><span>姓名</span></li>
-                                <li style="width:24%"><input type="checkbox" value="sexName"><span>性别</span></li>
-                                <li style="width:24%"><input type="checkbox" value="birthday"><span>出生日期</span></li>
-                                <li style="width:24%"><input type="checkbox" value="nationalityName"><span>国籍/地区</span></li>
-                                <li style="width:24%"><input type="checkbox" value="provinceName"><span>籍贯省</span></li>
-                                <li style="width:24%"><input type="checkbox" value="cityName"><span>籍贯市</span></li>
-                                <li style="width:24%"><input type="checkbox" value="countyName"><span>籍贯县</span></li>
-                                <li style="width:24%"><input type="checkbox" value="nationName"><span>民族</span></li>
-                                <li style="width:24%"><input type="checkbox" value="politicsName"><span>政治面貌</span></li>
-                                <li style="width:24%"><input type="checkbox" value="cardTypeName"><span>证件类型</span></li>
-                                <li style="width:24%"><input type="checkbox" value="idCard"><span>证件号码</span></li>
-                                <li style="width:24%"><input type="checkbox" value="firstInJJTime"><span>首次来晋工作时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseName"><span>企业名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="industryFieldName"><span>产业领域</span></li>
-                                <li style="width:24%"><input type="checkbox" value="streetName"><span>所属镇街</span></li>
-                                <li style="width:24%"><input type="checkbox" value="sourceName"><span>申报来源</span></li>
-                                <li style="width:24%"><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:24%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyConditionText"><span>认定条件</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseTalentTypeName"><span>企业标签</span></li>
-                                <li style="width:24%"><input type="checkbox" value="letterTime"><span>首次来晋行政介绍信时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="introductionModeName"><span>引进方式</span></li>
-                                <li style="width:24%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>
-                                <li style="width:24%"><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:24%"><input type="checkbox" value="graduateSchool"><span>毕业院校)</span></li>
-                                <li style="width:24%"><input type="checkbox" value="major"><span>专业</span></li>
-                                <li style="width:24%"><input type="checkbox" value="title"><span>职称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>是否有留学经历</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>留学毕业院校</span></li>
-                                <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>留学专业</span></li>
-                                <li style="width:24%"><input type="checkbox" value="phone"><span>手机号码</span></li>
-                                <li style="width:24%"><input type="checkbox" value="email"><span>电子邮箱</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bank"><span>开户银行</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="certificateNO"><span>人才编号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="firstSubmitTime"><span>首次确认提交时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="newSubmitTime"><span>最新确认提交时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="checkStateName"><span>审核状态</span></li>
-                                <li style="width:24%"><input type="checkbox" value="checkMsg"><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="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">

app/common/api/DictApi.php

@@ -161,6 +161,7 @@ class DictApi {
         ];
         $dict2 = [
             "talent_arrange" => "人才层次",
+            "talent_arrange_category" => "人才条款",
             "talent_condition" => "认定条件",
             "highest_degree" => "最高学历",
             "graduate_school" => "毕业院校",

app/common/api/EnterpriseApi.php

@@ -10,23 +10,28 @@ use app\admin\model\Enterprise;
 
 class EnterpriseApi {
 
-    public static function getOne($id){
+    public static function getOne($id) {
         return Enterprise::findOrEmpty($id);
     }
 
+    public static function getSimpleList() {
+        $where[] = ["active", "=", 1];
+        return $list = Enterprise::where($where)->order("name", 'asc')->field("name,id")->select()->toArray();
+    }
+
     public static function getList($request) {
         $companyId = session('user')['companyId'];
         $company_info = CompanyApi::getOne($companyId);
         $where = [];
-        if($company_info['code'] != 'super'){
-            $where[] = ['type','=',session('user')['type']];
-            if(session('user')['type'] == 1){
-                $list = Db::table('sys_enterprisetype_properties')->where('companyIds','like',"%{$companyId}%")->select()->toArray();
+        if ($company_info['code'] != 'super') {
+            $where[] = ['type', '=', session('user')['type']];
+            if (session('user')['type'] == 1) {
+                $list = Db::table('sys_enterprisetype_properties')->where('companyIds', 'like', "%{$companyId}%")->select()->toArray();
                 $talentType = [];
-                foreach ($list as $k => $v){
-                    array_push($talentType,$v['talentType']);
+                foreach ($list as $k => $v) {
+                    array_push($talentType, $v['talentType']);
                 }
-                $where[] = ['enterpriseTag','in',$talentType];
+                $where[] = ['enterpriseTag', 'in', $talentType];
             }
         }
 
@@ -80,19 +85,19 @@ class EnterpriseApi {
         }
 
         $count = Enterprise::where($where)->count();
-        if($count > 0){
+        if ($count > 0) {
             $talentTypeList = DictApi::selectByParentCode("enterprise_tag");
             $industryFieldNewList = DictApi::selectByParentCode("industry_field");
             $streetList = DictApi::selectByParentCode("street");
             //dd($talentTypeList);
             $list = Enterprise::where($where)->limit($offset, $limit)->order("createTime", 'desc')->select()->toArray();
-            foreach ($list as $k => &$v){
+            foreach ($list as $k => &$v) {
                 unset($v['password']);
-                $v['enterpriseTagName'] = $talentTypeList[$v['enterpriseTag']];//此处旧字段为talentType,新字段为enterpriseTag，为防止数据污染与丢失，因而这样写
+                $v['enterpriseTagName'] = $talentTypeList[$v['enterpriseTag']]; //此处旧字段为talentType,新字段为enterpriseTag，为防止数据污染与丢失，因而这样写
                 $v['industryFieldNewName'] = $industryFieldNewList[$v['industryFieldNew']];
                 $v['streetName'] = $streetList[$v['street']];
             }
-        }else{
+        } else {
             $list = [];
         }
         return ["total" => $count, "rows" => $list];
@@ -102,15 +107,15 @@ class EnterpriseApi {
         $companyId = session('user')['companyId'];
         $company_info = CompanyApi::getOne($companyId);
         $where = [];
-        if($company_info['code'] != 'super'){
-            $where[] = ['type','=',session('user')['type']];
-            if(session('user')['type'] == 1){
-                $list = Db::table('sys_enterprisetype_properties')->where('companyIds','like',$companyId)->select()->toArray();
+        if ($company_info['code'] != 'super') {
+            $where[] = ['type', '=', session('user')['type']];
+            if (session('user')['type'] == 1) {
+                $list = Db::table('sys_enterprisetype_properties')->where('companyIds', 'like', $companyId)->select()->toArray();
                 $talentType = [];
-                foreach ($list as $k => $v){
-                    array_push($talentType,$v['talentType']);
+                foreach ($list as $k => $v) {
+                    array_push($talentType, $v['talentType']);
                 }
-                $where[] = ['newEnterpriseTag','in',$talentType];
+                $where[] = ['newEnterpriseTag', 'in', $talentType];
             }
         }
 
@@ -172,32 +177,31 @@ class EnterpriseApi {
         }
 
         $count = EnterpriseRecord::where($where)->count();
-        if($count > 0){
+        if ($count > 0) {
             $talentTypeList = DictApi::selectByParentCode("enterprise_tag");
             $industryFieldNewList = DictApi::selectByParentCode("industry_field");
             $streetList = DictApi::selectByParentCode("street");
             $list = EnterpriseRecord::where($where)->limit($offset, $limit)->order("createTime", 'desc')->select()->toArray();
-            foreach ($list as $k => &$v){
+            foreach ($list as $k => &$v) {
                 $v['oldStreetName'] = $streetList[$v['oldStreet']];
                 $v['newStreetName'] = $streetList[$v['newStreet']];
                 $v['oldEnterpriseTagName'] = $talentTypeList[$v['oldEnterpriseTag']];
-                $v['newEnterpriseTagName'] = $talentTypeList[$v['newEnterpriseTag']];//此处旧字段为talentType,新字段为enterpriseTag，为防止数据污染与丢失，因而这样写
+                $v['newEnterpriseTagName'] = $talentTypeList[$v['newEnterpriseTag']]; //此处旧字段为talentType,新字段为enterpriseTag，为防止数据污染与丢失，因而这样写
                 $v['oldIndustryFieldNewName'] = $industryFieldNewList[$v['oldIndustryFieldNew']];
                 $v['newIndustryFieldNewName'] = $industryFieldNewList[$v['newIndustryFieldNew']];
             }
-        }else{
+        } else {
             $list = [];
         }
         return ["total" => $count, "rows" => $list];
     }
 
-    public static function updateById($data){
+    public static function updateById($data) {
         return Enterprise::update($data);
     }
 
-    public static function getOneRecord($id){
+    public static function getOneRecord($id) {
         return EnterpriseRecord::findOrEmpty($id);
     }
 
-
-}
+}

app/common/api/TalentState.php

@@ -43,6 +43,57 @@ class TalentState {
     public const RCRD_BASEIC_FROZEN = 10;
     public const RCRD_BASEIC_CANCLE = 11;
 
+    public static function getStateName($state) {
+        switch ($state) {
+            case 1:
+                return "保存未提交";
+            case 2:
+                return "待基础审核";
+            case 3:
+                return "基础审核通过";
+            case 4:
+                return "基础审核驳回";
+            case 5:
+                return "保存未提交";
+            case 6:
+                return "待初审";
+            case 7:
+                return "初审通过";
+            case 8:
+                return "初审驳回";
+            case 9:
+                return "部门并审通过";
+            case 10:
+                return "部门并审驳回";
+            case 11:
+                return "复核成功";
+            case 12:
+                return "复核驳回";
+            case 13:
+                return "复核不通过";
+            case -1:
+                return "基础审核不通过";
+            case -2:
+                return "初审不通过";
+            case 21:
+                return "待公示";
+            case 22:
+                return "征信不通过";
+            case 23:
+                return "已公示";
+            case 24:
+                return "待公布";
+            case 25:
+                return "公示审核不通过";
+            case 26:
+                return "公布通过";
+            case 27:
+                return "公布不通过";
+            case 28:
+                return "已发证";
+        }
+    }
+
     public static function stateEnum($code) {
         switch ($code) {
             case -2:

app/common/api/VerifyApi.php

@@ -89,14 +89,10 @@ class VerifyApi {
         return Talent::findOrEmpty($id);
     }
 
-    public static function getDeptList($request) {
-        $where = [];
-        $order = trim($request->param("order")) ?: "desc";
-        $offset = trim($request->param("offset")) ?: 0;
-        $limit = trim($request->param("limit")) ?: 10;
-
-        $where[] = ["ti.checkState", "=", 7];
-        $where[] = ["ti.pass_dept_check", "=", 0];
+    public static function getDeptList($params, $where = []) {
+        $order = $params["order"] ?: "desc";
+        $offset = $params["offset"] ?: 0;
+        $limit = $params["limit"] ?: 10;
 
         $companyId = session("user")["companyId"];
         $enterprise_tag_kvs = DictApi::selectByParentCode("enterprise_tag");
@@ -173,29 +169,106 @@ class VerifyApi {
         return Talent::where($where)->select()->toArray();
     }
 
-    public static function getList($request) {
+    public static function getList($params) {
         $where = [];
-        $order = trim($request->param("order")) ?: "desc";
-        $offset = trim($request->param("offset")) ?: 0;
-        $limit = trim($request->param("limit")) ?: 10;
+        $order = $params["order"] ?: "desc";
+        $offset = $params["offset"] ?: 0;
+        $limit = $params["limit"] ?: 10;
+        unset($params["order"]);
+        unset($params["limit"]);
+        unset($params["offset"]);
+        if ($params["name"]) {
+            $where[] = ["ti.name", "like", "%{$params["name"]}%"];
+        }
+        if ($params["card_number"]) {
+            $where[] = ["ti.card_number", "like", "%" . $params["card_number"] . "%"];
+        }
+        if ($params["sex"]) {
+            $where[] = ["ti.sex", "=", $params["sex"]];
+        }
+        if ($params["nation"]) {
+            $where[] = ["ti.nation", "=", $params["nation"]];
+        }
+        if ($params["apply_year"]) {
+            $where[] = ["ti.apply_year", "like", "{$params["apply_year"]}%"];
+        }
+        if ($params["phone"]) {
+            $where[] = ["ti.phone", "like", "%{$params["phone"]}%"];
+        }
+        if ($params["email"]) {
+            $where[] = ["ti.email", "like", "%{$params["email"]}%"];
+        }
+        if ($params["nationality"]) {
+            $where[] = ["ti.nationality", "=", $params["nationality"]];
+        }
+        if ($params["province"]) {
+            $where[] = ["ti.province", "=", $params["province"]];
+        }
+        if ($params["politics"]) {
+            $where[] = ["ti.politics", "=", $params["politics"]];
+        }
+        if ($params["enterprise_id"]) {
+            $where[] = ["ti.enterprise_id", "=", $params["enterprise_id"]];
+        }
+        if ($params["street"]) {
+            $where[] = ["e.street", "=", $params["street"]];
+        }
+        if ($params["industry_field"]) {
+            $where[] = ["e.industryFieldNew", "=", $params["industry_field"]];
+        }
+        if ($params["talent_type"]) {
+            $where[] = ["ti.talent_type", "=", $params["talent_type"]];
+        }
+        if ($params["import_way"]) {
+            $where[] = ["ti.import_way", "=", $params["import_way"]];
+        }
+        if ($params["highest_degree"]) {
+            $where[] = ["ti.highest_degree", "=", $params["highest_degree"]];
+        }
+        if ($params["study_abroad"]) {
+            $where[] = ["ti.study_abroad", "=", $params["study_abroad"]];
+        }
+        if ($params["source"]) {
+            $where[] = ["ti.source", "=", $params["source"]];
+        }
+        if ($params["talent_arrange"]) {
+            $where[] = ["ti.talent_arrange", "=", $params["talent_arrange"]];
+        }
 
-        $process = $request->param("process");
+        $process = $params["process"];
         if ($process == 3) {
-            return self::getDeptList($request);
+            switch ($params["checkState"]) {
+                default:
+                    $where[] = ["ti.checkState", "=", 7];
+                    $where[] = ["ti.pass_dept_check", "=", 0];
+                    break;
+            }
+            return self::getDeptList($params, $where);
         }
         if ($process == 4) {
-            $where = sprintf("(ti.checkState in (11,12,13)) or (ti.checkState=9 and ti.pass_dept_check=0) or (ti.checkState=7 and ti.pass_dept_check=1) or (ti.checkState=7 and (tc.companyIds is null or tc.companyIds = ''))");
+            $whereRaw = sprintf("(ti.checkState in (11,12,13)) or (ti.checkState=9 and ti.pass_dept_check=0) or (ti.checkState=7 and ti.pass_dept_check=1) or (ti.checkState=7 and (tc.companyIds is null or tc.companyIds = ''))");
+            switch ($params["checkState"]) {
+                case 1:
+                    $where[] = ["ti.checkState", "in", [7, 9]];
+                    break;
+                case -1:
+                    $where[] = ["ti.checkState", "=", 13];
+                    break;
+            }
             $count = Talent::alias("ti")
                             ->leftJoin("new_enterprise e", "e.id=ti.enterprise_id")
                             ->leftJoin("new_talent_condition tc", "tc.id=ti.talent_condition")
-                            ->whereRaw($where)->count();
+                            ->leftJoin("new_talent_checklog tl", "tl.mainId=ti.id and tl.id=(select id from new_talent_checklog where mainId=ti.id and `step` is null and active=1 and typeFileId is null order by createTime desc limit 1)")
+                            ->whereRaw($whereRaw)->where($where)->count();
             $list = Talent::alias("ti")
                             ->leftJoin("new_enterprise e", "e.id=ti.enterprise_id")
                             ->leftJoin("new_talent_condition tc", "tc.id=ti.talent_condition")
-                            ->whereRaw($where)
+                            ->leftJoin("new_talent_checklog tl", "tl.mainId=ti.id and tl.id=(select id from new_talent_checklog where mainId=ti.id and `step` is null and active=1 and typeFileId is null order by createTime desc limit 1)")
+                            ->whereRaw($whereRaw)
+                            ->where($where)
                             ->limit($offset, $limit)
                             ->order("ti.createTime " . $order)
-                            ->field("ti.*,e.name as enterprise_name,e.type as enterprise_type,enterpriseTag")
+                            ->field("ti.*,tl.last_state as 'lastState',tl.state as 'realState',e.name as enterprise_name,e.type as enterprise_type,enterpriseTag")
                             ->select()->toArray();
         } else {
             switch ($process) {
@@ -203,15 +276,33 @@ class VerifyApi {
                     $where[] = ["ti.checkState", "in", [2, -1]];
                     break;
                 case 2:
-                    $where[] = ["ti.checkState", "in", [6, -2]];
+                    switch ($params["checkState"]) {
+                        case 1://待审核
+                            $where[] = ["ti.checkState", "=", 6];
+                            $where[] = ["tl.state", "=", 6];
+                            break;
+                        case 2://驳回
+                            $where[] = ["ti.checkState", "=", 6];
+                            $where[] = ["tl.state", "in", [10, 12]];
+                            break;
+                        default:
+                            $where[] = ["ti.checkState", "in", [6, -2]];
+                    }
                     break;
                 case 5:
-                    $where[] = ["ti.checkState", ">=", 11];
+                    if ($params["checkState"]) {
+                        $where[] = ["ti.checkState", "=", $params["checkState"]];
+                    }
                     break;
             }
-            $count = Talent::alias("ti")->leftJoin("new_enterprise e", "e.id=ti.enterprise_id")->where($where)->count();
-            $list = Talent::alias("ti")->leftJoin("new_enterprise e", "e.id=ti.enterprise_id")
-                            ->where($where)->limit($offset, $limit)->order("ti.createTime " . $order)->field("ti.*,e.name as enterprise_name,e.type as enterprise_type,enterpriseTag")->select()->toArray();
+            $count = Talent::alias("ti")
+                            ->leftJoin("new_enterprise e", "e.id=ti.enterprise_id")
+                            ->leftJoin("new_talent_checklog tl", "tl.mainId=ti.id and tl.id=(select id from new_talent_checklog where mainId=ti.id and `step` is null and active=1 and typeFileId is null order by createTime desc limit 1)")
+                            ->where($where)->count();
+            $list = Talent::alias("ti")
+                            ->leftJoin("new_enterprise e", "e.id=ti.enterprise_id")
+                            ->leftJoin("new_talent_checklog tl", "tl.mainId=ti.id and tl.id=(select id from new_talent_checklog where mainId=ti.id and `step` is null and active=1 and typeFileId is null order by createTime desc limit 1)")
+                            ->where($where)->limit($offset, $limit)->order("ti.createTime " . $order)->field("ti.*,tl.last_state as 'lastState',tl.state as 'realState',e.name as enterprise_name,e.type as enterprise_type,enterpriseTag")->select()->toArray();
         }
         $talent_arrange_kvs = DictApi::selectByParentCode("talent_arrange");
         $enterprise_tag_kvs = DictApi::selectByParentCode("enterprise_tag");
@@ -220,19 +311,19 @@ class VerifyApi {
             $item["enterprise_tag"] = $enterprise_tag_kvs[$item["enterpriseTag"]];
             $item["talentArrangeName"] = $talent_arrange_kvs[$item["talent_arrange"]];
             $item["talentConditionName"] = TalentCondition::findOrEmpty($item["talent_condition"])["name"];
-            $last_log = TalentLogApi::getLastLog($item["id"], 1, 0, ["step", "=", null]);
-            $item["lastState"] = $last_log["last_state"];
-            $item["realState"] = $last_log["state"];
+            //$last_log = TalentLogApi::getLastLog($item["id"], 1, 0, ["step", "=", null]);
+            //$item["lastState"] = $last_log["last_state"];
+            //$item["realState"] = $last_log["state"];
         }unset($item);
         return ["total" => $count, "rows" => $list];
     }
 
-    public static function getExportDatas($params) {
+    public static function getExportDatas($process, $params) {
         $where[] = [];
         //特殊字段处理
         $fields = [];
         foreach ($params as $param) {
-            if (!in_array($param, ["industryFieldNew", "enterpriseName", "enterpriseTag", "street"])) {
+            if (!in_array($param, ["industryFieldNew", "enterpriseName", "enterpriseTag", "street", "talent_arrange_category", "checkMsg"])) {
                 $fields[] = "ti." . $param;
             }
         }
@@ -240,6 +331,10 @@ class VerifyApi {
         $fields[] = "e.industryFieldNew";
         $fields[] = "e.enterpriseTag";
         $fields[] = "e.street";
+        $fields[] = "tc.talentLevelCat";
+        $fields[] = "tl.description as checkMsg";
+        $fields[] = "tc.name as talentConditionName";
+        $fields[] = "tl.description as checkMsg";
         if (in_array("card_type", $params)) {
             $cardTypes = DictApi::selectByParentCode("card_type");
         }
@@ -264,8 +359,57 @@ class VerifyApi {
         if (in_array("talent_type", $params)) {
             $talentTypes = DictApi::selectByParentCode("talent_type");
         }
+        if (in_array("talent_arrange_category", $params)) {
+            $talentArrangeCategories = DictApi::selectByParentCode("talent_condition_cats");
+        }
+        if (in_array("highest_degree", $params)) {
+            $highest_degree = DictApi::selectByParentCode("highest_degree");
+        }
+        if (in_array("import_way", $params)) {
+            $import_way = DictApi::selectByParentCode("import_way");
+        }
+        if (in_array("source", $params)) {
+            $source = DictApi::selectByParentCode("source");
+        }
+        if (in_array("source_city", $params)) {
+            $source_city = DictApi::selectByParentCode("source_city");
+        }
+        if (in_array("source_county", $params)) {
+            $source_county = DictApi::selectByParentCode("source_county");
+        }
+        if (in_array("talent_arrange", $params)) {
+            $talent_arrange = DictApi::selectByParentCode("talent_arrange");
+        }
         $sex = [1 => "男", 2 => "女"];
-        $list = Talent::alias("ti")->field($fields)->leftJoin("new_enterprise e", "e.id=ti.enterprise_id")->select()->toArray();
+        $pre_import_type = [1 => "意向合同", 2 => "创业企业名称预核准"];
+        $study_abroad = [1 => "是", 2 => "否"];
+
+        $where = [];
+        switch ($process) {
+            case 1:
+                $where = "ti.checkState in (2,-1)";
+                break;
+            case 2:
+                $where = "ti.checkState in (6,-2)";
+                break;
+            case 3:
+                $companyId = session("user")["companyId"];
+                $where = "ti.checkState = 7 and ti.pass_dept_check=0 and find_in_set({$companyId},tc.companyIds)";
+                break;
+            case 4:
+                $where = sprintf("(ti.checkState in (11,12,13)) or (ti.checkState=9 and ti.pass_dept_check=0) or (ti.checkState=7 and ti.pass_dept_check=1) or (ti.checkState=7 and (tc.companyIds is null or tc.companyIds = ''))");
+                break;
+            case 5:
+                $where = "ti.checkState >= 11";
+                break;
+        }
+        $list = Talent::alias("ti")
+                        ->field($fields)
+                        ->leftJoin("new_enterprise e", "e.id=ti.enterprise_id")
+                        ->leftJoin("new_talent_condition tc", "tc.id=ti.talent_condition")
+                        ->leftJoin("new_talent_checklog tl", "tl.mainId=ti.id and tl.id=(select id from new_talent_checklog where mainId=ti.id and `step` is null and active=1 and typeFileId is null order by createTime desc limit 1)")
+                        ->whereRaw($where)
+                        ->select()->toArray();
         foreach ($list as &$item) {
             $item["card_type"] = $cardTypes[$item["card_type"]];
             $item["industryFieldNew"] = $industry_fields[$item["industryFieldNew"]];
@@ -275,7 +419,21 @@ class VerifyApi {
             $item["nationality"] = $nationalitys[$item["nationality"]];
             $item["politics"] = $politics[$item["politics"]];
             $item["talent_type"] = $talentTypes[$item["talent_type"]];
+            $item["talent_arrange_category"] = $talentArrangeCategories[$item["talentLevelCat"]];
             $item["sex"] = $sex[$item["sex"]];
+            $item["highest_degree"] = $highest_degree[$item["highest_degree"]];
+            $item["import_way"] = $import_way[$item["import_way"]];
+            $item["pre_import_type"] = $pre_import_type[$item["pre_import_type"]];
+            $item["study_abroad"] = $study_abroad[$item["study_abroad"]];
+            $item["source"] = $source[$item["source"]];
+            $item["talent_arrange"] = $talent_arrange[$item["talent_arrange"]];
+            $item["talent_condition"] = $item["talentConditionName"];
+            if (in_array("source_city", $params)) {
+                $item["source_city"] = Db::table("un_common_location")->where("code", "=", $item["source_city"])->findOrEmpty()["name"];
+            }
+            if (in_array("source_county", $params)) {
+                $item["source_county"] = Db::table("un_common_location")->where("code", "=", $item["source_county"])->findOrEmpty()["name"];
+            }
             if (in_array("province", $params)) {
                 $item["province"] = Db::table("un_common_location")->where("code", "=", $item["province"])->findOrEmpty()["name"];
             }
@@ -285,6 +443,7 @@ class VerifyApi {
             if (in_array("county", $params)) {
                 $item["county"] = Db::table("un_common_location")->where("code", "=", $item["county"])->findOrEmpty()["name"];
             }
+            $item["checkState"] = TalentState::getStateName($item["checkState"]);
         }unset($item);
         return $list;
     }

app/enterprise/validate/TalentInfo.php

@@ -28,7 +28,7 @@ class TalentInfo extends Validate {
         "experience" => "max:200",
         "education" => "max:200",
         "phone" => "mobile|unique:new_talent_info",
-        "email" => "email",
+        "email" => "email|unique:new_talent_info",
         "highest_degree" => "checkInSelect:highest_degree,01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21",
         "study_abroad" => "between:1,2",
         "import_way" => "between:1,3",
@@ -59,6 +59,7 @@ class TalentInfo extends Validate {
         "phone.mobile" => "请填写正确的手机号",
         "phone.unique" => "手机号已经存在",
         "email.email" => "电子邮箱格式错误",
+        "email.unique" => "电子邮箱已经存在",
         "highest_degree.between" => "最高学历只能在预设列表中选择",
         "study_abroad.between" => "留学经历只能选择是与否",
         "import_way.between" => "不存在的引进方式，请在列表中选择",

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

@@ -23,37 +23,37 @@ TalentInfo.showLog = function (id) {
 TalentInfo.formParams = function () {
     var queryData = {};
     queryData['name'] = $("#name").val();
-    queryData['idCard'] = $("#idCard").val();
+    queryData['card_number'] = $("#card_number").val();
     queryData['sex'] = $("#sex").val();
     queryData['nation'] = $("#nation").val();
     queryData['nationality'] = $("#nationality").val();
-    queryData['provinceCode'] = $("#provinceCode").val();
+    queryData['province'] = $("#province").val();
     queryData['politics'] = $("#politics").val();
-    queryData['enterpriseId'] = $("#enterpriseId").val();
-    queryData['industryField'] = $("#industryField").val();
+    queryData['enterprise_id'] = $("#enterprise_id").val();
+    queryData['industry_field'] = $("#industry_field").val();
     queryData['source'] = $("#source").val();
-    queryData['fromCity'] = $("#fromCity").val();
-    queryData['introductionMode'] = $("#introductionMode").val();
-    queryData['highEducation'] = $("#highEducation").val();
+    queryData['city'] = $("#city").val();
+    queryData['import_way'] = $("#import_way").val();
+    queryData['highest_degree'] = $("#highest_degree").val();
     queryData['major'] = $("#major").val();
     queryData['title'] = $("#title").val();
-    queryData['studyAbroad'] = $("#studyAbroad").val();
+    queryData['study_abroad'] = $("#study_abroad").val();
     queryData['phone'] = $("#phone").val();
     queryData['email'] = $("#email").val();
     queryData['breakFaith'] = $("#breakFaith").val();
-    queryData['talentType'] = $("#talentType").val();
-    queryData['talentArrange'] = $("#talentArrange").val();
-    queryData['address'] = $("#address").val();
-    if ($("#identifyCondition").val() == null || $("#identifyCondition").val() == '' || $("#identifyCondition").val() == "null") {
-        queryData['identifyCondition'] = "";
+    queryData['talent_type'] = $("#talent_type").val();
+    queryData['talent_arrange'] = $("#talent_arrange").val();
+    queryData['street'] = $("#street").val();
+    if ($("#talent_condition").val() == null || $("#talent_condition").val() == '' || $("#talent_condition").val() == "null") {
+        queryData['talent_condition'] = "";
     } else {
-        queryData['identifyCondition'] = $("#identifyCondition").val();
+        queryData['talent_condition'] = $("#talent_condition").val();
     }
     queryData['identifyMonth'] = $("#identifyMonth").val();
     queryData['checkState'] = $("#checkState").val();
     queryData['isPublic'] = $("#isPublic").val();
     queryData['active'] = $("#active").val()
-    queryData['year'] = $("#year").val();
+    queryData['apply_year'] = $("#apply_year").val();
     queryData['isEffect'] = $("#isEffect").val();
     return queryData;
 }
@@ -70,34 +70,33 @@ TalentInfo.search = function () {
  */
 TalentInfo.reset = function () {
     $("#name").val("");
-    $("#idCard").val("");
+    $("#card_number").val("");
     $("#sex").val("");
     $("#nation").val("");
     $("#nationality").val("");
-    $("#provinceCode").val("");
+    $("#province").val("");
     $("#politics").val("");
-    $("#enterpriseId").val("").trigger("chosen:updated");
-    $("#industryField").val("");
+    $("#enterprise_id").val("").trigger("chosen:updated");
+    $("#industry_field").val("");
     $("#source").val("");
     $("#fromCity").val("");
-    $("#introductionMode").val("");
-    $("#highEducation").val("");
+    $("#import_way").val("");
+    $("#highest_degree").val("");
     $("#major").val("");
     $("#title").val("");
-    $("#studyAbroad").val("");
+    $("#study_abroad").val("");
     $("#phone").val("");
     $("#email").val("");
     $("#breakFaith").val("");
-    $("#talentType").val("");
-    $("#talentArrange").val("");
-    $("#address").val("");
-    $("#identifyCondition").val("").trigger("chosen:updated");
-    ;
+    $("#talent_type").val("");
+    $("#talent_arrange").val("");
+    $("#street").val("");
+    $("#talent_condition").val("").trigger("chosen:updated");
     $("#checkState").val("");
     $("#identifyMonth").val("");
     $("#isPublic").val("");
     $("#active").val("")
-    $("#year").val("");
+    $("#apply_year").val("");
     $("#isEffect").val("");
 }
 
@@ -114,13 +113,25 @@ TalentInfo.getIdentifyCondition = function () {
     //     return;
     // }
     Feng.addAjaxSelect({
-        "id": "identifyCondition",
+        "id": "talent_condition",
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
         "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel"
     });
-    $("#identifyCondition").trigger('chosen:updated');
+    $("#talent_condition").trigger('chosen:updated');
+}
+/**
+ * 获取人才认定
+ */
+TalentInfo.getProvince = function () {
+    Feng.addAjaxSelect({
+        "id": "province",
+        "displayCode": "code",
+        "displayName": "name",
+        "type": "GET",
+        "url": Feng.ctxPath + "/common/tool/getProvinceSelect"
+    });
 }
 
 /**
@@ -137,6 +148,7 @@ TalentInfo.showExportModal = function () {
 TalentInfo.export = function (process) {
     var names = '';
     var values = '';
+    var commonExport = "";
     $("#field_info li input").each(function (index) {
         if ($(this).is(":checked")) {
             values = values + $(this).val() + ",";
@@ -144,9 +156,27 @@ TalentInfo.export = function (process) {
         }
     });
     var queryData = TalentInfo.formParams();
+    var process = parseInt($("#process").val());
+    switch (process) {
+        case 1:
+            commonExport = "baseVerifyListExport";
+            break;
+        case 2:
+            commonExport = "fstVerifyListExport";
+            break;
+        case 3:
+            commonExport = "deptVerifyListExport";
+            break;
+        case 4:
+            commonExport = "reVerifyListExport";
+            break;
+        case 5:
+            commonExport = "preListExport";
+            break;
+    }
     $("#commonExportModal").modal('hide');
     var params = $("#exportForm").serialize();
-    var url = "/admin/talent/commonExport?" + params;
+    var url = "/admin/talent/" + commonExport + "?" + params;
     window.location.href = url;
 }
 
@@ -159,19 +189,22 @@ TalentInfo.init = function () {
         {"name": "nation", "code": "nation"},
         {"name": "nationality", "code": "nationality"},
         {"name": "politics", "code": "politics"},
-        {"name": "industryField", "code": "industry_field"},
-        {"name": "introductionMode", "code": "introduction_model"},
-        {"name": "highEducation", "code": "highest_degree"},
-        {"name": "talentType", "code": "talent_type"},
-        {"name": "talentArrange", "code": "talent_arrange"},
+        {"name": "industry_field", "code": "industry_field"},
+        {"name": "import_way", "code": "import_way"},
+        {"name": "highest_degree", "code": "highest_degree"},
+        {"name": "talent_type", "code": "talent_type"},
+        {"name": "talent_arrange", "code": "talent_arrange"},
         {"name": "source", "code": "source"},
-        {"name": "address", "code": "street"}];
+        {"name": "street", "code": "street"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
     TalentInfo.getIdentifyCondition();
-    $("#identifyCondition,#enterpriseId").on('chosen:ready', function (e, params) {
+    TalentInfo.getProvince();
+    $("#talent_condition,#enterprise_id").on('chosen:ready', function (e, params) {
         $(".chosen-container-single .chosen-single").css("padding", "4px 0px 0px 4px");
     });
-    $("#identifyCondition,#enterpriseId").chosen({
+    $("#enterprise_id").val("");
+    $("#enterprise_id").trigger('chosen:updated');
+    $("#talent_condition,#enterprise_id").chosen({
         search_contains: true,       //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
         disable_search: false,
         width: "100%",

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

@@ -334,7 +334,7 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                                 }
                             }
                             //if (obj.files.indexOf($(this).val()) != -1) {
-                                //this.checked = true;
+                            //this.checked = true;
                             //}
                         });
                     }
@@ -371,25 +371,19 @@ TalentInfoInfoDlg.toggledepField = function () {
  */
 TalentInfoInfoDlg.toggleField = function () {
     var checkState = $("#checkStateFirstModal").val();
-    var process = $("#process").val();
-    var source = $("#source").val();
     var checkMsgFirst = $("#checkMsgFirst").val();
     if (checkState == 2) {
         $("#field").show();
         $("#checkMsgFirst").val("");
-    } else if (checkState == 3) {
+    } else if (checkState == 3 || checkState == 4) {
         $("#field").hide();
         $("#field").find("input[type=checkbox]").removeAttr("checked");
         if (checkMsgFirst == null || checkMsgFirst == '') {
-            if (source == 1 || source == 2) {
-                $("#checkMsgFirst").val((process == 1) ? "初审通过，待复核。" : "复核通过，待核查征信。");
-            } else if (source == 3) {
-                $("#checkMsgFirst").val((process == 1) ? "初审通过，待部门审核。" : "复核通过，待核查征信。");
-            }
+            $("#checkMsgFirst").val("审核通过");
         }
     } else if (checkState == -1) {
         $("#field").hide();
-        $("#checkMsgFirst").val("复核不通过");
+        $("#checkMsgFirst").val("审核不通过");
     }
 }