修改提交

app/admin/controller/Talent.php

@@ -3,6 +3,11 @@
 namespace app\admin\controller;
 
 use app\admin\common\AdminController;
+use app\common\api\VerifyApi;
+use app\common\api\TalentLogApi;
+use app\common\api\TalentState;
+use app\enterprise\model\Talent as TalentModel;
+use app\common\api\TalentConditionApi;
 
 /**
  * Description of Talent
@@ -11,8 +16,54 @@ use app\admin\common\AdminController;
  */
 class Talent extends AdminController {
 
-    private function common_verify() {
-        
+    public function common_check() {
+        $request = $this->request;
+        $params = $request->param();
+        $id = $params["id"];
+        $info = VerifyApi::getTalentInfoById($id);
+        if ($info["checkState"] == 3) {
+            return view("talentInfo_base_check", ["info" => $info]);
+        } else {
+            return view("talentInfo_common_check", ["info" => $info]);
+        }
+    }
+
+    public function cancel_verify() {
+        $params = $this->request->param();
+        $ids = $params["ids"];
+        $msg = $params["msg"];
+        if ($msg == "") {
+            return json(["msg" => "请填写审核不通过的原因"]);
+        }
+        $ids_arr = array_filter(explode(",", $ids));
+        $counts = 0;
+        foreach ($ids_arr as $id) {
+            $ti = VerifyApi::getOne($id);
+            $data["id"] = $id;
+            if ($ti["checkState"] == TalentState::FST_SUBMIT) {
+                $data["checkState"] = TalentState::BASE_VERIFY_FAIL;
+                TalentLogApi::write(1, $id, [TalentState::BASE_VERIFY_FAIL], $msg, 1);
+                TalentModel::update($data);
+                $counts++;
+            } else if ($ti["checkState"] == TalentState::SCND_SAVE) {
+                $data["checkState"] = TalentState::FST_VERIFY_FAIL;
+                TalentLogApi::write(1, $id, [TalentState::FST_VERIFY_FAIL], $msg, 1);
+                TalentModel::update($data);
+                $counts++;
+            } else {
+                //return json(["msg" => "不在审核范围"]);
+            }
+        }
+        return json(["code" => 200, sprintf("%d个申请已审核失败", $counts)]);
+    }
+
+    public function base_verify() {
+        return view();
+    }
+
+    public function base_verify_list() {
+        $request = $this->request;
+        return json(VerifyApi::getList($request));
     }
 
     /**
@@ -20,15 +71,7 @@ class Talent extends AdminController {
      * @auth {{/talentInfo/gotoIndex/-1}}
      */
     public function dept_fst_verify() {
-        $this->common_verify(-1);
-    }
-
-    /**
-     * 部门初审-审核
-     * @auth {{/talentInfo/beforeCheck}}
-     */
-    public function dept_fst_check() {
-        
+        return view();
     }
 
     /**
@@ -36,7 +79,7 @@ class Talent extends AdminController {
      * @auth {{/talentInfo/gotoIndex/1}}
      */
     public function fst_verify() {
-        $this->common_verify(1);
+        return view();
     }
 
     /**
@@ -68,15 +111,7 @@ class Talent extends AdminController {
      * @auth {{/talentInfo/gotoIndex/2}}
      */
     public function dept_verify() {
-        $this->common_verify(2);
-    }
-
-    /**
-     * 部门审核-审核
-     * @auth {{/talentInfo/depCheck}}
-     */
-    public function dept_check() {
-        
+        return view();
     }
 
     /**
@@ -84,15 +119,7 @@ class Talent extends AdminController {
      * @auth {{/talentInfo/gotoIndex/3}}
      */
     public function re_verify() {
-        $this->common_verify(3);
-    }
-
-    /**
-     * 复审-审核
-     * @auth {{/talentInfo/thirdCheck}}
-     */
-    public function re_check() {
-        
+        return view();
     }
 
     /**
@@ -199,4 +226,352 @@ class Talent extends AdminController {
         
     }
 
+    /**
+     * 基本条件审核-提交未保存
+     * @param \think\Request $request
+     * @param type $talent_info
+     * @return type json
+     */
+    private function baseCheck(\think\Request $request, $talent_info) {
+        $params = $request->param();
+        if ($params["checkState"] == 3) {
+            //审核成功
+            $log_checkState = $checkState = TalentState::BASE_VERIFY_PASS; //初审成功
+        } else {
+            //审核驳回并记录需要修改的字段和上传文件
+            $checkState = TalentState::FST_SAVE; //退回提交材料阶段
+            $log_checkState = TalentState::BASE_REJECT; //日志记录拒绝状态
+        }
+        $log = TalentLogApi::getLastLog($talent_info["id"], 1);
+        if (!$log)
+            return json(["msg" => "日志数据异常,保存失败"]);
+        if ($log["active"] == 0) {
+            TalentLogApi::rewrite($log["id"], [$log_checkState, $checkState], $params["checkMsg"]);
+        } else {
+            TalentLogApi::write(1, $talent_info["id"], [$log_checkState, $checkState], $params["checkMsg"]);
+        }
+        $data["id"] = $talent_info["id"];
+        $data["modify_files"] = $params["files"];
+        $data["modify_fields"] = $params["fields"];
+        TalentModel::update($data);
+        return json(["code" => 200, "msg" => "保存成功"]);
+    }
+
+    /**
+     * 基本条件审核-提交审核
+     * @param type $talent_info
+     * @return type json
+     */
+    private function baseSubmitCheck($talent_info) {
+        return $this->commonSubmitCheck($talent_info, 1);
+    }
+
+    /**
+     * 初审-提交未保存
+     * @param \think\Request $request
+     * @param type $talent_info
+     * @return type json
+     */
+    private function fstCheck(\think\Request $request, $talent_info) {
+        $params = $request->param();
+        if ($params["checkState"] == 3) {
+            //审核成功
+            $log_checkState = $checkState = TalentState::FST_VERIFY_PASS; //初审成功
+        } else {
+            //审核驳回并记录需要修改的字段和上传文件
+            $checkState = TalentState::SCND_SAVE; //退回材料编辑状态
+            $log_checkState = TalentState::FST_VERIFY_REJECT; //日志记录拒绝状态
+        }
+        $log = TalentLogApi::getLastLog($talent_info["id"], 1);
+        if (!$log)
+            return json(["msg" => "日志数据异常,保存失败"]);
+        if ($log["active"] == 0) {
+            TalentLogApi::rewrite($log["id"], [$log_checkState, $checkState], $params["checkMsg"]);
+        } else {
+            TalentLogApi::write(1, $talent_info["id"], [$log_checkState, $checkState], $params["checkMsg"]);
+        }
+        $data["id"] = $talent_info["id"];
+        $data["modify_files"] = $params["files"];
+        $data["modify_fields"] = $params["fields"];
+        TalentModel::update($data);
+        return json(["code" => 200, "msg" => "保存成功"]);
+    }
+
+    /**
+     * 初审-提交审核
+     * @param type $talent_info
+     * @return type json
+     */
+    private function fstSubmitCheck($talent_info) {
+        return $this->commonSubmitCheck($talent_info, 2);
+    }
+
+    /**
+     * 部门审核-提交未保存
+     * @param \think\Request $request
+     * @param type $talent_info
+     * @return type json
+     */
+    private function deptCheck(\think\Request $request, $talent_info, $companys) {
+        $params = $request->param();
+        if ($params["checkState"] == 3) {
+            //审核成功
+            $log_checkState = $checkState = TalentState::DEPT_VERIFY_PASS; //初审成功
+        } else {
+            //审核驳回并记录需要修改的字段和上传文件
+            $checkState = TalentState::SCND_SUBMIT; //退回待初审
+            $log_checkState = TalentState::DEPT_VERIFY_REJECT; //日志记录拒绝状态
+        }
+
+        $fst_dept_check_time = $talent_info["first_dept_check_time"];
+        if (!$fst_dept_check_time) {
+            //第一次部门审核
+            $data["first_dept_check_time"] = date("Y-m-d H:i:s");
+            TalentLogApi::write(1, $talent_info["id"], [$log_checkState, $checkState], $params["checkMsg"]);
+        } else {
+            $dept_logs = TalentLogApi::getListLogByTime($talent_info["id"], $fst_dept_check_time);
+            $tmp_log = null;
+            foreach ($dept_logs as $dept_log) {
+                if ($dept_log["companyId"] == $this->user["companyId"]) {
+                    //检察在第一次部门审核后产生的日志记录中是否存在当前部门记录，有就修改，没有就新增
+                    $tmp_log = $dept_log;
+                    break;
+                }
+            }
+            if ($tmp_log) {
+                //修改
+                TalentLogApi::rewrite($tmp_log["id"], [$log_checkState, $checkState], $params["checkMsg"]);
+            } else {
+                //新增
+                TalentLogApi::write(1, $talent_info["id"], [$log_checkState, $checkState], $params["checkMsg"]);
+            }
+        }
+        $data["id"] = $talent_info["id"];
+        $data["modify_files"] = $params["files"];
+        $data["modify_fields"] = $params["fields"];
+        TalentModel::update($data);
+        return json(["code" => 200, "msg" => "保存成功"]);
+    }
+
+    /**
+     * 部门审核-提交审核
+     * @param type $talent_info
+     * @return type json
+     */
+    private function deptSubmitCheck($talent_info, $companys) {
+        $dept_logs = TalentLogApi::getListLogByTime($talent_info["id"], $talent_info["first_dept_check_time"]);
+        $tmp_log = null;
+        $succeed = 0;
+        foreach ($dept_logs as $dept_log) {
+            $succeed += $dept_log["active"] == 1 ? 1 : 0;
+            if ($dept_log["companyId"] == $this->user["companyId"]) {
+                $tmp_log = $dept_log;
+            }
+        }
+        if (!$tmp_log || $tmp_log["active"] == 1)
+            return json(["msg" => "日志数据异常,审核失败"]);
+        $refused = false;
+        if ($dept_log["new_state"] == TalentState::DEPT_VERIFY_PASS) {
+            $succeed++;
+            $data["highProcess"] = $nowProcess > $talent_info["highProcess"] ? $nowProcess : $talent_info["highProcess"];
+        } else {
+            //有一个审核失败就结束
+            $refused = true;
+        }
+        if ($refused || ($succeed == count($companys))) {
+            $nowProcess = 1;
+            $data["id"] = $talent_info["id"];
+            $data["checkState"] = $dept_log["new_state"];
+            $data["first_dept_check_time"] = null;
+            TalentModel::update($data);
+        }
+        TalentLogApi::setActive($tmp_log["id"], 1);
+        return json(["code" => 200, "msg" => "审核成功"]);
+    }
+
+    /**
+     * 复审-提交未保存
+     * @param \think\Request $request
+     * @param type $talent_info
+     * @param type json
+     */
+    private function reCheck(\think\Request $request, $talent_info) {
+        $params = $request->param();
+        if ($params["checkState"] == 3) {
+            //审核成功
+            $log_checkState = $checkState = TalentState::REVERIFY_PASS; //复核成功
+        } else if ($params["checkState"] == 2) {
+            //审核驳回并记录需要修改的字段和上传文件
+            $checkState = TalentState::SCND_SUBMIT; //退回待初审
+            $log_checkState = TalentState::REVERIFY_REJECT; //日志记录拒绝状态
+        } else {
+            $log_checkState = $checkState = TalentState::REVERIFY_FAIL; //审核失败
+        }
+        $log = TalentLogApi::getLastLog($talent_info["id"], 1);
+        if (!$log)
+            return json(["msg" => "日志数据异常,保存失败"]);
+        if ($log["active"] == 0) {
+            TalentLogApi::rewrite($log["id"], [$log_checkState, $checkState], $params["checkMsg"]);
+        } else {
+            TalentLogApi::write(1, $talent_info["id"], [$log_checkState, $checkState], $params["checkMsg"]);
+        }
+        $data["id"] = $talent_info["id"];
+        $data["modify_files"] = $params["files"];
+        $data["modify_fields"] = $params["fields"];
+        TalentModel::update($data);
+        return json(["code" => 200, "msg" => "保存成功"]);
+    }
+
+    /**
+     * 复审-提交审核
+     * @param type $talent_info
+     * @return type json
+     */
+    private function reSubmitCheck($talent_info) {
+        return $this->commonSubmitCheck($talent_info, 4);
+    }
+
+    private function commonSubmitCheck($talent_info, $nowProcess) {
+        $log = TalentLogApi::getLastLog($talent_info["id"], 1);
+        if (!$log || $log["active"] == 1)
+            return json(["msg" => "日志数据异常,审核失败"]);
+        if (in_array($log["checkState"], [TalentState::BASE_VERIFY_PASS, TalentState::FST_VERIFY_PASS, TalentState::REVERIFY_PASS])) {
+            $data["highProcess"] = $nowProcess > $talent_info["highProcess"] ? $nowProcess : $talent_info["highProcess"];
+        }
+        $data["id"] = $talent_info["id"];
+        $data["checkState"] = $log["new_state"];
+        TalentModel::update($data);
+        TalentLogApi::setActive($log["id"], 1);
+        return json(["code" => 200, "msg" => "审核成功"]);
+    }
+
+    public function check() {
+        //公共调度方法
+        $request = $this->request;
+        $params = $request->param();
+        $check = $params["checkState"];
+        $check_msg = trim($params["checkMsg"]);
+        $files = $params["files"];
+        $fields = $params["fields"];
+        $id = $params["id"];
+        $talent_info = VerifyApi::getOne($id);
+        $checkState = $talent_info["checkState"];
+        if (!$talent_info) {
+            return json(["msg" => "数据错误"]);
+        }
+        if (!$check) {
+            return json(["msg" => "请选择审核状态"]);
+        }
+        if (!$check_msg) {
+            return json(["msg" => "请填写审核说明"]);
+        }
+        if ($checkState == TalentState::FST_SUBMIT) {
+            return $this->baseCheck($request, $talent_info);
+        } else if ($checkState == TalentState::SCND_SUBMIT) {
+            return $this->fstCheck($request, $talent_info);
+        } else if ($checkState == TalentState::FST_VERIFY_PASS) {
+            $condition = TalentConditionApi::getOne($talent_info["talent_condition"]);
+            $companys = array_filter(impolode(",", $condition["companyIds"]));
+            if ($companys) {
+                $companyIds = array_filter(explode(",", $companys));
+                if (in_array($this->user["companyId"], $companyIds))
+                    return json(["msg" => "你的部门不在并审部门列表"]);
+                return $this->deptCheck($request, $talent_info, $companyIds);
+            } else {
+                return $this->reCheck($request, $talent_info);
+            }
+        } else if ($checkState == TalentState::DEPT_VERIFY_PASS) {
+            return $this->reCheck($request, $talent_info);
+        } else {
+            return json(["msg" => "不在审核范围内，保存失败"]);
+        }
+    }
+
+    public function submitCheck() {
+        //公共调度方法
+        $id = $this->request->param("id");
+        $talent_info = VerifyApi::getOne($id);
+        $checkState = $talent_info["checkState"];
+        if (!$talent_info) {
+            return json(["msg" => "数据错误"]);
+        }
+        if ($checkState == TalentState::FST_SUBMIT) {
+            return $this->baseSubmitCheck($talent_info);
+        } else if ($checkState == TalentState::SCND_SUBMIT) {
+            return $this->fstSubmitCheck($talent_info);
+        } else if ($checkState == TalentState::FST_VERIFY_PASS) {
+            $condition = TalentConditionApi::getOne($talent_info["talent_condition"]);
+            $companys = array_filter(impolode(",", $condition["companyIds"]));
+            if ($companys) {
+                $companyIds = array_filter(explode(",", $companys));
+                if (in_array($this->user["companyId"], $companyIds))
+                    return json(["msg" => "你的部门不在并审部门列表"]);
+                return $this->deptSubmitCheck($talent_info, $companyIds);
+            } else {
+                return $this->reSubmitCheck($talent_info);
+            }
+        } else if ($checkState == TalentState::DEPT_VERIFY_PASS) {
+            return $this->reSubmitCheck($talent_info);
+        } else {
+            return json(["msg" => "不在审核范围内，审核失败"]);
+        }
+    }
+
+    public function validateIsCheck() {
+        $params = $this->request->param();
+        $id = $params["id"];
+        $talent_info = VerifyApi::getOne($id);
+        if ($talent_info) {
+            $checkState = $talent_info["checkState"];
+            // 0正在填写 1保存未提交 2已提交未审核 3已审核 4驳回 5保存补充材料未提交 6提交补充材料进入初审 7初审通过 8初审驳回 9部门审核通过 10部门审核驳回 11复核通过 12复核驳回 13复核失败
+            $process = 0;
+            if (in_array($checkState, [2, 6, 7, 9])) {
+                switch ($checkState) {
+                    case 2:
+                        $enterprise = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
+                        $fields = \app\common\api\DictApi::getTalentFields(1);
+                        $field_tmp = [];
+                        foreach ($fields as $key => $field) {
+                            $field_tmp[] = ["key" => $key, "value" => $field];
+                        }
+                        $where[] = ["project", "=", 1];
+                        $where[] = ["step", "=", 1];
+                        $where[] = ["active", "=", 1];
+                        $where[] = ["type", "=", $enterprise["type"]];
+
+                        $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
+                        $process = 1;
+                        break;
+                    case 6:
+                        $process = 2;
+                        break;
+                    case 7:
+                        $fields = \app\common\api\DictApi::getTalentFields(3);
+                        $process = 3;
+                        break;
+                    case 9:
+                        $fields = \app\common\api\DictApi::getTalentFields(3);
+                        $process = 4;
+                        break;
+                }
+                if ($checkState != 2) {
+                    $enterprise = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
+                    $fields = \app\common\api\DictApi::getTalentFields(3);
+                    $field_tmp = [];
+                    foreach ($fields as $key => $field) {
+                        $field_tmp[] = ["key" => $key, "value" => $field];
+                    }
+                    $where[] = ["project", "=", 1];
+                    $where[] = ["active", "=", 1];
+                    $where[] = ["type", "=", $enterprise["type"]];
+
+                    $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
+                }
+                return json(["code" => 200, "obj" => ["process" => $process, "talentInfo" => $talent_info, "fieldList" => $field_tmp, "fileList" => $files]]);
+            } else {
+                return json(["msg" => "该申报不在审核范围内，无法审核"]);
+            }
+        }
+    }
+
 }

app/admin/view/Talent/base_verify.html

@@ -0,0 +1,308 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .layui-layer-btn .layui-layer-btn1 {
+        border-color: #009688;
+        background-color: #009688;
+        color: #fff;
+    }
+    ul li{
+        list-style: none;
+        display:inline-block;
+        margin-bottom: 5px;
+    }
+    #field ul li input{
+        vertical-align:middle;
+        margin-top:1px;
+    }
+</style>
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>人才认定申报 - 基本条件判定</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row row-lg">
+                    <div class="col-sm-12">
+                        <div class="row">
+                            <input type="hidden" id="type" value="${user.type}">
+                            <input type="hidden" id="process" value="1">
+                            <input type="hidden" id="title" value="基本条件判定">
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">姓名
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="name" placeholder="" />
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">证件号码
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="idCard" placeholder="" />
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            性别
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="sex">
+                                        <option value=""></option>
+                                        <option value="1">男</option>
+                                        <option value="2">女</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            民族
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nation">
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row highSearch" style="display: none">
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            国籍/地区
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nationality">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            籍贯省
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="provinceCode">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            政治面貌
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="politics">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            单位名称
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="enterpriseId">
+                                    </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="industryField">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            申报来源
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="source">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">申报年度
+                                        </button>
+                                    </div>
+                                    <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>
+                                    </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">
+                                <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();
+                                        $(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
+                                <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();
+                                        $('.highSearch').hide();
+                                        $(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="TalentInfo.search()">搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="TalentInfo.reset()">重置</button>
+                            </div>
+                        </div>
+                        <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
+                            <if condition="chkCommission('/admin/talent/base_verify','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openCheckTalentInfo()" id="">
+                                    <i class="fa fa-check"></i>&nbsp;人才认定基本条件判定
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/base_export','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.showExportModal(1)" id="">
+                                    <i class="fa fa-file-excel-o"></i>&nbsp;导出
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/base_download','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.download()" id="">
+                                    <i class="fa fa-download"></i>&nbsp;下载
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/modify_reject_fields','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.updateFieldsAndFiles()" id="">
+                                    <i class="fa fa-edit"></i>&nbsp;修改驳回字段
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/setNotPass','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.setNotPass()" id="">
+                                    <i class="fa fa-mobile"></i>&nbsp;审核不通过
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/getPhones','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.getPhones()" id="">
+                                    <i class="fa fa-mobile"></i>&nbsp;获取人才手机号
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/getEnterprisePhones','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.getEnterprisePhones()" id="">
+                                    <i class="fa fa-phone"></i>&nbsp;获取经办人手机号
+                                </button>
+                            </if>
+                        </div>
+                        <table id="TalentInfoTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                            <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                            </thead>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!--导出模态框-->
+<div class="modal fade " id="commonExportModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog modal-lg" role="document" style="min-width: 1000px">
+        <div class="modal-content animated flipInY">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="firstModalLabel">导出</h4>
+            </div>
+            <div class="modal-body">
+                <form id="exportForm" action="/talentInfoExport/publicExport" target="hiddenIframe" class="form-horizontal">
+                    <div class="form-group" id="field">
+                        <div id="field_info">
+                            <ul>
+                                <li style="width:24%"><input type="checkbox" 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>
+                            </ul>
+                        </div>
+                        <div class="form-group" style="text-align: center">
+                            <button type="button" class="btn btn-primary" onclick="TalentInfo.checkAll()">全选</button>
+                            <button type="button" class="btn btn-success" onclick="TalentInfo.unCheckAll()">反选</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(1)">导出</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_first.js"></script>-->
+<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_base.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

app/admin/view/Talent/dept_verify.html

@@ -6,7 +6,7 @@
         background-color: #009688;
         color: #fff;
     }
-    #field ul li{
+    ul li{
         list-style: none;
         display:inline-block;
         margin-bottom: 5px;
@@ -20,213 +20,187 @@
     <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">
                         <div class="row">
                             <input type="hidden" id="type" value="${user.type}">
+                            <input type="hidden" id="process" value="3">
+                            <input type="hidden" id="title" value="部门审核">
                             <div class="col-sm-3">
-                                <#NameCon id="name" name="姓名" />
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">姓名
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="name" placeholder="" />
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#NameCon id="idCard" name="证件号码" />
+                                <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="idCard" placeholder="" />
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="sex" name="性别" >
-                                <option value=""></option>
-                                <option value="1">男</option>
-                                <option value="2">女</option>
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            性别
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="sex">
+                                        <option value=""></option>
+                                        <option value="1">男</option>
+                                        <option value="2">女</option>
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="nation" name="民族" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            民族
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nation">
+                                    </select>
+                                </div>
                             </div>
                         </div>
                         <div class="row highSearch" style="display: none">
                             <div class="col-sm-3">
-                                <#SelectCon id="nationality" name="国籍/地区" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            国籍/地区
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nationality">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="provinceCode" name="籍贯省" >
-                                <option value="">请选择</option>
-                                @for(item in provinceList){
-                                <option value="${item.code}">${item.name}</option>
-                                @}
-                                </#SelectCon>
+                                <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="provinceCode">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="politics" name="政治面貌" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            政治面貌
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="politics">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="enterpriseId" name="单位名称" >
-                                <option value="">请选择</option>
-                                @for(item in enterpriseList){
-                                <option value="${item.id}">${item.name}</option>
-                                @}
-                                </#SelectCon>
+                                <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="enterpriseId">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="industryField" name="行业领域" >
-                                </#SelectCon>
+                                <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>
+                                </div>
                             </div>
-                            <div class="col-sm-3"
-                                 @if(user.type==2){
-                                 style="display: none"
-                                 @}
-                                 >
-                                 <#SelectCon id="source" name="申报来源">
-                                 <option value=""></option>
-                                <option value="1">经我市申报并已经成功入选的泉州高层次人才</option>
-                                <option value="2">从我市以外的其他县（市、区）变动到我市工作的泉州市高层次人才</option>
-                                <option value="3">依据《晋江市优秀人才补充认定标准》申报认定</option>
-                                </#SelectCon>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            申报来源
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="source">
+                                    </select>
+                                </div>
                             </div>
-                            <div class="col-sm-3"
-                                 @if(user.type==2){
-                                 style="display: none"
-                                 @}
-                                 >
-                                 <#SelectCon id="fromCity" name="入选来源县市">
-                                 <option value="">请选择</option>
-                                @for(item in fromCityList){
-                                <option value="${item.code}">${item.name}</option>
-                                @}
-                                </#SelectCon>
+                            <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>
+                                    </div>
+                                    <input type="text"  class="form-control time" id="identifyMonth" name="identifyMonth"/>
+                                </div>
                             </div>
-                            <div class="col-sm-3"
-                                 @if(user.type==2){
-                                 style="display: none"
-                                 @}
-                                 >
-                                 <#SelectCon id="introductionMode" name="引进方式">
-                                 </#SelectCon>
-                        </div>
-                        <div class="col-sm-3">
-                            <#SelectCon id="highEducation" name="最高学历" >
-                            </#SelectCon>
-                        </div>
-                        <div class="col-sm-3">
-                            <#NameCon id="major" name="专业" />
-                        </div>
-                        <div class="col-sm-3">
-                            <#NameCon id="title" name="职称" />
-                        </div>
-                        <div class="col-sm-3">
-                            <#SelectCon id="studyAbroad" name="是否有留学经历" >
-                            <option value="">请选择</option>
-                            <option value="2">否</option>
-                            <option value="1">是</option>
-                            </#SelectCon>
                         </div>
-                        <div class="col-sm-3">
-                            <#NameCon id="phone" name="手机号码" />
-                        </div>
-                        <div class="col-sm-3">
-                            <#NameCon id="email" name="电子邮箱" />
-                        </div>
-                        <div class="col-sm-3">
-                            <#SelectCon id="talentType" name="人才标签" >
-                            </#SelectCon>
-                        </div>
-                        <div class="col-sm-3">
-                            <#SelectCon id="talentArrange" name="人才层次" >
-                            </#SelectCon>
-                        </div>
-                        <div class="col-sm-3">
-                            <#SelectCon id="identifyCondition" name="认定条件" >
-                            </#SelectCon>
-                        </div>
-                        <div class="col-sm-3">
-                            <#SelectCon id="address" name="所属镇街" >
-                            </#SelectCon>
-                        </div>
-                        <div class="col-sm-3">
-                            <#SelectCon id="breakFaith" name="是否失信" >
-                            <option value="">请选择</option>
-                            <option value="2">否</option>
-                            <option value="1">是</option>
-                            </#SelectCon>
-                        </div>
-                        <div class="col-sm-3">
-                            <#SelectCon id="checkState" name="审核状态" >
-                            <option value="" >请选择</option>
-                            <option value="1">待审核</option>
-                            <option value="2">已驳回</option>
-                            <option value="3">已通过</option>
-                            <option value="4">上级驳回</option>
-                            <option value="9">重新提交</option>
-                            </#SelectCon>
-                        </div>
-                        <div class="col-sm-3" style="display: none">
-                            <#SelectCon id="active" name="离职状态" >
-                            <option value="">请选择</option>
-                            <option value="1">在职</option>
-                            <option value="2">离职</option>
-                            </#SelectCon>
-                        </div>
-                        <div class="col-sm-3" style="display: none">
-                            <#SelectCon id="isPublic" name="公示状态" >
-                            <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>
-                            </#SelectCon>
-                        </div>
-                        <div class="col-sm-3">
-                            <#NameCon id="year" name="申报年度" />
-                        </div>
-                        <div class="col-sm-3" style="display: none">
-                            <#SelectCon id="isEffect" name="是否有效">
-                            <option value="">请选择</option>
-                            <option value="1">有效</option>
-                            <option value="3">人才证书过期</option>
-                            <option value="4">已取消</option>
-                            </#SelectCon>
-                        </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 class="row">
+                            <div class="col-sm-12" style="text-align: center">
+                                <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();
+                                        $(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
+                                <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();
+                                        $('.highSearch').hide();
+                                        $(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="TalentInfo.search()">搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="TalentInfo.reset()">重置</button>
                             </div>
                         </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-sm-12" style="text-align: center">
-                            <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();$(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
-                            <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();$('.highSearch').hide();$(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
-                            <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="TalentInfo.search()">搜索</button>
-                            <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="TalentInfo.reset()">重置</button>
+                        <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
+                            <if condition="chkCommission('/admin/talent/deptCheck','/talentInfo/depCheck')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openCheckTalentInfo()" id="">
+                                    <i class="fa fa-check"></i>&nbsp;审核
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/depExport','/talentInfo/depExport')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.showExportModal(1)" id="">
+                                    <i class="fa fa-file-excel-o"></i>&nbsp;导出
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/depDownloadZip','/talentInfo/depDownload')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.download()" id="">
+                                    <i class="fa fa-download"></i>&nbsp;下载
+                                </button>
+                            </if>
                         </div>
+                        <table id="TalentInfoTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                            <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                            </thead>
+                        </table>
                     </div>
-                    <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
-                        @if(shiro.hasPermission("/talentInfo/depCheck")){
-                        <#button name="审核" icon="fa-check" clickFun="TalentInfo.openCheckTalentInfo()"/>
-                        @}
-                        @if(shiro.hasPermission("/talentInfo/depExport")){
-                        <#button name="导出" icon="fa-file-excel-o" clickFun="TalentInfo.showExportModal(2)" space="true"/>
-                        @}
-                        @if(shiro.hasPermission("/talentInfo/depDownload")){
-                        <#button name="下载" icon="fa-download" clickFun="TalentInfo.download()"/>
-                        @}
-                    </div>
-                    <#table id="TalentInfoTable"/>
                 </div>
             </div>
         </div>
     </div>
 </div>
-</div>
 <!--导出模态框-->
 <div class="modal fade " id="commonExportModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog modal-lg" role="document" style="min-width: 1000px">
@@ -236,11 +210,10 @@
                 <h4 class="modal-title" id="firstModalLabel">导出</h4>
             </div>
             <div class="modal-body">
-                <form id="exportForm" action="${ctxPath}/talentInfoExport/publicExport" target="hiddenIframe" class="form-horizontal">
+                <form id="exportForm" action="/talentInfoExport/publicExport" target="hiddenIframe" class="form-horizontal">
                     <div class="form-group" id="field">
                         <div id="field_info">
                             <ul>
-                                @if(user.type==1){
                                 <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>
@@ -255,89 +228,40 @@
                                 <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="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="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="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="checkMsg"><span>审核意见</span></li>
-                                @}
-                                @if(user.type==2){
-                                <li style="width:24%"><input type="checkbox" value="year"><span>申报年度</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseName"><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="nationName"><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="nationalityName"><span>国籍/地区</span></li>
-                                <li style="width:24%"><input type="checkbox" value="politicsName"><span>政治面貌</span></li>
-                                <li style="width:24%"><input type="checkbox" value="streetName"><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="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="post"><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="bankAccount"><span>银行账号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>
-                                <li style="width: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="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="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="checkMsg"><span>审核意见</span></li>
-                                @}
                             </ul>
                         </div>
                         <div class="form-group" style="text-align: center">
@@ -348,17 +272,17 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(2)">导出</button>
+                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(1)">导出</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
-<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_dep.js"></script>-->
+<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_first.js"></script>-->
 <!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common.js"></script>-->
 <script type="text/javascript">
-    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_dep.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_base.js?v=' + (new Date()).getTime() + '"><\/script>');
     document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
 {/block}

app/admin/view/Talent/fst_verify.html

@@ -1,4 +1,5 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .layui-layer-btn .layui-layer-btn1 {
         border-color: #009688;
@@ -19,218 +20,201 @@
     <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">
                         <div class="row">
                             <input type="hidden" id="type" value="${user.type}">
+                            <input type="hidden" id="process" value="2">
+                            <input type="hidden" id="title" value="初级审核">
                             <div class="col-sm-3">
-                                <#NameCon id="name" name="姓名" />
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">姓名
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="name" placeholder="" />
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#NameCon id="idCard" name="证件号码" />
+                                <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="idCard" placeholder="" />
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="sex" name="性别" >
-                                    <option value=""></option>
-                                    <option value="1">男</option>
-                                    <option value="2">女</option>
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            性别
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="sex">
+                                        <option value=""></option>
+                                        <option value="1">男</option>
+                                        <option value="2">女</option>
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="nation" name="民族" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            民族
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nation">
+                                    </select>
+                                </div>
                             </div>
                         </div>
                         <div class="row highSearch" style="display: none">
                             <div class="col-sm-3">
-                                <#SelectCon id="nationality" name="国籍/地区" >
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="provinceCode" name="籍贯省" >
-                                    <option value="">请选择</option>
-                                    @for(item in provinceList){
-                                        <option value="${item.code}">${item.name}</option>
-                                    @}
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="politics" name="政治面貌" >
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="enterpriseId" name="单位名称" >
-                                    <option value="">请选择</option>
-                                    @for(item in enterpriseList){
-                                    <option value="${item.id}">${item.name}</option>
-                                    @}
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="industryField" name="行业领域" >
-                                </#SelectCon>
-                            </div>
-                                <div class="col-sm-3"
-                                     @if(user.type==2){
-                                        style="display: none"
-                                     @}
-                                    >
-                                    <#SelectCon id="source" name="申报来源">
-                                        <option value=""></option>
-                                        <option value="1">经我市申报并已经成功入选的泉州高层次人才</option>
-                                        <option value="2">从我市以外的其他县（市、区）变动到我市工作的泉州市高层次人才</option>
-                                        <option value="3">依据《晋江市优秀人才补充认定标准》申报认定</option>
-                                    </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            国籍/地区
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nationality">
+                                    </select>
                                 </div>
-                                <div class="col-sm-3"
-                                     @if(user.type==2){
-                                     style="display: none"
-                                     @}
-                                    >
-                                    <#SelectCon id="fromCity" name="入选来源县市">
-                                        <option value="">请选择</option>
-                                        @for(item in fromCityList){
-                                        <option value="${item.code}">${item.name}</option>
-                                        @}
-                                    </#SelectCon>
-                                </div>
-                                <div class="col-sm-3"
-                                     @if(user.type==2){
-                                     style="display: none"
-                                     @}
-                                    >
-                                    <#SelectCon id="introductionMode" name="引进方式">
-                                    </#SelectCon>
-                                </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="highEducation" name="最高学历" >
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#NameCon id="major" name="专业" />
                             </div>
                             <div class="col-sm-3">
-                                <#NameCon id="title" name="职称" />
-                            </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="studyAbroad" name="是否有留学经历" >
-                                    <option value="">请选择</option>
-                                    <option value="2">否</option>
-                                    <option value="1">是</option>
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#NameCon id="phone" name="手机号码" />
-                            </div>
-                            <div class="col-sm-3">
-                                <#NameCon id="email" name="电子邮箱" />
-                            </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="talentType" name="人才标签" >
-                                </#SelectCon>
+                                <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="provinceCode">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="talentArrange" name="人才层次" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            政治面貌
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="politics">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="identifyCondition" name="认定条件" >
-                                    <option value="">请选择</option>
-                                </#SelectCon>
+                                <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="enterpriseId">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="address" name="所属镇街" >
-                                </#SelectCon>
+                                <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>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="breakFaith" name="是否失信" >
-                                    <option value="">请选择</option>
-                                    <option value="2">否</option>
-                                    <option value="1">是</option>
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            申报来源
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="source">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="checkState" name="审核状态">
-                                    <option value="">请选择</option>
-                                    <option value="-1">审核不通过</option>
-                                    <option value="1">待提交</option>
-                                    <option value="5">重新提交</option>
-                                    <option value="7">待审核</option>
-                                    <option value="10">已驳回</option>
-                                    <option value="20">上级驳回</option>
-                                    <option value="15">已通过</option>
-                                </#SelectCon>
-                            </div>
+                                <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">
-                                <#SelectCon id="active" name="离职状态" >
-                                <option value="">请选择</option>
-                                <option value="1">在职</option>
-                                <option value="2">离职</option>
-                            </#SelectCon>
-                            </div>
-                            <div class="col-sm-3" style="display: none">
-                                <#SelectCon id="isPublic" name="公示状态" >
-                                    <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>
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3" style="display: none">
-                                <#SelectCon id="isEffect" name="是否有效">
-                                    <option value="">请选择</option>
-                                    <option value="1">有效</option>
-                                    <option value="3">人才证书过期</option>
-                                    <option value="4">已取消</option>
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#NameCon id="year" name="申报年度" />
+                                <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 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">
-                                <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();$(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
-                                <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();$('.highSearch').hide();$(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
+                                <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();
+                                        $(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
+                                <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();
+                                        $('.highSearch').hide();
+                                        $(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
                                 <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="TalentInfo.search()">搜索</button>
                                 <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="TalentInfo.reset()">重置</button>
                             </div>
                         </div>
                         <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
-                            @if(shiro.hasPermission("/talentInfo/firstCheck")){
-                            <#button name="审核" icon="fa-check" clickFun="TalentInfo.openCheckTalentInfo()"/>
-                            @}
-                            @if(shiro.hasPermission("/talentInfo/firstExport")){
-                            <#button name="导出" icon="fa-file-excel-o" clickFun="TalentInfo.showExportModal(1)" space="true"/>
-                            @}
-                            @if(shiro.hasPermission("/talentInfo/firstDownload")){
-                            <#button name="下载" icon="fa-download" clickFun="TalentInfo.download()"/>
-                            @}
-                            @if(shiro.hasPermission("/talentInfo/updateFieldsAndFiles")){
-                                <#button name="修改驳回字段" icon="fa-edit" clickFun="TalentInfo.updateFieldsAndFiles()"/>
-                            @}
-                            @if(shiro.hasPermission("/talentInfo/setNotPass")){
-                                <#button name="审核不通过" icon="fa-exclamation-triangle" clickFun="TalentInfo.setNotPass()"/>
-                            @}
-                            <#button name="获取人才手机号" icon="fa-mobile" clickFun="TalentInfo.getPhones()" space="true"/>
-                            <#button name="获取经办人手机号" icon="fa-phone" clickFun="TalentInfo.getEnterprisePhones()" space="true"/>
+                            <if condition="chkCommission('/admin/talent/base_verify','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openCheckTalentInfo()" id="">
+                                    <i class="fa fa-check"></i>&nbsp;审核
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/base_export','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.showExportModal(1)" id="">
+                                    <i class="fa fa-file-excel-o"></i>&nbsp;导出
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/base_download','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.download()" id="">
+                                    <i class="fa fa-download"></i>&nbsp;下载
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/modify_reject_fields','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.updateFieldsAndFiles()" id="">
+                                    <i class="fa fa-edit"></i>&nbsp;修改驳回字段
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/setNotPass','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.setNotPass()" id="">
+                                    <i class="fa fa-mobile"></i>&nbsp;审核不通过
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/getPhones','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.getPhones()" id="">
+                                    <i class="fa fa-mobile"></i>&nbsp;获取人才手机号
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/getEnterprisePhones','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.getEnterprisePhones()" id="">
+                                    <i class="fa fa-phone"></i>&nbsp;获取经办人手机号
+                                </button>
+                            </if>
                         </div>
-                        <#table id="TalentInfoTable"/>
+                        <table id="TalentInfoTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                            <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                            </thead>
+                        </table>
                     </div>
                 </div>
             </div>
@@ -246,11 +230,10 @@
                 <h4 class="modal-title" id="firstModalLabel">导出</h4>
             </div>
             <div class="modal-body">
-                <form id="exportForm" action="${ctxPath}/talentInfoExport/publicExport" target="hiddenIframe" class="form-horizontal">
+                <form id="exportForm" action="/talentInfoExport/publicExport" target="hiddenIframe" class="form-horizontal">
                     <div class="form-group" id="field">
                         <div id="field_info">
                             <ul>
-                                @if(user.type==1){
                                 <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>
@@ -265,89 +248,40 @@
                                 <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="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="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="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="checkMsg"><span>审核意见</span></li>
-                                @}
-                                @if(user.type==2){
-                                <li style="width:24%"><input type="checkbox" value="year"><span>申报年度</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseName"><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="nationName"><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="nationalityName"><span>国籍/地区</span></li>
-                                <li style="width:24%"><input type="checkbox" value="politicsName"><span>政治面貌</span></li>
-                                <li style="width:24%"><input type="checkbox" value="streetName"><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="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="post"><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="bankAccount"><span>银行账号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>
-                                <li style="width: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="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="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="checkMsg"><span>审核意见</span></li>
-                                @}
                             </ul>
                         </div>
                         <div class="form-group" style="text-align: center">
@@ -368,7 +302,7 @@
 <!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_first.js"></script>-->
 <!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common.js"></script>-->
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_first.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_base.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
-@}
+{/block}

app/admin/view/Talent/re_verify.html

@@ -1,11 +1,12 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .layui-layer-btn .layui-layer-btn1 {
         border-color: #009688;
         background-color: #009688;
         color: #fff;
     }
-    #field ul li{
+    ul li{
         list-style: none;
         display:inline-block;
         margin-bottom: 5px;
@@ -19,210 +20,186 @@
     <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">
                         <div class="row">
                             <input type="hidden" id="type" value="${user.type}">
+                            <input type="hidden" id="process" value="4">
+                            <input type="hidden" id="title" value="复审">
                             <div class="col-sm-3">
-                                <#NameCon id="name" name="姓名" />
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">姓名
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="name" placeholder="" />
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#NameCon id="idCard" name="证件号码" />
+                                <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="idCard" placeholder="" />
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="sex" name="性别" >
-                                    <option value=""></option>
-                                    <option value="1">男</option>
-                                    <option value="2">女</option>
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            性别
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="sex">
+                                        <option value=""></option>
+                                        <option value="1">男</option>
+                                        <option value="2">女</option>
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="nation" name="民族" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            民族
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nation">
+                                    </select>
+                                </div>
                             </div>
                         </div>
                         <div class="row highSearch" style="display: none">
                             <div class="col-sm-3">
-                                <#SelectCon id="nationality" name="国籍/地区" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            国籍/地区
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nationality">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="provinceCode" name="籍贯省" >
-                                    <option value="">请选择</option>
-                                    @for(item in provinceList){
-                                    <option value="${item.code}">${item.name}</option>
-                                    @}
-                                </#SelectCon>
+                                <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="provinceCode">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="politics" name="政治面貌" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            政治面貌
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="politics">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="enterpriseId" name="单位名称" >
-                                    <option value="">请选择</option>
-                                    @for(item in enterpriseList){
-                                    <option value="${item.id}">${item.name}</option>
-                                    @}
-                                </#SelectCon>
+                                <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="enterpriseId">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="industryField" name="行业领域" >
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3"
-                                 @if(user.type==2){
-                                 style="display: none"
-                                 @}
-                                >
-                                <#SelectCon id="source" name="申报来源">
-                                    <option value=""></option>
-                                    <option value="1">经我市申报并已经成功入选的泉州高层次人才</option>
-                                    <option value="2">从我市以外的其他县（市、区）变动到我市工作的泉州市高层次人才</option>
-                                    <option value="3">依据《晋江市优秀人才补充认定标准》申报认定</option>
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3"
-                                 @if(user.type==2){
-                                 style="display: none"
-                                 @}
-                                >
-                                <#SelectCon id="fromCity" name="入选来源县市">
-                                    <option value="">请选择</option>
-                                    @for(item in fromCityList){
-                                    <option value="${item.code}">${item.name}</option>
-                                    @}
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3"
-                                 @if(user.type==2){
-                                 style="display: none"
-                                 @}
-                                >
-                                <#SelectCon id="introductionMode" name="引进方式">
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="highEducation" name="最高学历" >
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#NameCon id="major" name="专业" />
-                            </div>
-                            <div class="col-sm-3">
-                                <#NameCon id="title" name="职称" />
-                            </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="studyAbroad" name="是否有留学经历" >
-                                    <option value="">请选择</option>
-                                    <option value="2">否</option>
-                                    <option value="1">是</option>
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#NameCon id="phone" name="手机号码" />
-                            </div>
-                            <div class="col-sm-3">
-                                <#NameCon id="email" name="电子邮箱" />
-                            </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="talentType" name="人才标签" >
-                                </#SelectCon>
+                                <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>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="talentArrange" name="人才层次" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            申报来源
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="source">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="identifyCondition" name="认定条件">
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="address" name="所属镇街" >
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="breakFaith" name="是否失信" >
-                                    <option value="">请选择</option>
-                                    <option value="2">否</option>
-                                    <option value="1">是</option>
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3">
-                                <#SelectCon id="checkState" name="审核状态">
-                                    <option value="">请选择</option>
-                                    <option value="-1">审核不通过</option>
-                                    <option value="5">重新提交</option>
-                                    <option value="25">待审核</option>
-                                    <option value="30">已驳回</option>
-                                    <option value="35">已通过</option>
-                                </#SelectCon>
-                            </div>
-                            <div class="col-sm-3" style="display: none">
-                                <#SelectCon id="active" name="离职状态" >
-                                    <option value="">请选择</option>
-                                    <option value="1">在职</option>
-                                    <option value="2">离职</option>
-                                </#SelectCon>
-                            </div>
+                                <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">
-                                <#SelectCon id="isPublic" name="公示状态" >
-                                    <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>
-                                </#SelectCon>
+                                <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 class="col-sm-3">
-                                <#NameCon id="year" name="申报年度" />
-                            </div>
-                            <div class="col-sm-3" style="display: none">
-                                <#SelectCon id="isEffect" name="是否有效">
-                                    <option value="">请选择</option>
-                                    <option value="1">有效</option>
-                                    <option value="3">人才证书过期</option>
-                                    <option value="4">已取消</option>
-                                </#SelectCon>
-                            </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">
-                                <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();$(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
-                                <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();$('.highSearch').hide();$(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
+                                <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();
+                                        $(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
+                                <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();
+                                        $('.highSearch').hide();
+                                        $(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
                                 <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="TalentInfo.search()">搜索</button>
                                 <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="TalentInfo.reset()">重置</button>
                             </div>
                         </div>
                         <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
-                            @if(shiro.hasPermission("/talentInfo/thirdCheck")){
-                            <#button name="审核" icon="fa-check" clickFun="TalentInfo.openCheckTalentInfo()"/>
-                            @}
-                            @if(shiro.hasPermission("/talentInfo/cancleThirdCheck")){
-                            <#button name="撤销复核" icon="fa-backward" clickFun="TalentInfo.cancleThirdCheck()"/>
-                            @}
-                            @if(shiro.hasPermission("/talentInfo/thirdExport")){
-                            <#button name="导出" icon="fa-file-excel-o" clickFun="TalentInfo.showExportModal(3)" space="true"/>
-                            @}
-                            @if(shiro.hasPermission("/talentInfo/thirdDownload")){
-                            <#button name="下载" icon="fa-download" clickFun="TalentInfo.download()"/>
-                            @}
+                            <if condition="chkCommission('/admin/talent/re_verify','/talentInfo/thirdCheck')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openCheckTalentInfo()" id="">
+                                    <i class="fa fa-check"></i>&nbsp;审核
+                                </button>
+                            </if>
+                            <!--<if condition="chkCommission('/admin/talent/return_verify','/talentInfo/cancleThirdCheck')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.cancleThirdCheck()" id="">
+                                    <i class="fa fa-file-excel-o"></i>&nbsp;撤销复核
+                                </button>
+                            </if>-->
+                            <if condition="chkCommission('/admin/talent/reVerifyExport','/talentInfo/thirdExport')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.showExportModal(3)" id="">
+                                    <i class="fa fa-file-excel-o"></i>&nbsp;导出
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/download','/talentInfo/thirdDownload')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.download()" id="">
+                                    <i class="fa fa-download"></i>&nbsp;下载
+                                </button>
+                            </if>
                         </div>
-                        <#table id="TalentInfoTable"/>
+                        <table id="TalentInfoTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                            <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                            </thead>
+                        </table>
                     </div>
                 </div>
             </div>
@@ -238,11 +215,10 @@
                 <h4 class="modal-title" id="firstModalLabel">导出</h4>
             </div>
             <div class="modal-body">
-                <form id="exportForm" action="${ctxPath}/talentInfoExport/publicExport" target="hiddenIframe" class="form-horizontal">
+                <form id="exportForm" action="/talentInfoExport/publicExport" target="hiddenIframe" class="form-horizontal">
                     <div class="form-group" id="field">
                         <div id="field_info">
                             <ul>
-                                @if(user.type==1){
                                 <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>
@@ -257,91 +233,40 @@
                                 <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="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="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="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="checkMsg"><span>审核意见</span></li>
-                                <li style="width:24%"><input type="checkbox" value="isPublicName"><span>公示状态</span></li>
-                                @}
-                                @if(user.type==2){
-                                <li style="width:24%"><input type="checkbox" value="year"><span>申报年度</span></li>
-                                <li style="width:24%"><input type="checkbox" value="enterpriseName"><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="nationName"><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="nationalityName"><span>国籍/地区</span></li>
-                                <li style="width:24%"><input type="checkbox" value="politicsName"><span>政治面貌</span></li>
-                                <li style="width:24%"><input type="checkbox" value="streetName"><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="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="post"><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="bankAccount"><span>银行账号</span></li>
-                                <li style="width:24%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>
-                                <li style="width:24%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>
-                                <li style="width: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="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="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="checkMsg"><span>审核意见</span></li>
-                                <li style="width:24%"><input type="checkbox" value="isPublicName"><span>公示状态</span></li>
-                                @}
                             </ul>
                         </div>
                         <div class="form-group" style="text-align: center">
@@ -352,17 +277,17 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(3)">导出</button>
+                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(1)">导出</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
-<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_third.js"></script>-->
+<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_first.js"></script>-->
 <!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common.js"></script>-->
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_third.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_base.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
-@}
+{/block}

app/admin/view/Talent/talentInfo_base_check.html

@@ -0,0 +1,195 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .spacing {
+        margin-bottom: 10px;
+        padding-right:4px;
+        padding-left: 4px;
+    }
+    #talentInfoForm label {
+        font-size: xx-small;
+    }
+    .has-feedback .form-control {
+        padding-right: 5px;
+    }
+    ul li {
+        list-style: none;
+        display: inline-block;
+    }
+    .imgs li{
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
+    #field ul li input{
+        vertical-align:middle;
+        margin-right:5px;
+        margin-top:1px;
+    }
+    .control-label{
+        color: #337ab7;
+    }
+    .layui-layer-btn .layui-layer-btn1 {
+        border-color: #1E9FFF;
+        background-color: #1E9FFF;
+        color: #fff;
+    }
+    .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
+        background-color: #ddd;
+        opacity: 1;
+    }
+    #fileTable td{
+        word-break: break-word;
+        white-space: inherit;
+    }
+</style>
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div class="form-horizontal">
+            <div class="row">
+                <div class="col-sm-12" >
+                    <div class="tabs-container" >
+                        <ul class="nav nav-tabs">
+                            <li  class="" style="float: right;margin-left: 10px;">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfoInfoDlg.download()" >
+                                    <i class="fa fa-download"></i>&nbsp;打包下载
+                                </button>
+                            </li>
+                            <li  class="" style="float: right;">
+                                <button type="button" class="btn btn-sm btn-info " onclick="$('#fileTable').bootstrapTable('expandAllRows');" >
+                                    <i class="fa fa-caret-square-o-down"></i>&nbsp;显示附件
+                                </button>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="tab-content">
+                        <div id="tab-1" class="tab-pane active">
+                            <div class="panel-body" >
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">申报信息</div>
+                                    <div class="panel-body">
+                                        <form id="talentInfoForm" class="form-horizontal" action="/api/talentInfo/upsert" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                                            <div class="col-sm-12 form-group-sm">
+                                                <input type="hidden" name="id" id="id" value="{$info.id}">
+                                                <input type="hidden" name="type" id="type" value="1">
+                                                <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
+                                                <div class="row">
+                                                    <div class="col-sm-11">
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>人才类型</label>
+                                                            <select class="form-control" id="talent_type" name="talent_type" value="{$info.card_type}">
+                                                                <option value="" data-value="{$info.talent_type}" selected="">{$info.talentTypeName}</option>
+                                                            </select>
+                                                        </div>
+                                                        {if condition="in_array($info['talent_type'],[1,2])"}
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
+                                                            <input type="text" class="form-control" id="tax_insurance_month" name="tax_insurance_month" value="{$info.tax_insurance_month}" />
+                                                        </div>
+                                                        {else/}
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>劳动合同起止时间</label>
+                                                            <input type="text" class="form-control" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$info.labor_contract_rangetime}" />
+                                                        </div>
+                                                        {/if}
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
+                                                            <input type="text" class="form-control" id="enterprise_name" name="enterprise_name" value="{$info.enterpriseName}" />
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>单位标签</label>
+                                                            <input type="text" class="form-control" id="enterprise_tag" name="enterprise_tag" value="{$info.enterpriseTagName}" />
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>所属街道</label>
+                                                            <input type="text" class="form-control" id="street" name="street" value="{$info.streetName}" />
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>行业领域</label>
+                                                            <input type="text" class="form-control" id="industry_field" name="industry_field" value="{$info.industryFieldName}">
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
+                                                            <input type="text" class="form-control" id="name" name="name" value="{$info.name}" />
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>                                                           
+                                                            <select class="form-control" id="cardType" name="cardType" value="{$info.card_type}">
+                                                                {eq name="info.card_type" value="1"}<option value="1">身份证</option>{/eq}
+                                                                {eq name="info.card_type" value="2"}<option value="2">通行证</option>{/eq}
+                                                                {eq name="info.card_type" value="3"}<option value="3">护照</option>{/eq}
+                                                            </select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
+                                                            <input class="form-control" id="card_type" name="card_type" value="{$info.card_number}">
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>                                                            
+                                                            <input type="text" class="form-control" id="sex" name="sex" value="{eq name='info.sex' value='1'}男{else/}女{/eq}" />
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
+                                                            <input type="text" class="form-control" id="birthday" name="birthday" value="{$info.birthday}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
+                                                            <input class="form-control" id="nationality" name="nationality" value="{$info.nationalityName}">
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
+                                                            <input class="form-control" id="province" name="province" value="{$info.provinceName}{$info.cityName}{$info.countyName}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>民族</label>
+                                                            <input class="form-control" id="nation" name="nation" value="{$info.nationName}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
+                                                            <input class="form-control" id="politics" name="politics" value="{$info.politicsName}"/>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-sm-1">
+                                                        <img id="photoImg" src="{$info.headimgurl}"  style="height: 110px;width: 76px;padding-bottom: 5px;">
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <label class="col-sm-12 control-label spacing" style="text-align: left"><span style="color: red">声明：本人对输入材料的真实性负全部责任</span></label>
+                                                </div>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">附件</div>
+                                    <div class="panel-body">
+                                        <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                                            <thead>
+                                                <tr>
+                                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                                </tr>
+                                            </thead>
+                                        </table>
+                                    </div>
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                                    <table id="logTable">
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="tab-2" class="tab-pane ">
+                            <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

app/admin/view/Talent/talentInfo_common_check.html

@@ -1,4 +1,5 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .spacing {
         margin-bottom: 10px;
@@ -42,6 +43,11 @@
         word-break: break-word;
         white-space: inherit;
     }
+    .panel-default>.panel-heading {
+        color:#333;
+        background-color:#f5f5f5;
+        border-color:#ddd
+    }
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
@@ -50,8 +56,6 @@
                 <div class="col-sm-12" >
                     <div class="tabs-container" >
                         <ul class="nav nav-tabs">
-                            <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">基本信息</a></li>
-                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="TalentInfoInfoDlg.initFileTable()"  aria-expanded="false">申报附件</a></li>
                             <li  class="" style="float: right;margin-left: 10px;">
                                 <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfoInfoDlg.download()" >
                                     <i class="fa fa-download"></i>&nbsp;打包下载
@@ -68,261 +72,266 @@
                         <div id="tab-1" class="tab-pane active">
                             <div class="panel-body" >
                                 <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">申报信息<span style="color: red;">(${item.year}年度)</span></div>
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">申报信息</div>
                                     <div class="panel-body">
-                                        <form id="talentInfoForm" class="form-horizontal" action="${ctxPath}/api/talentInfo/upsert" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                                        <form id="talentInfoForm" class="form-horizontal" action="/api/talentInfo/upsert" method="post" enctype="multipart/form-data" target="hiddenIframe">
                                             <div class="col-sm-12 form-group-sm">
-                                                <input type="hidden" name="id" id="id" value="${item.id}">
-                                                <input type="hidden" name="type" id="type" value="${item.type}">
-                                                <input type="hidden" name="checkState" id="checkState" value="${item.checkState}">
-                                                <input type="hidden" id="process" value="${item.process}">
-                                                <input type="hidden" id="companyId" value="${companyId}">
-                                                <input type="hidden" id="talentType" name="talentType" value="${item.talentType}"/>
+                                                <input type="hidden" name="id" id="id" value="{$info.id}">
+                                                <input type="hidden" name="type" id="type" value="1">
+                                                <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
                                                 <div class="row">
                                                     <div class="col-sm-11">
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
-                                                            <input type="text" class="form-control" id="name" name="name" value="${item.name}" />
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
-                                                            <select class="form-control" id="sex" name="sex" value="${item.sex}">
-                                                                <option value="">请选择</option>
-                                                                <option value="1">男</option>
-                                                                <option value="2">女</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
-                                                            <input type="text" class="form-control date" id="birthday" name="birthday" value="${item.birthday}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
-                                                            <input class="form-control" id="nationality" name="nationality" value="${item.nationalityName}">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
-                                                            <input class="form-control" id="provinceCode" name="provinceCode" value="${item.provinceName}${item.cityName}${item.countyName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>民族</label>
-                                                            <input class="form-control" id="nation" name="nation" value="${item.nationName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
-                                                            <input class="form-control" id="politics" name="politics" value="${item.politicsName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" id="cardType" name="cardType" value="${item.cardType}">
-                                                                <option value="">请选择</option>
-                                                                <option value="1">身份证</option>
-                                                                <option value="2">通行证</option>
-                                                                <option value="3">护照</option>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>人才类型</label>
+                                                            <select class="form-control">
+                                                                <option>{$info.talentTypeName}</option>
                                                             </select>
                                                         </div>
+                                                        {if condition="in_array($info['talent_type'],[1,2])"}
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
-                                                            <input class="form-control" id="idCard" name="idCard" value="${item.idCard}">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
+                                                            <input type="text" class="form-control" id="tax_insurance_month" name="tax_insurance_month" value="{$info.tax_insurance_month}" />
                                                         </div>
+                                                        {else/}
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>首次来晋工作时间</label>
-                                                            <input type="text" class="form-control" id="firstInJJTime" name="firstInJJTime" value="${item.firstInJJTime}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>劳动合同起止时间</label>
+                                                            <input type="text" class="form-control" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$info.labor_contract_rangetime}" />
                                                         </div>
+                                                        {/if}
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
-                                                            <input type="text" class="form-control" id="companyName"  name="companyName" readonly="readonly" value="${item.enterpriseName}" />
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>行业领域</label>
-                                                            <input type="text" class="form-control" id="industryFieldName" name="industryFieldName" value="${item.industryFieldName}">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>所属镇街</label>
-                                                            <input class="form-control" id="address" name="address" value="${item.streetName}">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>申报来源</label>
-                                                            <select class="form-control" id="source" name="source" onchange="TalentInfoInfoDlg.sourceChange()" value="${item.source}"
-                                                                @if(item.source == 1){
-                                                                    title="经我市申报并已经成功入选的泉州高层次人才"
-                                                                @}
-                                                                @if(item.source == 2){
-                                                                    title="从我市以外的其他县（市、区）变动到我市工作的泉州市高层次人才"
-                                                                @}
-                                                                @if(item.source == 3){
-                                                                    title="依据《晋江市优秀人才补充认定标准》申报认定"
-                                                                @}
-                                                                >
-                                                                <option value="">请选择</option>
-                                                                <option value="1">经我市申报并已经成功入选的泉州高层次人才</option>
-                                                                <option value="2">从我市以外的其他县（市、区）变动到我市工作的泉州市高层次人才</option>
-                                                                <option value="3">依据《晋江市优秀人才补充认定标准》申报认定</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>公布入选来源</label>
-                                                            <select class="form-control" id="ourCitySource" name="ourCitySource" value="${item.ourCitySource}"
-                                                                    @if(item.ourCitySource == 1){
-                                                                    title="泉州市公布入选的泉州市第一至第五层次人才"
-                                                                    @}
-                                                                    @if(item.ourCitySource == 2){
-                                                                    title="晋江市公布入选的泉州市高层次第六七层次人才"
-                                                                    @}
-                                                                >
-                                                                <option value="">请选择</option>
-                                                                <option value="1">泉州市公布入选的泉州市第一至第五层次人才</option>
-                                                                <option value="2">晋江市公布入选的泉州市高层次第六七层次人才</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>入选来源县市</label>
-                                                            <input class="form-control" id="fromCityName" name="fromCityName" value="${item.fromCityName}">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>入选名单批次</label>
-                                                            <input type="text" class="form-control" id="qzBatch"  name="qzBatch" value="${item.qzBatch}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
-                                                            <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书发证日期</label>
-                                                            <input type="text" class="form-control" id="certificateStartTime" name="certificateStartTime" value="${item.certificateStartTime}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
-                                                            <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书有效期</label>
-                                                            <input type="text" class="form-control" id="qzgccrcActiveTime" name="qzgccrcActiveTime" value="${item.qzgccrcActiveTime}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>
-                                                            <input class="form-control" id="talentArrange" name="talentArrange" value="${item.talentArrangeName}" />
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
-                                                            <input class="form-control" id="identifyCondition" name="identifyCondition" value="${item.identifyConditionText}" title="${item.identifyConditionText}">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>认定条件名称</label>
-                                                            <input type="text" class="form-control" id="identifyConditionName" name="identifyConditionName" value="${item.identifyConditionName}" title="${item.identifyConditionName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
-                                                            <input type="text" class="form-control" id="identifyGetTime" name="identifyGetTime" value="${item.identifyGetTime}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>人才标签</label>
-                                                            <input class="form-control" data-toggle="tooltip" title="企业标签:${item.enterpriseTalentTypeName}" id="talentTypeName" name="talentTypeName" value="${item.talentTypeName}"  >
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>首次来晋行政介绍信时间</label>
-                                                            <input type="text" class="form-control" id="letterTime" name="letterTime" value="${item.letterTime}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>引进方式</label>
-                                                            <input class="form-control" id="introductionModeName" name="introductionModeName" value="${item.introductionModeName}" data-placeholder="引进方式">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>本单位入职时间</label>
-                                                            <input type="text" class="form-control date" id="entryTime" name="entryTime" value="${item.entryTime}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>职务</label>
-                                                            <input type="text" class="form-control" id="post" name="post" value="${item.post}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>工作合同开始时间</label>
-                                                            <input type="text" class="form-control" id="startTime" name="startTime" value="${item.startTime}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>工作合同结束时间</label>
-                                                            <input type="text" class="form-control" id="endTime" name="endTime" value="${item.endTime}"/>
+                                                            <input type="text" class="form-control" id="enterprise_name" name="enterprise_name" value="{$info.enterpriseName}" />
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>
-                                                            <input type="text" class="form-control" id="lastYearWages" name="lastYearWages" value="${item.lastYearWages}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>单位标签</label>
+                                                            <input type="text" class="form-control" id="enterprise_tag" name="enterprise_tag" value="{$info.enterpriseTagName}" />
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>最高学历</label>
-                                                            <input class="form-control" id="highEducation" name="highEducation" value="${item.educationName}">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>所属街道</label>
+                                                            <input type="text" class="form-control" id="street" name="street" value="{$info.streetName}" />
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
-                                                            <input type="text" class="form-control" id="graduateSchool" name="graduateSchool" value="${item.graduateSchool}">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>专业</label>
-                                                            <input type="text" class="form-control" id="major" name="major" value="${item.major}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing">职称</label>
-                                                            <input type="text" class="form-control" id="title" name="title" value="${item.title}" title="${item.title}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>行业领域</label>
+                                                            <input type="text" class="form-control" id="industry_field" name="industry_field" value="{$info.industryFieldName}">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing">国家职业资格</label>
-                                                            <input type="text" class="form-control" id="professionalQualifications" name="professionalQualifications" value="${item.professionalQualifications}" title="${item.professionalQualifications}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
+                                                            <input type="text" class="form-control" id="name" name="name" value="{$info.name}" />
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing">是否有留学经历</label>
-                                                            <select class="form-control" id="studyAbroad" name="studyAbroad" value="${item.studyAbroad}">
-                                                                <option value="2">否</option>
-                                                                <option value="1">是</option>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
+                                                            <select class="form-control" id="cardType" name="cardType" value="{$info.card_type}">
+                                                                {eq name="info.card_type" value="1"}<option value="1">身份证</option>{/eq}
+                                                                {eq name="info.card_type" value="2"}<option value="2">通行证</option>{/eq}
+                                                                {eq name="info.card_type" value="3"}<option value="3">护照</option>{/eq}
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>手机号码</label>
-                                                            <input type="text" class="form-control" id="phone" name="phone" value="${item.phone}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>电子邮箱</label>
-                                                            <input type="text" class="form-control" id="email" name="email" value="${item.email}" title="${item.email}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
+                                                            <input class="form-control" id="card_type" name="card_type" value="{$info.card_number}">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>开户银行</label>
-                                                            <input type="text" class="form-control" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" placeholder="XX银行" value="${item.bank}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>                                                            
+                                                            <input type="text" class="form-control" id="sex" name="sex" value="{eq name='info.sex' value='1'}男{else/}女{/eq}" />
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
-                                                            <input type="text" class="form-control" id="bankNumber" name="bankNumber" value="${item.bankNumber}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
+                                                            <input type="text" class="form-control" id="birthday" name="birthday" value="{$info.birthday}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
-                                                            <input type="text" class="form-control" id="bankNetwork" name="bankNetwork" placeholder="XX银行XX省XX市XX支行/分行/分理处" value="${item.bankNetwork}" title="${item.bankNetwork}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
+                                                            <input class="form-control" id="nationality" name="nationality" value="{$info.nationalityName}">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
-                                                            <input type="text" class="form-control" id="bankAccount" name="bankAccount" value="${item.bankAccount}"/>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
+                                                            <input class="form-control" id="province" name="province" value="{$info.provinceName}{$info.cityName}{$info.countyName}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>是否曾被相关主管部门列为失信个人</label>
-                                                            <select class="form-control" id="breakFaith" name="breakFaith" value="${item.breakFaith}">
-                                                                <option value="2">否</option>
-                                                                <option value="1">是</option>
-                                                            </select>
+                                                            <label class="control-label spacing"><span style="color: red">*</span>民族</label>
+                                                            <input class="form-control" id="nation" name="nation" value="{$info.nationName}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing">企业标签</label>
-                                                            <input class="form-control" id="enterpriseTalentTypeName" name="enterpriseTalentTypeName" value="${item.enterpriseTalentTypeName}">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
+                                                            <input class="form-control" id="politics" name="politics" value="{$info.politicsName}"/>
                                                         </div>
                                                     </div>
                                                     <div class="col-sm-1">
-                                                        <img id="photoImg" src="${item.photo}"  style="height: 110px;width: 76px;padding-bottom: 5px;">
+                                                        <img id="photoImg" src="{$info.headimgurl}"  style="height: 110px;width: 76px;padding-bottom: 5px;">
                                                     </div>
                                                 </div>
-                                                <div class="row">
-                                                    <div class="rowGroup col-sm-12">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>教育背景及工作简历</label>
-                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="educationAndResume" name="educationAndResume" rows="4">${item.educationAndResume}</textarea>
+                                            </div>
+                                        </form>
+                                    </div>
+
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">个人信息填报及人才认定申请</div>
+                                    <div class="panel-body">
+                                        <div class="col-sm-12 form-group-sm">
+                                            <div class="row">
+                                                <div class="col-sm-11">                          
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>申报年度</label>
+                                                        <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$info.apply_year}" readonly disabled>
                                                     </div>
-                                                </div>
-                                                <div class="row">
-                                                    <div class="rowGroup col-sm-12">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>主要业绩及取得的荣誉</label>
-                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="mainHonours" name="mainHonours" rows="4">${item.mainHonours}</textarea>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>首次来晋工作时间</label>
+                                                        <input type="text" class="form-control date" id="fst_work_time" value="{$info.fst_work_time}"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>引进方式</label>
+                                                        <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式">
+                                                            <option>{$info.importWayName}</option>
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>本单位入职时间</label>
+                                                        <input type="text" class="form-control date" id="cur_entry_time" value="{$info.cur_entry_time}"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>本单位现任职务</label>
+                                                        <input type="text" class="form-control" id="position" value="{$info.position}"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>申报来源</label>
+                                                        <select class="form-control" id="source" >
+                                                            <option>{$info.sourceName}</option>
+                                                        </select>
+                                                    </div>
+                                                    {if condition="$info['source_city']"}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
+                                                        <select class="form-control" id="source_city" name="source_city"></select>
+                                                    </div>
+                                                    {/if}
+                                                    {if condition="$info['source_county']"}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
+                                                        <select class="form-control" id="source_county" name="source_county"></select>
+                                                    </div>
+                                                    {/if}
+                                                    {if condition="$info['source_batch']"}                                                
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing" ><span style="color: red">*</span>入选名单批次</label>
+                                                        <input type="text" class="form-control" id="source_batch" value="{$info.source_batch}"/>
+                                                    </div>
+                                                    {/if}
+                                                    {if condition="$info['fujian_highcert_pubtime']"}                                                
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书发证日期</label>
+                                                        <input type="text" class="form-control date" id="fujian_highcert_pubtime" value="{$info.fujian_highcert_pubtime}"/>
+                                                    </div>
+                                                    {/if}
+                                                    {if condition="$info['fujian_highcert_exptime']"}                                                
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书有效期</label>
+                                                        <input type="text" class="form-control date" id="fujian_highcert_exptime" value="{$info.fujian_highcert_exptime}"/>
+                                                    </div>
+                                                    {/if}
+                                                    {if condition="$info['quanzhou_highcert_pubtime']"}    
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书发证日期</label>
+                                                        <input type="text" class="form-control date" id="quanzhou_highcert_pubtime" value="{$info.quanzhou_highcert_pubtime}"/>
+                                                    </div>
+                                                    {/if}
+                                                    {if condition="$info['quanzhou_highcert_exptime']"}    
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书有效期</label>
+                                                        <input type="text" class="form-control date" id="quanzhou_highcert_exptime" value="{$info.quanzhou_highcert_exptime}"/>
+                                                    </div>
+                                                    {/if}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>
+                                                        <select class="form-control" id="talent_arrange" name="talent_arrange">
+                                                            <option>{$info.talentArrangeName}</option>
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
+                                                        <select class="form-control" >
+                                                            <option>{$info.talentConditionName}</option>
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>最高学历</label>
+                                                        <select class="form-control" >
+                                                            <option>{$info.highestDegreeName}</option>
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
+                                                        <input type="text" class="form-control" id="graduate_school" value="{$info.graduate_school}">
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>专业</label>
+                                                        <input type="text" class="form-control" id="major" value="{$info.major}"/>
+                                                    </div>
+                                                    {if condition="$info['professional']"}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing">专业技术职称</label>
+                                                        <input type="text" class="form-control" id="professional" value="{$info.professional}"/>
+                                                    </div>{/if}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>开户银行</label>
+                                                        <input type="text" class="form-control" onchange="" id="bank" value="{$info.bank}" placeholder="XX银行"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
+                                                        <input type="text" class="form-control" id="bank_number" value="{$info.bank_number}"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
+                                                        <input type="text" class="form-control" id="bank_branch_name" value="{$info.bank_branch_name}" placeholder="XX银行XX省XX市XX支行/分行/分理处"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
+                                                        <input type="text" class="form-control" id="bank_account" value="{$info.bank_account}" />
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing">是否有留学经历</label>
+                                                        <select class="form-control" id="study_abroad" >
+                                                            <option value="2" {eq name="study_abroad" value="2"}selected{/eq} >否</option>
+                                                            <option value="1" {eq name="study_abroad" value="1"}selected{/eq} >是</option>
+                                                        </select>
+                                                    </div>                                                
+                                                    {if condition="$info['abroad_school']"}   
+                                                    <div class="rowGroup col-sm-3 abroad_need_this">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
+                                                        <input type="text" class="form-control" id="abroad_school" value="{$info.abroad_school}" maxlength="11"/>
+                                                    </div>
+                                                    {/if}                                                
+                                                    {if condition="$info['abroad_major']"}   
+                                                    <div class="rowGroup col-sm-3 abroad_need_this">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>专业</label>
+                                                        <input type="text" class="form-control" id="abroad_major" value="{$info.abroad_major}" maxlength="11"/>
+                                                    </div>
+                                                    {/if}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>手机号码</label>
+                                                        <input type="text" class="form-control" id="phone" value="{$info.phone}" maxlength="11"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>电子邮箱</label>
+                                                        <input type="text" class="form-control" id="email" value="{$info.email}"/>
                                                     </div>
-                                                </div>
-                                                <div class="row">
-                                                    <label class="col-sm-12 control-label spacing" style="text-align: left"><span style="color: red">声明：本人对输入材料的真实性负全部责任</span></label>
                                                 </div>
                                             </div>
-                                        </form>
+                                            <div class="row">
+                                                <label class="col-sm-12 control-label spacing" style="text-align: left"><span style="color: red">声明：本人对输入材料的真实性负全部责任</span></label>
+                                            </div>
+                                        </div>
+                                    </div> 
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">附件</div>
+                                    <div class="panel-body">
+                                        <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                                            <thead>
+                                                <tr>
+                                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                                </tr>
+                                            </thead>
+                                        </table>
                                     </div>
                                 </div>
                                 <div class="panel panel-default">
@@ -333,7 +342,6 @@
                             </div>
                         </div>
                         <div id="tab-2" class="tab-pane ">
-                            <#table id="fileTable"/>
                             <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label>
                         </div>
                     </div>
@@ -342,129 +350,7 @@
         </div>
     </div>
 </div>
-<!--&lt;!&ndash;审核模态框&ndash;&gt;-->
-<!--<div class="modal fade " id="commonModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">-->
-<!--    <div class="modal-dialog" role="document">-->
-<!--        <div class="modal-content animated flipInY">-->
-<!--            <div class="modal-header">-->
-<!--                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>-->
-<!--                <h4 class="modal-title" id="basicModalLabel">审核</h4>-->
-<!--            </div>-->
-<!--            <div class="modal-body">-->
-<!--                <form id="commonCheckForm">-->
-<!--                    <div class="form-group">-->
-<!--                        <label for="checkState" class="control-label">审核状态</label>-->
-<!--                        <select class="form-control" id="checkStateModal" onchange="TalentInfoInfoDlg.toggledepField()">-->
-<!--                            <option value=""></option>-->
-<!--                            <option value="3">审核通过</option>-->
-<!--                            <option value="2">审核驳回</option>-->
-<!--                        </select>-->
-<!--                    </div>-->
-<!--                    <div class="form-group">-->
-<!--                        <label for="checkMsg" class="control-label">审核意见</label>-->
-<!--                        <textarea class="form-control" id="checkMsg" placeholder="审核状态属“审核通过”的，仅代表此步骤已操作完成，不代表用户提交的信息符合认定条件。若不符合认定条件的，请写明不符合原因。" rows="6"></textarea>-->
-<!--                    </div>-->
-<!--                </form>-->
-<!--            </div>-->
-<!--            <div class="modal-footer">-->
-<!--                <button type="button" class="btn btn-primary" onclick="TalentInfoInfoDlg.commonCheck()">提交</button>-->
-<!--                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--    </div>-->
-<!--</div>-->
-
-<!--审核模态框-->
-<!--<div class="modal fade " id="firstModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">-->
-<!--    <div class="modal-dialog modal-lg" role="document">-->
-<!--        <div class="modal-content animated flipInY">-->
-<!--            <div class="modal-header">-->
-<!--                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>-->
-<!--                <h4 class="modal-title" id="firstModalLabel">初级审核</h4>-->
-<!--            </div>-->
-<!--            <div class="modal-body" id="neewFieldForm">-->
-<!--                <form id="firstCheckForm">-->
-<!--                    <div class="form-group" style="margin: 10px;">-->
-<!--                        <label for="checkState" class="control-label">审核状态</label>-->
-<!--                        <select class="form-control" id="checkStateFirstModal" onchange="TalentInfoInfoDlg.toggleField()">-->
-<!--                            <option value="">请选择</option>-->
-<!--                            <option value="3">审核通过</option>-->
-<!--                            <option value="2">审核驳回</option>-->
-<!--                            <option value="-1">审核不通过</option>-->
-<!--                        </select>-->
-<!--                    </div>-->
-<!--                    <div class="form-group" style="margin: 10px;">-->
-<!--                        <label for="checkMsg" class="control-label" >审核意见</label>-->
-<!--                        <textarea class="form-control" id="checkMsgFirst" placeholder="审核状态属“审核通过”的，仅代表此步骤已操作完成，不代表用户提交的信息符合认定条件。若不符合认定条件的，请写明不符合原因。" rows="6"></textarea>-->
-<!--                        <div id="field" style="padding-top: 5px;display: none">-->
-<!--                            <label for="checkMsg" class="control-label">可修改字段</label>-->
-<!--                            <div id="field_info">-->
-<!--                                <ul>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="name"><span>姓名</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="sex"><span>性别</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="birthday"><span>出生日期</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="nationality"><span>国籍/地区</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="provinceCode" onchange="TalentInfoInfoDlg.fieldCheckd(this)"><span>籍贯省</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="cityCode" onchange="TalentInfoInfoDlg.fieldCheckd(this)"><span>籍贯市</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="countyCode"><span>籍贯县</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="nation"><span>民族</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="politics"><span>政治面貌</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="cardType"><span>证件类型</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="idCard"><span>证件号码</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="firstInJJTime"><span>首次来晋工作时间</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="source"><span>申报来源</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="ourCitySource"><span>公布入选来源</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="fromCity"><span>入选来源县市</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="qzBatch"><span>入选名单批次</span></li>-->
-<!--                                    <li style="width:31%"><input type="checkbox" value="certificateStartTime"><span>泉州高层次人才证书发证日期</span></li>-->
-<!--                                    <li style="width:31%"><input type="checkbox" value="qzgccrcActiveTime"><span>泉州高层次人才证书的有效期</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="talentArrange" onchange="TalentInfoInfoDlg.fieldCheckd(this)"><span>人才层次</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="identifyCondition"><span>认定条件</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="talentType"><span>人才标签</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="letterTime"><span>首次来晋行政介绍信时间</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="introductionMode"><span>引进方式</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="post"><span>职务</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="highEducation"><span>最高学历</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="major"><span>专业</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="title"><span>职称</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="studyAbroad"><span>是否有留学经历</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="phone"><span>手机号码</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="email"><span>电子邮箱</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="bank"><span>开户银行</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>-->
-<!--                                    <li style="width:10%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>-->
-<!--                                    <li style="width:31%"><input type="checkbox" value="breakFaith"><span>曾被相关主管部门列为失信个人</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="educationAndResume"><span>教育背景及工作简历</span></li>-->
-<!--                                    <li style="width:20.5%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>-->
-<!--                                </ul>-->
-<!--                            </div>-->
-<!--                            <label for="checkMsg" class="control-label">可修改附件</label>-->
-<!--                            <div id="field_file">-->
-<!--                            </div>-->
-<!--                            <div class="form-group" style="text-align: center">-->
-<!--                                <button type="button" class="btn btn-primary" onclick="TalentInfoInfoDlg.checkAll()">全选</button>-->
-<!--                                <button type="button" class="btn btn-success" onclick="TalentInfoInfoDlg.unCheckAll()">反选</button>-->
-<!--                            </div>-->
-<!--                        </div>-->
-<!--                    </div>-->
-<!--                </form>-->
-<!--            </div>-->
-<!--            <div class="modal-footer">-->
-<!--                <button type="button" class="btn btn-primary" onclick="TalentInfoInfoDlg.firstCheck()">提交</button>-->
-<!--                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--    </div>-->
-<!--</div>-->
-<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js"></script>-->
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
-@}
+{/block}

app/common.php

@@ -66,3 +66,36 @@ function getTreeList($array, $id_field = "id", $pid_field = "pid", $value = "0")
     }
     return $result;
 }
+
+/**
+ * 读取excel
+ * @param type $filepath
+ * @param type $sheetIndex
+ * @return type
+ */
+function getExcelDatas($filepath, $sheetIndex = 0) {
+    $reader_type = \PHPExcel_IOFactory::identify($filepath);
+    $reader = \PHPExcel_IOFactory::createReader($reader_type);
+    $phpexcel = $reader->load($filepath);
+    $sheet = $phpexcel->getSheet($sheetIndex);
+    return $sheet->toArray();
+}
+
+/**
+ * 检查是不是excel格式，不确定是否都是可用文件，主要还是第一和最后一个比较常见
+ * @param type $mime
+ * @return type
+ */
+function isExcelFile($mime) {
+    return in_array($mime, [
+        "application/vnd.ms-excel",
+        "application/msexcel",
+        "application/x-msexcel",
+        "application/x-ms-excel",
+        "application/x-excel",
+        "application/x-dos_ms_excel",
+        "application/xls",
+        "application/x-xls",
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+    ]);
+}

app/common/api/BatchApi.php

@@ -148,12 +148,17 @@ class BatchApi {
      * @param type $type 申报类别
      * @param type $talentType 人才类型
      */
-    public static function checkBatchValid($type, $talentType) {
+    public static function checkBatchValid($params, $talentType) {
         $now = time();
         $where = [];
         $where[] = ["active", "=", 1];
         $where[] = ["source", "=", $talentType];
-        $where[] = ["type", "=", $type];
+        if ($params["type"]) {
+            $where[] = ["type", "=", $params["type"]];
+        }
+        if ($params["year"]) {
+            $where[] = ["batch", "=", $params["year"]];
+        }
         $batch = Batch::where($where)->findOrEmpty();
         if (!$batch)
             return ["msg" => "该申报未启动"];
@@ -164,4 +169,21 @@ class BatchApi {
         return ["code" => 200, "batch" => $batch["batch"]];
     }
 
+    /**
+     * 
+     * @param type $type 申报项目
+     * @param type $talentType 人才类型
+     * @return type
+     */
+    public static function getValidBatch($type, $talentType) {
+        $now = date("Y-m-d H:i:s");
+        $where = [];
+        $where[] = ["active", "=", 1];
+        $where[] = ["type", "=", $type];
+        $where[] = ["source", "=", $talentType];
+        $where[] = ["startTime", "<", $now];
+        $where[] = ["endTime", ">", $now];
+        return $batch = Batch::where($where)->order("createTime desc")->findOrEmpty();
+    }
+
 }

app/common/api/DictApi.php

@@ -138,4 +138,136 @@ class DictApi {
         return $dict;
     }
 
+    public static function getTalentFields($step) {
+        $dict1 = [
+            "talent_type" => "人才类型",
+            "tax_insurance_month" => "在我市缴交社会保险或个人所得税月份",
+            "labor_contract_rangetime" => "劳动合同起止时间",
+            "name" => "姓名",
+            "card_type" => "证件类型",
+            "card_number" => "证件号码",
+            "sex" => "性别",
+            "birthday" => "出生日期",
+            "nationality" => "国籍/地区",
+            "province" => "籍贯省",
+            "city" => "籍贯市",
+            "county" => "籍贯县",
+            "nation" => "民族",
+            "politics" => "政治面貌"
+        ];
+        $dict2 = [
+            "talent_arrange" => "人才层次",
+            "talent_condition" => "认定条件",
+            "highest_degree" => "最高学历",
+            "graduate_school" => "毕业院校",
+            "major" => "专业",
+            "professional" => "专业技术职称",
+            "bank" => "开户银行",
+            "bank_number" => "银行行号",
+            "bank_branch_name" => "开户银行网点",
+            "bank_account" => "银行账号",
+            "study_abroad" => "是否有留学经历",
+            "abroad_school" => "留学毕业院校",
+            "abroad_major" => "留学专业",
+            "phone" => "手机号码",
+            "email" => "电子邮箱",
+            "apply_year" => "申报年度",
+            "import_way" => "引进方式",
+            "fst_work_time" => "首次来晋工作时间",
+            "cur_entry_time" => "本单位入职时间",
+            "position" => "本单位现任职务",
+            "source" => "申报来源",
+            "source_city" => "入选来源地级市",
+            "source_county" => "入选来源县市区",
+            "source_batch" => "入选名单批次",
+            "fujian_highcert_pubtime" => "福建省高层次人才证书发证日期",
+            "fujian_highcert_exptime" => "福建省高层次人才证书有效期",
+            "quanzhou_highcert_pubtime" => "泉州高层次人才证书发证日期",
+            "quanzhou_highcert_exptime" => "泉州高层次人才证书有效期"
+        ];
+        if ($step == 1) {
+            return $dict1;
+        }
+        if ($step == 2) {
+            return $dict2;
+        }
+        return array_merge($dict1, $dict2);
+    }
+    
+    // 1保存未提交 2已提交未审核 3已审核 4驳回 5保存补充材料未提交 6提交补充材料进入初审 7初审通过 8初审驳回 9部门审核通过 10部门审核驳回 11复核通过 12复核驳回 13复核失败
+    public static function getTalentInfoStepByState($state) {
+        $stepName = "";
+        switch ($state) {
+            case 3:
+            case 4:
+                $stepName = '<span class="label">"基本条件判定"</span>';
+                break;
+            case 7:
+            case 8:
+                $stepName = '<span class="label label-primary">初级审核</span>';
+                break;
+            case 9:
+            case 10:
+                $stepName = '<span class="label label-primary">部门审核</span>';
+                break;
+            case 11:
+            case 12:
+                $stepName = '<span class="label label-danger">复核</span>';
+                break;
+            case 13:
+                $stepName = '<span class="label label-danger">审核不通过</span>';
+                break;
+            default:
+                $stepName = '<span class="label">用户操作</span>';
+                break;
+        }
+        return $stepName;
+    }
+
+    public static function getTalentInfoStateName($state) {
+        $str = "";
+        switch ($state) {
+            case 1:
+                $str = '<span class="label">待提交基本资料</span>';
+                break;
+            case 2:
+                $str = '<span class="label label-success">待审核</span>';
+                break;
+            case 3:
+                $str = '<span class="label">待提交认定资料</span>';
+                break;
+            case 4:
+                $str = '<span class="label label-danger">初审驳回</span>';
+                break;
+            case 5:
+                $str = '<span class="label">待提交</span>';
+                break;
+            case 6:
+                $str = '<span class="label label-success">待初审</span>';
+                break;
+            case 7:
+                $str = '<span class="label label-success">待复核</span>';
+                break;
+            case 8:
+                $str = '<span class="label label-success">待初审</span>';
+                break;
+            case 9:
+                $str = '<span class="label label-success">待复核</span>';
+                break;
+            case 10:
+                $str = '<span class="label label-success">待初审</span>';
+                break;
+            case 11:
+                $str = '<span class="label label-primary">复核通过</span>';
+                break;
+            case 12:
+                $str = '<span class="label label-danger">待重新审核</span>';
+                break;
+            case 13:
+                $str = '<span class="label label-danger">审核不通过</span>';
+                break;
+        }
+        return $str;
+    }
+
 }

app/common/api/UserApi.php

@@ -48,6 +48,11 @@ class UserApi {
         return $role->toArray();
     }
 
+    public function getCompany() {
+        $company = \app\common\model\Company::findOrEmpty($this->info["companyId"])->toArray();
+        return $company;
+    }
+
     /**
      * 返回用户信息
      * @return type
@@ -119,6 +124,8 @@ class UserApi {
                 session("user", [
                     "uid" => $user["id"],
                     "roleid" => $user["roleid"],
+                    "companyId" => $user["companyId"],
+                    "companyName" => $this->getCompany()["name"],
                     "account" => $user["account"],
                     "name" => $user["name"],
                     "avatar" => $user["avatar"],

app/common/controller/Api.php

@@ -5,7 +5,9 @@ namespace app\common\controller;
 use app\BaseController;
 use app\common\middleware\Auth;
 use think\facade\Db;
-use think\facade\Config;
+use app\enterprise\api\TalentApi;
+use app\common\api\TalentLogApi;
+use app\common\api\DictApi;
 
 /**
  * 需要权限的公共方法放这
@@ -23,13 +25,57 @@ class Api extends BaseController {
         $this->user = session("user");
     }
 
+    public function findIdentifyConditionByLevel() {
+        $params = $this->request->param();
+        $id = $params["id"];
+        if ($this->user["usertype"] == 2) {
+            $type = $this->user["type"];
+        } else {
+            $talentInfo = TalentApi::getOne($id);
+            $enterprise = \app\common\model\Enterprise::findOrEmpty($talentInfo["enterprise_id"]);
+            $type = $enterprise["type"];
+        }
+        $list = \app\common\api\TalentConditionApi::getList($params["level"], $type);
+        return json($list, 200);
+    }
+
+    public function getCheckLog() {
+        $params = $this->request->param();
+        $mainId = $params["mainId"];
+        $type = $params["type"];
+        $list = TalentLogApi::getList($type, $mainId);
+        $new_list = [];
+        foreach ($list as $item) {
+            $new_item["stepName"] = DictApi::getTalentInfoStepByState($item["state"]);
+            if ($item["state"] == 13) {
+                $new_item["stateName"] = '<span class="label label-success">审核不通过</span>';
+            } else if (in_array($item["state"], [3, 7, 9, 11])) {
+                $new_item["stateName"] = '<span class="label label-primary">审核通过</span>';
+            } else if (in_array($item["state"], [4, 8, 10, 12])) {
+                $new_item["stateName"] = '<span class="label label-danger">审核驳回</span>';
+            } else {
+                $new_item["stateName"] = '<span class="label label-success">待审核</span>';
+            }
+            if ($item["last_state"] && $item["state"]) {
+                $new_item["stateChange"] = sprintf("%s -> %s", DictApi::getTalentInfoStateName($item["last_state"]), DictApi::getTalentInfoStateName($item["state"]));
+            } else {
+                $new_item["stateChange"] = "";
+            }
+            $new_item["description"] = $item["description"];
+            $new_item["createUser"] = $item["createUser"];
+            $new_item["createTime"] = $item["createTime"];
+            $new_list[] = $new_item;
+        }
+        return json(["rows" => $new_list]);
+    }
+
     public function findCommonFileType() {
         $param = $this->request->param();
         $order = $param["order"];
         $project = $param["project"];
         $type = $param["type"];
         $checkState = $param["checkState"];
-        if ($checkState == 0) {
+        if (in_array($checkState, [0, 1, 2, 3])) {
             $where[] = ["step", "=", 1];
         }
         $where[] = ["project", "=", $project];
@@ -58,10 +104,18 @@ class Api extends BaseController {
         $type = $this->request->param("type");
         $upload = new \app\common\api\UploadApi();
         $file = $this->request->file("fileUrl");
-        $url = $upload->uploadOne($file, "talent_files");
+        if (!TalentApi::checkIsEditable($mainId)) {
+            $res = ["msg" => "当前状态不能修改附件", "obj" => $index];
+            echo sprintf("<script>parent.%s(%s);</script>", $backName, json_encode($res));
+            exit();
+        }
+        $filestd = $upload->uploadOne($file, "image", "talent_files");
         if ($fileId) {
-            if (!$this->chkIsFileOwner($mainId, $type))
-                return json(["msg" => "删除失败"]);
+            if (!$this->chkIsFileOwner($mainId, $type)) {
+                $res = ["msg" => "删除失败", "obj" => $index];
+                echo sprintf("<script>parent.%s(%s);</script>", $backName, json_encode($res));
+                exit();
+            }
             $old = Db::table("new_talent_file")->findOrEmpty($fileId);
             $old_filepath = "storage/" . $old["url"];
             if (file_exists($old_filepath))
@@ -72,10 +126,11 @@ class Api extends BaseController {
         $data["type"] = $type;
         $data["typeId"] = $fileTypeId;
         $data["orignName"] = $file->getOriginalName();
-        $data["url"] = $url;
+        $data["url"] = $filestd->filepath;
         $data["sn"] = $index;
         $data["createTime"] = time();
         Db::table("new_talent_file")->save($data);
+        TalentLogApi::write($type, $mainId, 0, sprintf("添加附件，附件名为：%s", $data["orignName"]), 1, $fileTypeId);
         $res = ["code" => 200, "msg" => "上传附件成功", "obj" => $index, "info" => $url];
         echo sprintf("<script>parent.%s(%s);</script>", $backName, json_encode($res));
     }
@@ -84,17 +139,97 @@ class Api extends BaseController {
         $param = $this->request->param();
         $where = [["id", "=", $param["id"]]];
         $file = Db::table("new_talent_file")->where($where)->findOrEmpty();
+
+        if (!TalentApi::checkIsEditable($file["mainId"]))
+            return json(["msg" => "当前状态不能删除"]);
         if ($this->chkIsFileOwner($file["mainId"], $file["type"])) {
             $filepath = "storage/" . $file["url"];
             if (file_exists($filepath)) {
                 unlink($filepath);
             }
             Db::table("new_talent_file")->delete($file["id"]);
+            TalentLogApi::write($file["type"], $file["mainId"], 0, sprintf("删除附件，附件名为：%s", $file["orignName"]), 1, $file["typeId"]);
             return json(["code" => 200, "msg" => "删除成功"]);
         }
         return json(["msg" => "不能删除"]);
     }
 
+    /**
+     * 下载文件
+     */
+    public function downloadFile() {
+        $param = $this->request->param();
+        $type = $param["type"];
+        $id = $param["id"];
+        $where = [];
+        $where[] = ["id", "=", $id];
+        $where[] = ["type", "=", $type];
+        $fileinfo = Db::table("new_talent_file")->where($where)->findOrEmpty();
+        $filename = $fileinfo["orignName"];
+        $filepath = "storage/" . $fileinfo["url"];     // 下载文件名
+        if (!file_exists($filepath)) {
+            header('HTTP/1.1 404 NOT FOUND');
+        } else {
+            $file = fopen($filepath, "rb");
+
+            Header("Content-type: application/octet-stream");
+            Header("Accept-Ranges: bytes");
+            Header("Accept-Length: " . filesize($filepath));
+            Header("Content-Disposition: attachment; filename=" . $filename);
+
+            echo fread($file, filesize($filepath));
+            fclose($file);
+
+            exit();
+        }
+    }
+
+    /**
+     * 打包下载人才申请附件
+     */
+    public function downloadZip() {
+        $param = $this->request->param();
+        $type = $param["type"];
+        $id = $param["id"];
+        $where = [];
+        $where[] = ["mainId", "=", $id];
+        $where[] = ["type", "=", $type];
+        $files = Db::table("new_talent_file")->where($where)->select()->toArray();
+        if (!$files)
+            die("没有附件不能打包下载");
+
+        $talent_info = \app\enterprise\model\Talent::findOrEmpty($id);
+        $enterprise_info = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
+        $zip_filename = sprintf("%s(%s)人才申报材料.zip", $talent_info["name"], $enterprise_info["name"]);
+
+        $tmp_path = "storage/temp/";
+        $tmp_file_path = $tmp_path . $zip_filename;
+        if (!file_exists($tmp_path)) {
+            mkdir($tmp_path);
+        }
+        $zip = new \ZipArchive();
+        if (!$zip->open($tmp_file_path, \ZipArchive::CREATE | \ZipArchive::OVERWRITE)) {
+            header('HTTP/1.1 404 NOT FOUND');
+        }
+        foreach ($files as $file) {
+            $filepath = "storage/" . $file["url"];
+            $filename = $file["orignName"];
+            $zip->addFile($filepath, $filename);
+        }
+        $zip->close();
+        if (file_exists($tmp_file_path)) {
+            header("Cache-Control: public");
+            header("Content-Description: File Transfer");
+            header('Content-disposition: attachment; filename=' . $zip_filename); //文件名
+            header("Content-Type: application/octet-stream;charset=utf-8"); //zip格式的
+            header("Content-Transfer-Encoding: binary"); //告诉浏览器，这是二进制文件
+            header('Content-Length: ' . filesize($tmp_file_path)); //告诉浏览器，文件大小
+            @readfile($tmp_file_path);
+        }
+        //删除临时文件
+        @unlink($tmp_file_path);
+    }
+
     private function chkIsFileOwner($mainId, $type) {
         switch ($type) {
             case 1:
@@ -109,4 +244,9 @@ class Api extends BaseController {
         return false;
     }
 
+    public function getCompanyKvs() {
+        $companys = \app\common\model\Company::field("name,id")->select();
+        return json($companys);
+    }
+
 }

app/common/controller/Batch.php

@@ -15,9 +15,9 @@ class Batch extends BaseController {
 
     protected $middleware = [Auth::class];
 
-    public function checkBatchValid($type) {
+    public function checkBatchValid() {
         $user = session("user");
-        return json(BatchApi::checkBatchValid($type, $user["type"]));
+        return json(BatchApi::checkBatchValid($this->request->param(), $user["type"]));
     }
 
 }

app/enterprise/api/TalentApi.php

@@ -12,6 +12,22 @@ use app\common\api\DictApi;
  */
 class TalentApi {
 
+    /**
+     * 判断是否可以编辑
+     * @param type $id
+     * @return boolean
+     */
+    public static function checkIsEditable($id) {
+        $info = Talent::findOrEmpty($id);
+        if (!$info || !in_array($info["checkState"], [0, 1, 3, 5]))
+            return false;
+        return true;
+    }
+
+    public static function getOne($id) {
+        return Talent::findOrEmpty($id);
+    }
+
     public static function getList($request) {
         $order = trim($request->param("order")) ?: "desc";
         $offset = trim($request->param("offset")) ?: 0;
@@ -25,6 +41,7 @@ class TalentApi {
         $checkState = trim($request->param("checkState"));
 
         $where = [];
+        $where[] = ["delete", "=", 0];
         if (session("user")["usertype"] == 2) {
             $where[] = ["enterprise_id", "=", session("user")["uid"]];
         }

app/enterprise/controller/Talent.php

@@ -6,6 +6,10 @@ use app\enterprise\common\EnterpriseController;
 use app\enterprise\api\TalentApi;
 use app\enterprise\model\Talent as TalentModel;
 use think\facade\Db;
+use app\common\api\TalentLogApi;
+use app\common\api\TalentState;
+
+// 0正在填写 1保存未提交 2已提交未审核 3已审核 4驳回 5保存补充材料未提交 6提交补充材料进入初审 7初审通过 8初审驳回 9部门审核通过 10部门审核驳回 11复核通过 12复核驳回 13复核失败
 
 /**
  * Description of Talent
@@ -27,12 +31,31 @@ class Talent extends EnterpriseController {
         $request = $this->request;
         $param = $request->param();
         $id = isset($param["id"]) ? $param["id"] : 0;
+        $info = self::chkIsOwner($id, $this->user["uid"]);
+        if ($info && in_array($info["checkState"], [TalentState::BASE_VERIFY_PASS, TalentState::SCND_SAVE])) {
+            return $this->second($request);
+            exit();
+        }
         if ($request->isPost()) {
             if ($id) {
-                if (!$info = self::chkIsOwner($id, $this->user["uid"]))
-                    return json(["msg" => "没有对应的人才认定申报信息"]);
                 $data["id"] = $id;
+                if (!$info) {
+                    $res = ["msg" => "没有对应的人才认定申报信息"];
+                    echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                    exit;
+                }
+                if ($info["checkState"] == TalentState::REVERIFY_FAIL) {
+                    $res = ["msg" => "审核失败，不能再修改"];
+                    echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                    exit;
+                }
+                if (!in_array($info["checkState"], [TalentState::FST_SAVE, TalentState::BASE_VERIFY_PASS, TalentState::SCND_SAVE])) {
+                    $res = ["msg" => "审核中，不能修改"];
+                    echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                    exit;
+                }
             }
+
             $data["enterprise_id"] = $this->user["uid"];
             $data["talent_type"] = $param["talent_type"];
             $data["tax_insurance_month"] = $param["tax_insurance_month"];
@@ -48,73 +71,244 @@ class Talent extends EnterpriseController {
             $data["county"] = $param["county"];
             $data["nation"] = $param["nation"];
             $data["politics"] = $param["politics"];
-            $headimg = $request->file("photo");
-            $upload = new \app\common\api\UploadApi();
-            $headimgurl = $upload->uploadOne($headimg, "talent/photo");
-            $data["headimgurl"] = $headimgurl;
-            TalentModel::save($data);
-        }
-        $where = [];
-        $info = [];
-        $enterprise_info = \app\admin\model\Enterprise::find($this->user["uid"]);
-        if (isset($param["id"])) {
-            $where[] = ["id", "=", $param["id"]];
-            $where[] = ["enterprise_id", "=", $this->user["uid"]];
-            $info = TalentModel::where($where)->findOrEmpty();
+            if ($request->file()) {
+                $headimg = $request->file("photo");
+                if ($info) {
+                    $old_head_url = "storage/" . $info["headimgurl"];
+                    if (file_exists($old_head_url))
+                        unlink($old_head_url);
+                }
+                $upload = new \app\common\api\UploadApi();
+                $result = $upload->uploadOne($headimg, "image", "talent/photo");
+                $data["headimgurl"] = $result->filepath;
+            }
+            if ($id > 0) {
+                TalentModel::update($data);
+            } else {
+                $data["checkState"] = TalentState::FST_SAVE;
+                $id = TalentModel::insertGetId($data);
+                TalentLogApi::write(1, $id, TalentState::FST_SAVE, "添加人才认定申报", 1);
+            }
+            if ($id) {
+                $res = ["code" => 200, "msg" => "保存成功", "obj" => ["id" => $id, "checkState" => TalentState::FST_SAVE]];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+            } else {
+                $res = ["msg" => "保存失败"];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+            }
+            exit();
         }
-        $checkState = 0;
+        $checkState = $info["checkState"] ?: 0;
+        $enterprise_info = \app\common\model\Enterprise::find($this->user["uid"]);
+
         $info["enterprise"] = $enterprise_info;
+        $info["talent_type_list"] = \app\common\api\DictApi::findChildDictByCode("talent_type");
         return view("first", ["year" => date("Y"), "checkState" => $checkState, "row" => $info]);
     }
 
-    public function edit() {
-        $param = $this->request->param();
-        if (!isset($param["id"]))
-            return json(["msg" => "错误的打开方式"]);
-        $info = Db::table("new_talent_info")->findOrEmpty($param["id"]);
-        if ($info["checkState"] == 0) {
-            return redirect("/enterprise/talent/add/id/" . $info["id"]);
+    private function second(\think\Request $request) {
+        $params = $request->param();
+        $id = $params["id"];
+        if ($request->isPost()) {
+            $batch = \app\common\api\BatchApi::getValidBatch(1, $this->user["type"]);
+            if (!$batch) {
+                $res = ["msg" => "不在人才认定申报申请时间内"];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit;
+            }
+
+            $field_dict = \app\common\api\DictApi::getTalentFields(2);
+            //可以用匹配键的方式，可以少很多代码。。先这样吧。
+            $all_valid_keys = ["applay_year", "fst_work_time", "import_way", "cur_entry_time", "position",
+                "source", "source_batch", "fujian_highcert_pubtime", "fujian_highcert_exptime", "quanzhou_highcert_pubtime", "quanzhou_highcert_exptime", "source_city", "source_county",
+                "talent_arrange", "talent_condition", "highest_degree", "graduate_school", "major", "professional", "bank", "bank_number", "bank_branch_name", "bank_account",
+                "study_abroad", "abroad_school", "abroad_major", "phone", "email"];
+            foreach ($all_valid_keys as $key) {
+                $data[$key] = trim($params[$key]);
+                if (strpos($key, "time") !== false && strtotime($params[$key]) === false) {
+                    unset($data[$key]); //时间格式的验证不通过就清掉，下面判断是否为空如果赫然在列就不能通过
+                }
+            }
+
+            $no_empty = ["talent_arrange", "talent_condition", "highest_degree", "graduate_school", "major", "professional", "bank", "bank_number", "bank_branch_name",
+                "bank_account", "study_abroad", "phone", "email", "import_way", "fst_work_time", "cur_entry_time", "cur_entry_time", "position", "source"];
+
+            if ($data["study_abroad"] == 1) {
+                $no_empty[] = "abroad_school";
+                $no_empty[] = "abroad_major";
+            }
+            if (in_array($data["source"], [1, 3])) {
+                $no_empty[] = "source_batch";
+                $no_empty[] = "fujian_highcert_pubtime";
+                $no_empty[] = "fujian_highcert_exptime";
+                if ($data["source"] == 3) {
+                    $no_empty[] = "source_city";
+                }
+            }
+            if (in_array($data["source"], [2, 4])) {
+                $no_empty[] = "source_batch";
+                $no_empty[] = "quanzhou_highcert_pubtime";
+                $no_empty[] = "quanzhou_highcert_exptime";
+                if ($data["source"] == 4) {
+                    $no_empty[] = "source_county";
+                }
+            }
+            $no_empty = array_filter($no_empty);
+            $return = [];
+            foreach ($no_empty as $key) {
+                if (!$data[$key]) {
+                    $return[] = sprintf("请填写“%s”", $field_dict[$key]);
+                }
+            }
+            if (count($return) > 0) {
+                $res = ["msg" => implode("<br>", $return)];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit;
+            }
+            if (!preg_match("/^(13|14|15|17|18|19)[\d]{9}$/", $data["phone"])) {
+                $res = ["msg" => "手机号码格式错误"];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit;
+            }
+            if (!filter_var($data["email"], FILTER_VALIDATE_EMAIL)) {
+                $res = ["msg" => "电子邮箱格式错误"];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit;
+            }
+
+            if (!in_array($data["talent_arrange"], [1, 2, 3, 4, 5, 6, 7])) {
+                $res = ["msg" => "人才层次只能在预设范围内选择"];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit;
+            }
+            if (!in_array($data["source"], [1, 2, 3, 4, 5])) {
+                $res = ["msg" => "来源只能在预设范围内选择"];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit;
+            }
+
+            $where = [];
+            $where[] = ["step", "=", 2];
+            $where[] = ["project", "=", 1];
+            $where[] = ["type", "=", $this->user["type"]];
+            $where[] = ["must", "=", 1];
+            $filetypes = Db::table("new_common_filetype")->where($where)->select()->toArray();
+
+            $ft_ids = array_column($filetypes, "id");
+            $whr = [];
+            $whr[] = ["typeId", "in", $ft_ids];
+            $whr[] = ["mainId", "=", $id];
+            $upload_type_counts = Db::table("new_talent_file")->where($whr)->distinct(true)->field("typeId")->count();
+            if ($upload_type_counts != count($ft_ids)) {
+                $res = ["msg" => "请留意附件上传栏中带*号的内容均为必传项，请上传完整再提交审核"];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit;
+            }
+            $data["apply_year"] = $batch["batch"];
+            $data["id"] = $id;
+            $data["checkState"] = TalentState::SCND_SAVE;
+            if (TalentModel::update($data)) {
+                $res = ["code" => 200, "msg" => "保存成功", "obj" => ["id" => $id, "checkState" => TalentState::SCND_SAVE]];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+            } else {
+                $res = ["code" => 500, "msg" => "保存失败"];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+            }
         }
-        $enterprise_info = \app\admin\model\Enterprise::find($info["enterprise_id"]);
+        $info = \app\common\api\VerifyApi::getTalentInfoById($id);
+        $enterprise_info = \app\common\model\Enterprise::find($this->user["uid"]);
         $info["enterprise"] = $enterprise_info;
-        return view("", ["year" => date("Y"), "checkState" => $checkState, "enterprise" => $enterprise_info]);
+        $batch = \app\common\api\BatchApi::getValidBatch(1, $enterprise_info["type"]);
+        return view("second", ["year" => $batch["batch"], "row" => $info]);
+    }
+
+    public function view() {
+        $id = $this->request->param("id");
+        $info = \app\common\api\VerifyApi::getTalentInfoById($id);
+        return view("", ["row" => $info]);
     }
 
+    // 1保存未提交 2已提交未审核 3已审核 4驳回 5保存补充材料未提交 6提交补充材料进入初审 7初审通过 8初审驳回 9部门审核通过 10部门审核驳回 11复核通过 12复核驳回 13复核失败
     public function submit() {
         $id = $this->request->param("id");
         if (!$info = self::chkIsOwner($id, $this->user["uid"]))
             return json(["msg" => "没有对应的人才认定申报信息"]);
-        switch ($info["checkState"]) {
-            case 0:
-                $no_empty = ["talent_type", "name", "card_type", "card_number", "sex", "birthday", "nationality", "province", "city", "nation", "politics"];
-                $return = [];
-                foreach ($no_empty as $key) {
-                    if (!$info[$key]) {
-                        $return[] = sprintf("请填写“%s”", self::dict($key));
-                    }
+        $checkState = $info["checkState"];
+        if ($checkState == TalentState::BASE_VERIFY_PASS || $checkState == 0) {
+            return json(["msg" => '请先保存资料并上传相应附件后再点击提交审核']);
+        } else if ($checkState == TalentState::FST_SAVE) {
+            $filed_dict = \app\common\api\DictApi::getTalentFields(1);
+            //初次提交材料
+            $change_state = TalentState::FST_SUBMIT; //等待审核
+            if (!$info["headimgurl"])
+                return json(["msg" => "请上传头像"]);
+            $no_empty = ["talent_type", "name", "card_type", "card_number", "sex", "birthday", "nationality", "province", "city", "nation", "politics"];
+
+            if (in_array($info["talent_type"], [1, 2]))
+                $no_empty[] = "tax_insurance_month";
+            if ($info["talent_type"] == 3)
+                $no_empty[] = "labor_contract_rangetime";
+            $return = [];
+            foreach ($no_empty as $key) {
+                if (!$info[$key]) {
+                    $return[] = sprintf("请填写“%s”", $filed_dict[$key]);
                 }
-                if (in_array($info["talent_type"], [1, 2]) && !$info["tax_insurance_month"])
-                    $return[] = sprintf("请填写“%s”", self::dict("tax_insurance_month"));
-                if ($info["talent_type"] == 3 && !$info["labor_contract_rangetime"])
-                    $return[] = sprintf("请填写“%s”", self::dict("labor_contract_rangetime"));
-                if (count($return) > 0)
-                    return json(["msg" => implode("<br>", $return)]);
-                $where = [];
-                $where[] = ["step", "=", 1];
-                $where[] = ["project", "=", 1];
-                $where[] = ["type", "=", $this->user["type"]];
-                $where[] = ["must", "=", 1];
-                $filetypes = Db::table("new_common_filetype")->where($where)->select()->toArray();
-
-                $ft_ids = array_column($filetypes, "id");
-                $whr = [];
-                $whr[] = ["typeId", "in", $ft_ids];
-                $whr[] = ["mainId", "=", $info["id"]];
-                $upload_type_counts = Db::table("new_talent_file")->where($whr)->distinct(true)->field("typeId")->count();
-                if ($upload_type_counts != $filetypes)
-                    return json(["msg" => "请留意附件上传栏中带*号的内容均为必传项，请上传完整再提交审核"]);
-                break;
+            }
+            if (count($return) > 0)
+                return json(["msg" => implode("<br>", $return)]);
+            $where = [];
+            $where[] = ["step", "=", 1];
+            $where[] = ["project", "=", 1];
+            $where[] = ["type", "=", $this->user["type"]];
+            $where[] = ["must", "=", 1];
+            $filetypes = Db::table("new_common_filetype")->where($where)->select()->toArray();
+
+            $ft_ids = array_column($filetypes, "id");
+            $whr = [];
+            $whr[] = ["typeId", "in", $ft_ids];
+            $whr[] = ["mainId", "=", $info["id"]];
+            $upload_type_counts = Db::table("new_talent_file")->where($whr)->distinct(true)->field("typeId")->count();
+            if ($upload_type_counts != count($ft_ids))
+                return json(["msg" => "请留意附件上传栏中带*号的内容均为必传项，请上传完整再提交审核"]);
+
+            $data["id"] = $id;
+            $data["checkState"] = $change_state;
+            $data["active"] = 1;
+            TalentModel::update($data);
+            TalentLogApi::write(1, $id, $change_state, "提交基础判定材料待审核", 1);
+            return json(["code" => 200, "msg" => "提交成功"]);
+        } else if ($checkState == TalentState::SCND_SAVE) {
+            $change_state = TalentState::SCND_SUBMIT; //等待初审
+            $data["id"] = $id;
+            $data["checkState"] = $change_state;
+            $data["active"] = 1;
+            TalentModel::update($data);
+            TalentLogApi::write(1, $id, $change_state, "确认提交审核", 1);
+            return json(["code" => 200, "msg" => "提交成功"]);
+        } else if ($checkState == TalentState::REVERIFY_FAIL) {
+            return ["msg" => "审核失败，不能再提交审核"];
         }
+        return json(["msg" => "已提交审核，请耐心等待"]);
+    }
+
+    public function delete() {
+        $id = $this->request->param("talentInfoId");
+        $info = Talent::chkIsOwner($id, $this->user["uid"]);
+        if (!$info) {
+            return json(["msg" => "操作失败"]);
+        }
+        $checkState = $info["checkState"];
+        if (in_array($checkState, [0, 1])) {
+            $log = TalentLogApi::getLastLog($id, 1);
+            if ($log["state"] > 1) {
+                //有提交审核记录
+                return json(["msg" => "操作失败"]);
+            }
+        }
+        $data["id"] = $id;
+        $data["delete"] = 1;
+        TalentModel::update($data);
+        return json(["msg" => "删除成功"]);
     }
 
     static private function chkIsOwner($id, $uid) {
@@ -124,128 +318,4 @@ class Talent extends EnterpriseController {
         return $info;
     }
 
-    static private function dict($key) {
-        $value = "";
-        switch ($key) {
-            case "talent_type":
-                $value = "人才类型";
-                break;
-            case "tax_insurance_month":
-                $value = "在我市缴交社会保险或个人所得税月份";
-                break;
-            case "labor_contract_rangetime":
-                $value = "劳动合同起止时间";
-                break;
-            case "name":
-                $value = "姓名";
-                break;
-            case "card_type":
-                $value = "证件类型";
-                break;
-            case "card_number":
-                $value = "证件号码";
-                break;
-            case "sex":
-                $value = "性别";
-                break;
-            case "birthday":
-                $value = "出生日期";
-                break;
-            case "nationality":
-                $value = "国籍/地区";
-                break;
-            case "province":
-                $value = "籍贯省";
-                break;
-            case "city":
-                $value = "籍贯市";
-                break;
-            case "county":
-                $value = "籍贯县";
-                break;
-            case "nation":
-                $value = "民族";
-                break;
-            case "politics":
-                $value = "政治面貌";
-                break;
-            case "talent_arrange":
-                $value = "";
-                break;
-            case "talent_condition":
-                $value = "";
-                break;
-            case "highest_degree":
-                $value = "";
-                break;
-            case "graduate_school":
-                $value = "";
-                break;
-            case "major":
-                $value = "";
-                break;
-            case "professional":
-                $value = "";
-                break;
-            case "bank":
-                $value = "";
-                break;
-            case "bank_number":
-                $value = "";
-                break;
-            case "bank_branch_name":
-                $value = "";
-                break;
-            case "bank_account":
-                $value = "";
-                break;
-            case "study_abroad":
-                $value = "";
-                break;
-            case "abroad_school":
-                $value = "";
-                break;
-            case "abroad_major":
-                $value = "";
-                break;
-            case "phone":
-                $value = "";
-                break;
-            case "email":
-                $value = "";
-                break;
-            case "apply_year":
-                $value = "";
-                break;
-            case "import_way":
-                $value = "";
-                break;
-            case "fst_work_time":
-                $value = "";
-                break;
-            case "cur_entry_time":
-                $value = "";
-                break;
-            case "position":
-                $value = "";
-                break;
-            case "source":
-                $value = "";
-                break;
-            case "fujian_highcert_pubtime":
-                $value = "";
-                break;
-            case "fujian_highcert_exptime":
-                $value = "";
-                break;
-            case "quanzhou_highcert_pubtime":
-                $value = "";
-                break;
-            case "quanzhou_highcert_exptime":
-                $value = "";
-                break;
-        }
-        return $value;
-    }
-
 }

app/enterprise/view/talent/first.html

@@ -55,13 +55,18 @@
                                                 <input type="hidden" name="source_city_name" id="source_city_name" value="">
                                                 <input type="hidden" name="source_county_name" id="source_county_name" value="">
                                                 <input type="hidden" name="checkState" id="checkState" value="{$checkState}">
-                                                <input type="hidden" name="step" id="step" value="1">
+                                                <input type="hidden" name="step" id="step" value="1">                                                
+                                                <input type="hidden" name="files" id="files" value="{$row.modify_files}">
+                                                <input type="hidden" name="fields" id="fields" value="{$row.modify_fields}">
                                                 <div class="row">
                                                     <div class="col-sm-11">
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>人才类型</label>
                                                             <select class="form-control" id="talent_type" name="talent_type" value="{$row.talent_type}" onchange="TalentInfoInfoDlg.talentTypeChange()">
-                                                                <option value="">请选择</option>                                                               
+                                                                <option value="">请选择</option>  
+                                                                {volist name="row.talent_type_list" id="item"}
+                                                                <option value="{$item.id}">{$item.name}</option>        
+                                                                {/volist}
                                                             </select>
                                                         </div>
                                                         {if condition="in_array($row['talent_type'],[1,2])"}                                                        
@@ -163,7 +168,7 @@
                                                         </div>  
                                                     </div>
                                                     <div class="col-sm-1">
-                                                        <img id="photoImg" {if condition="file_exist('storage/talent/photo'.$row[headimgurl])"} src="/storage/talent/photo/{$row.headimgurl}" {else/} src="/static/img/photo.png" {/if} onclick="$('#photo').click()" style="height: 110px;width: 76px;padding-bottom: 5px;">
+                                                        <img id="photoImg" {if condition="$row['headimgurl']"} src="/storage/{$row.headimgurl}" {else/} src="/static/img/photo.png" {/if} onclick="$('#photo').click()" style="height: 110px;width: 76px;padding-bottom: 5px;">
                                                     </div>
                                                 </div>
                                                 <div class="row">

app/enterprise/view/talent/second.html

@@ -44,112 +44,90 @@
                                         <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                         <div class="panel-body">
                                             <div class="col-sm-12 form-group-sm">
-                                                <input type="hidden" name="id" id="id" value="">
+                                                <input type="hidden" name="id" id="id" value="{$row.id}">
                                                 <input type="hidden" name="year" id="year" value="{$year}">
-                                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$enterprise.id}">
-                                                <input type="hidden" name="enterprise_type" id="type" value="{$enterprise.type}">
-                                                <input type="hidden" name="checkState" id="checkState" value="">
-                                                <input type="file" name="photo" id="photo" style="display: none">
-                                                <input type="hidden" name="province_name" id="province_name" value="">
-                                                <input type="hidden" name="city_name" id="city_name" value="">
-                                                <input type="hidden" name="county_name" id="county_name" value="">
-                                                <input type="hidden" name="source_city_name" id="source_city_name" value="">
-                                                <input type="hidden" name="source_county_name" id="source_county_name" value="">
-                                                <input type="hidden" name="checkState" id="checkState" value="{$checkState}">
+                                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise.id}">
+                                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterprise.type}">
+                                                <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
                                                 <div class="row">
                                                     <div class="col-sm-11">
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>人才类型</label>
-                                                            <select class="form-control" id="talent_type" name="talent_type" onchange="TalentInfoInfoDlg.talentTypeChange()">
-                                                                <option value="">请选择</option>                                                               
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>人才类型</label>
+                                                            <select class="form-control" readonly disabled>
+                                                                <option value="" selected="true">{$row.talentTypeName}</option>
                                                             </select>
                                                         </div>
-                                                        <div class="rowGroup col-sm-3" style="display:none;">
+                                                        {if condition="in_array($row['talent_type'],[1,2])"}
+                                                        <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
-                                                            <input type="text" class="form-control" id="tax_insurance_month" name="tax_insurance_month" />
+                                                            <input type="text" class="form-control" value="{$row.tax_insurance_month}"  readonly disabled/>
                                                         </div>
-                                                        <div class="rowGroup col-sm-3" style="display:none;">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>劳动合同起止时间</label>
-                                                            <input type="text" class="form-control rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" />
-                                                        </div>                                                        
+                                                        {else/}
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>单位标签</label>
-                                                            <select class="form-control" id="enterprise_tag"  value="{$enterprise.talentType}" disabled="disabled">
-                                                            </select>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>劳动合同起止时间</label>
+                                                            <input type="text" class="form-control" value="{$row.labor_contract_rangetime}"  readonly disabled/>
                                                         </div>
+                                                        {/if}
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
-                                                            <input type="text" class="form-control" id="enterprise_name"  name="enterprise_name" readonly="readonly" value="{$enterprise.name}" />
+                                                            <input type="text" class="form-control" value="{$row.enterpriseName}"  readonly disabled/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>所属镇街</label>
-                                                            <select class="form-control" id="address" name="address" value="{$enterprise.street}" disabled="disabled"></select>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>单位标签</label>
+                                                            <input type="text" class="form-control" value="{$row.enterpriseTagName}"  readonly disabled/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>产业领域</label>
-                                                            <select type="text" class="form-control" id="industry_field" value="{$enterprise.industry_field}" name="industry_field" disabled="disabled">
-                                                            </select>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>所属街道</label>
+                                                            <input type="text" class="form-control" value="{$row.streetName}"  readonly disabled/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>行业领域</label>
+                                                            <input type="text" class="form-control" value="{$row.industryFieldName}" readonly disabled>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
-                                                            <input type="text" class="form-control" id="name" name="name" />
+                                                            <input type="text" class="form-control" value="{$row.name}"  readonly disabled/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" id="card_type" name="card_type">
+                                                            <select class="form-control" value="{$row.card_type}" readonly disabled>
                                                                 <option value="">请选择</option>
-                                                                <option value="1">身份证</option>
-                                                                <option value="2">通行证</option>
-                                                                <option value="3">护照</option>
+                                                                <option value="1" {eq name="row.card_type" value="1"} selected="" {/eq}>身份证</option>
+                                                                <option value="2" {eq name="row.card_type" value="2"} selected="" {/eq}>通行证</option>
+                                                                <option value="3" {eq name="row.card_type" value="3"} selected="" {/eq}>护照</option>
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件号码</label>
-                                                            <input class="form-control" id="card_number" name="card_number">
+                                                            <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
+                                                            <input class="form-control" value="{$row.card_number}" readonly disabled>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
-                                                            <select class="form-control" id="sex" name="sex">
-                                                                <option value="">请选择</option>
-                                                                <option value="1">男</option>
-                                                                <option value="2">女</option>
-                                                            </select>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>                                                            
+                                                            <input type="text" class="form-control" value="{eq name='info.sex' value='1'}男{else/}女{/eq}"  readonly disabled/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
-                                                            <input type="text" class="form-control date" id="birthday" name="birthday"/>
+                                                            <input type="text" class="form-control" value="{$row.birthday}" readonly disabled/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
-                                                            <select class="form-control" id="nationality" name="nationality">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯省</label>
-                                                            <select class="form-control " onchange="TalentInfoInfoDlg.afterSelectProvince()" id="province" name="province">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯市</label>
-                                                            <select class="form-control" onchange="TalentInfoInfoDlg.afterSelectCity()" id="city" name="city"></select>
+                                                            <input class="form-control" value="{$row.nationalityName}" readonly disabled>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯县</label>
-                                                            <select class="form-control" id="county" name="county"></select>
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
+                                                            <input class="form-control" value="{$row.provinceName}{$row.cityName}{$row.countyName}" readonly disabled/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>民族</label>
-                                                            <select class="form-control" id="nation" name="nation">
-                                                            </select>
-                                                        </div>       
+                                                            <input class="form-control" value="{$row.nationName}" readonly disabled/>
+                                                        </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
-                                                            <select class="form-control" id="politics" name="politics">
-                                                            </select>
-                                                        </div>  
+                                                            <input class="form-control" value="{$row.politicsName}" readonly disabled/>
+                                                        </div>
                                                     </div>
                                                     <div class="col-sm-1">
-                                                        <img id="photoImg" src="/static/img/photo.png" onclick="$('#photo').click()" style="height: 110px;width: 76px;padding-bottom: 5px;">
+                                                        <img id="photoImg" src="{$row.headimgurl}"  style="height: 110px;width: 76px;padding-bottom: 5px;">
                                                     </div>
                                                 </div>
                                             </div>
@@ -161,7 +139,7 @@
                                                     <div class="col-sm-11">                          
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>申报年度</label>
-                                                            <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$year}">
+                                                            <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$year}" readonly disabled>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>首次来晋工作时间</label>
@@ -178,7 +156,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>本单位现任职务</label>
-                                                            <input type="text" class="form-control" id="postion" name="postion"/>
+                                                            <input type="text" class="form-control" id="position" name="position"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>申报来源</label>
@@ -247,7 +225,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
-                                                            <input type="text" class="form-control" id="bank_branch_house" name="bank_branch_house" placeholder="XX银行XX省XX市XX支行/分行/分理处"/>
+                                                            <input type="text" class="form-control" id="bank_branch_name" name="bank_branch_name" placeholder="XX银行XX省XX市XX支行/分行/分理处"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
@@ -266,7 +244,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3 abroad_need_this" style="display:none;">
                                                             <label class="control-label spacing"><span style="color: red">*</span>专业</label>
-                                                            <input type="text" class="form-control" id="abroad_profession" name="abroad_profession" maxlength="11"/>
+                                                            <input type="text" class="form-control" id="abroad_major" name="abroad_major" maxlength="11"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>手机号码</label>
@@ -294,7 +272,7 @@
                                             </thead>
                                         </table>
                                         <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label>
-                                        <form id="uploadForm" action="/enterprise/talent/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
+                                        <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
                                             <input type='hidden' id="fileId" name="fileId" >
                                             <input type='file' id="upload_file" name="fileUrl" style='display: none'>
                                             <input type='hidden' id="mainId" name="mainId" >

config/app.php

@@ -26,5 +26,7 @@ return [
     // 错误显示信息,非调试模式有效
     'error_message' => '页面错误！请稍后再试～',
     // 显示错误信息
-    'show_error_msg' => true
+    'show_error_msg' => true,
+    //设置默认的过滤方法
+    "default_filter" => "htmlspecialchars,trim"
 ];

public/static/js/common/Feng.js

@@ -370,7 +370,7 @@ var Feng = {
     getCheckLog : function (id,data) {
         //初始化日志
         $('#'+id).bootstrapTable({
-            url: Feng.ctxPath + "/api/talentInfo/getCheckLog",
+            url: Feng.ctxPath + "/common/api/getCheckLog",
             method: 'POST',
             contentType: "application/x-www-form-urlencoded; charset=UTF-8",
             search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端

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

@@ -142,7 +142,7 @@ TalentInfo.openAddTalentInfo = function () {
                 fix: false, //不固定
                 maxmin: true,
                 content: '/enterprise/talent/add?year=' + data.batch,
-                btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-check layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
+                btn: ['<i class="fa fa-eye control-btn"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-check layui-bg-green  control-btn"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser control-btn"></i>&nbsp;&nbsp;取消'],
                 btnAlign: 'c',
                 btn1: function (index, layero) {
                     var obj = layero.find("iframe")[0].contentWindow;
@@ -176,15 +176,15 @@ TalentInfo.openAddTalentInfo = function () {
  */
 TalentInfo.openTalentInfoDetail = function () {
     if (this.check()) {
-        //var ajax = new $ax("/api/commonBatch/valiateIsEditOrSubmit", function (data) {
-            //if (data.code == 200) {
+        var ajax = new $ax("/common/batch/checkBatchValid", function (data) {
+            if (data.code == 200) {
                 var index = layer.open({
                     type: 2,
                     title: '人才认定申报详情',
                     area: ['800px', '420px'], //宽高
                     fix: false, //不固定
                     maxmin: true,
-                    content: '/enterprise/talent/add/id/' + TalentInfo.seItem.id + "/update",
+                    content: '/enterprise/talent/add/id/' + TalentInfo.seItem.id,
                     btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-check layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
                     btnAlign: 'c',
                     btn1: function (index, layero) {
@@ -204,15 +204,15 @@ TalentInfo.openTalentInfoDetail = function () {
                 });
                 layer.full(index);
                 TalentInfo.layerIndex = index;
-            //} else {
-             //   Feng.info(data.msg);
-           // }
-      //  }, function (data) {
-       //     Feng.error("校验失败!" + data.responseJSON.message + "!");
-       // });
-       // ajax.set("type", CONFIG.project_rcrd);
-       // ajax.set("year", TalentInfo.seItem.year);
-       // ajax.start();
+            } else {
+                Feng.info(data.msg);
+            }
+        }, function (data) {
+            Feng.error("校验失败!" + data.responseJSON.message + "!");
+        });
+        ajax.set("type", CONFIG.project_rcrd);
+        ajax.set("year", TalentInfo.seItem.year);
+        ajax.start();
     }
 };
 
@@ -228,7 +228,7 @@ TalentInfo.openTalentInfoSelect = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: '/api/talentInfo/talentInfo_select/' + TalentInfo.seItem.id,
+            content: '/enterprise/talent/view/id/' + TalentInfo.seItem.id,
             btn: ['<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
             btnAlign: 'c',
         });
@@ -242,12 +242,12 @@ TalentInfo.openTalentInfoSelect = function () {
  */
 TalentInfo.delete = function () {
     if (this.check()) {
-        if (TalentInfo.seItem.checkState != 1) {
+        if (TalentInfo.seItem.checkState > 1) {
             Feng.error("该申报已提交审核,无法删除");
             return;
         }
         var operation = function () {
-            var ajax = new $ax("/api/talentInfo/delete", function (data) {
+            var ajax = new $ax("/enterprise/talent/delete", function (data) {
                 Feng.success("删除成功!");
                 TalentInfo.table.refresh();
             }, function (data) {

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

@@ -2,8 +2,116 @@
  * 初始化人才认定申报详情对话框
  */
 var locked = false;
-var TalentInfoInfoDlg = {
+var step = $("#step").val();
+var TalentInfoInfoDlg = step == 1 ? {
     talentInfoInfoData: {},
+    validateFields: {
+        source_county: {validators: {notEmpty: {message: '入选来源县市区不能为空'}}},
+        enterprise_id: {validators: {notEmpty: {message: '所属企业不能为空'}}},
+        talent_type: {validators: {notEmpty: {message: '人才类型不能为空'}}},
+        enterprise_tag: {validators: {notEmpty: {message: '单位标签不能为空'}}},
+        enterprise_name: {validators: {notEmpty: {message: '单位名称不能为空'}}},
+        address: {validators: {notEmpty: {message: '所属街道不能为空'}}},
+        industry_field: {validators: {notEmpty: {message: '产业领域不能为空'}}},
+        name: {validators: {notEmpty: {message: '姓名不能为空'}}},
+        card_type: {validators: {notEmpty: {message: '证件类型不能为空'}}},
+        card_number: {
+            validators: {
+                notEmpty: {message: '证件号码不能为空'},
+                regexp: {
+                    regexp: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
+                    message: "身份证号码格式不正确"
+                }
+            }
+        },
+        sex: {validators: {notEmpty: {message: '性别不能为空'}}},
+        birthday: {validators: {notEmpty: {message: '出生日期不能为空'}}},
+        nationality: {validators: {notEmpty: {message: '国籍/地区不能为空'}}},
+        province: {validators: {notEmpty: {message: '户籍省份不能为空'}}},
+        city: {validators: {notEmpty: {message: '户籍市不能为空'}}},
+        nation: {validators: {notEmpty: {message: '民族不能为空'}}},
+        politics: {validators: {notEmpty: {message: '政治面貌不能为空'}}}
+    }
+} : {
+    talentInfoInfoData: {},
+    validateFields: {
+        apply_year: {validators: {notEmpty: {message: '申报年度不能为空'}}},
+        fst_work_time: {validators: {notEmpty: {message: '首次来晋工作时间不能为空'}}},
+        import_way: {validators: {notEmpty: {message: '引进方式不能为空'}}},
+        cur_entry_time: {validators: {notEmpty: {message: '本单位入职时间不能为空'}}},
+        position: {validators: {notEmpty: {message: '本单位现任职务不能为空'}}},
+        source: {validators: {notEmpty: {message: '申报来源不能为空'}}},
+        talent_arrange: {validators: {notEmpty: {message: '人才层次不能为空'}}},
+        talent_condition: {validators: {notEmpty: {message: '认定条件不能为空'}}},
+        highest_degree: {validators: {notEmpty: {message: '最高学历不能为空'}}},
+        graduate_school: {validators: {notEmpty: {message: '毕业院校不能为空'}}},
+        major: {validators: {notEmpty: {message: '专业不能为空'}}},
+        bank: {
+            validators: {
+                notEmpty: {
+                    message: '开户银行不能为空'
+                },
+                regexp: {
+                    regexp: /^[\u4e00-\u9fa5]*银行$/,
+                    message: "开户银行格式不正确"
+                }
+            }
+        },
+        bank_number: {
+            validators: {
+                notEmpty: {
+                    message: '银行行号不能为空'
+                },
+                regexp: {
+                    regexp: /^\d+$/,
+                    message: "银行行号格式不正确"
+                }
+            }
+        },
+        bank_branch_name: {
+            validators: {
+                notEmpty: {
+                    message: '开户银行网点不能为空'
+                },
+                regexp: {
+                    regexp: /^[\u4e00-\u9fa5]*银行[\u4e00-\u9fa5]*省?[\u4e00-\u9fa5]+市[\u4e00-\u9fa5]*$/,
+                    message: "开户银行格式不正确"
+                }
+            }
+        },
+        bank_account: {
+            validators: {
+                notEmpty: {
+                    message: '银行账号不能为空'
+                },
+                regexp: {
+                    regexp: /^\d+$/,
+                    message: "银行账号格式不正确"
+                }
+            }
+        },
+        phone: {
+            validators: {
+                notEmpty: {
+                    message: '手机号码不能为空'
+                },
+                regexp: {
+                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    message: "手机号码格式不正确"
+                }
+            }
+        },
+        email: {
+            validators: {
+                notEmpty: {
+                    message: '电子邮箱不能为空'
+                },
+                emailAddress: {
+                    message: "电子邮箱格式不正确"
+                }
+            }
+        }
+    }
 };
 
 /**
@@ -26,7 +134,7 @@ TalentInfoInfoDlg.set = function (key, val) {
     }
     this.talentInfoInfoData[key] = (typeof val == "undefined") ? $("#" + key).val() : val;
     if (dis == "disabled") {
-        $("#" + key).attr("disabled", "disabled");
+        $("#" + key).prop("disabled", true);
     }
     return this;
 }
@@ -60,6 +168,7 @@ TalentInfoInfoDlg.collectData = function () {
             .set('labor_contract_rangetime')
             .set('enterprise_id')
             .set('name')
+            .set('photo')
             .set('card_type')
             .set('card_number')
             .set('sex')
@@ -78,7 +187,7 @@ TalentInfoInfoDlg.collectData = function () {
             .set('professional')
             .set('bank')
             .set('bank_number')
-            .set('bank_branch_house')
+            .set('bank_branch_name')
             .set('bank_account')
             .set('study_abroad')
             .set('abroad_school')
@@ -176,41 +285,13 @@ TalentInfoInfoDlg.infoCallback = function (data) {
  */
 TalentInfoInfoDlg.getIdentifyCondition = function () {
     var level = $("#talent_arrange").val();
-    var type = $("#type").val();
-    var source = $("#source").val();
-    var talentType = $("#talent_type").val();
-    if (level == null || level == '') {
-        $("#talent_condition").empty();
-        $("#talent_condition").trigger('chosen:updated');
-        return;
-    }
-    if (type == null || type == '') {
-        Feng.info("请先选择申报类别");
-        return;
-    }
-    if (source == null || source == '') {
-        $("#talent_condition").empty();
-        $("#talent_condition").trigger('chosen:updated');
-        $("#talent_arrange").val("");
-        Feng.info("请先选择申报来源");
-        return;
-    }
-    if (talentType == null || talentType == '') {
-        $("#talent_condition").empty();
-        $("#talent_condition").trigger('chosen:updated');
-        $("#talent_arrange").val("");
-        Feng.info("请先选择人才标签");
-        return;
-    }
-    if (source == 2) {
-        source = 1;
-    }
+    var id = $('#id').val();
     Feng.addAjaxSelect({
         "id": "talent_condition",
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/api/common/findIdentifyConditionByLevel?talentLevel=" + level + "&type=" + type + "&source=" + source + "&talentType=" + talentType
+        "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/id/" + id
     });
     $("#talent_condition").trigger('chosen:updated');
 }
@@ -228,14 +309,14 @@ TalentInfoInfoDlg.changeStudyAbroad = function () {
     var is_abroad = $("#study_abroad").val();
     if (is_abroad == 1) {
         $("#abroad_school").parent().css("display", "block");
-        $("#abroad_profession").parent().css("display", "block");
+        $("#abroad_major").parent().css("display", "block");
         $('#talentInfoForm').bootstrapValidator('addField', "abroad_school", {validators: {notEmpty: {message: '毕业院校不能为空（留学）'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "abroad_profession", {validators: {notEmpty: {message: '专业不能为空（留学）'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "abroad_major", {validators: {notEmpty: {message: '专业不能为空（留学）'}}});
     } else {
         $("#abroad_school").val("").parent().css("display", "none");
-        $("#abroad_profession").val("").parent().css("display", "none");
+        $("#abroad_major").val("").parent().css("display", "none");
         $('#talentInfoForm').bootstrapValidator('removeField', "abroad_school");
-        $('#talentInfoForm').bootstrapValidator('removeField', "abroad_profession");
+        $('#talentInfoForm').bootstrapValidator('removeField', "abroad_major");
     }
 }
 
@@ -469,8 +550,8 @@ TalentInfoInfoDlg.validId = function () {
 }
 //选择附件并显示附件名
 TalentInfoInfoDlg.checkFile = function (content, state, fileTypeId, fileId) {
-    //if (!TalentInfoInfoDlg.validateIsEdit())
-    //return;
+    if (!TalentInfoInfoDlg.validateIsEdit())
+        return;
     $("#upload_file ").unbind("change");
     $("#upload_file ").change(function () {
         TalentInfoInfoDlg.upload(fileTypeId, fileId);
@@ -485,8 +566,8 @@ TalentInfoInfoDlg.upload = function (fileTypeId, fileId) {
         Feng.info("请先添加基本信息并保存后再试");
         return;
     }
-    /*if (!TalentInfoInfoDlg.validateIsEdit())
-     return;*/
+    if (!TalentInfoInfoDlg.validateIsEdit())
+        return;
     if (fileId != null && fileId != 'null') {
         $("#fileId").val(fileId)
     } else {
@@ -500,8 +581,8 @@ TalentInfoInfoDlg.upload = function (fileTypeId, fileId) {
 }
 //删除附件
 TalentInfoInfoDlg.deleteFile = function (id, state) {
-    //if (!TalentInfoInfoDlg.validateIsEdit())
-    //return;
+    if (!TalentInfoInfoDlg.validateIsEdit())
+        return;
     var operation = function () {
         var ajax = new $ax(Feng.ctxPath + "/common/api/deleteFile", function (data) {
             if (data.code = 200) {
@@ -555,11 +636,11 @@ TalentInfoInfoDlg.submitToCheck = function () {
  */
 TalentInfoInfoDlg.validateIsEdit = function () {
     var checkState = $("#checkState").val();
-    if (checkState != 0 && checkState != 5 && checkState != 10) {
-        if (checkState == -1) {
+    if (checkState != 0 && checkState != 1 && checkState != 3 && checkState != 5) {
+        if (checkState == 13) {
             Feng.error("您的申报审核不通过，无法再修改");
             return false;
-        } else if (checkState >= 35) {
+        } else if (checkState == 11) {
             Feng.error("您的申报已审核通过，无法再修改");
             return false;
         } else {
@@ -614,7 +695,9 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
 TalentInfoInfoDlg.validUploadButton = function (type, row, fileTypeId, fileId) {
     var files = $("#files").val();
     var checkState = $("#checkState").val();
-    if (Feng.isEmptyStr(checkState) || checkState == 0 || (checkState == 10 && files.indexOf(fileTypeId) != -1)) {
+    if (Feng.isEmptyStr(checkState) || checkState == 0 || checkState == 1 || checkState == 3 || checkState == 5) {
+        if ((checkState == 3 || checkState == 5) && row.step == 1)
+            return "";
         if (type == 1) {          //上传
             return "<button type='button' onclick=\"TalentInfoInfoDlg.checkFile(this,'" + row.fState + "','" + fileTypeId + "','" + null + "')\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
                     "<i class=\"fa fa-upload\"></i>上传" +
@@ -649,7 +732,7 @@ TalentInfoInfoDlg.downloadFile = function (id, type) {
 TalentInfoInfoDlg.setNoChangeField = function () {
     var checkState = $("#checkState").val();
     var fields = $("#fields").val();
-    if (checkState == 10) {
+    if (checkState == 8) {
         $("input,textarea").each(function () {
             $(this).attr("readonly", "readonly");
         });
@@ -670,8 +753,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
         }
     }
 }
-
-$(function () {
+TalentInfoInfoDlg.__initValidateCondition = function () {
     var step = $("#step").val();
     if (step == 1) {
         $('#talentInfoForm').bootstrapValidator('addField', "source_county", {validators: {notEmpty: {message: '入选来源县市区不能为空'}}});
@@ -725,7 +807,7 @@ $(function () {
                 }
             }
         });
-        $('#talentInfoForm').bootstrapValidator('addField', "bank_branch_house", {
+        $('#talentInfoForm').bootstrapValidator('addField', "bank_branch_name", {
             validators: {
                 notEmpty: {
                     message: '开户银行网点不能为空'
@@ -769,18 +851,38 @@ $(function () {
                 }
             }
         });
-        $('#talentInfoForm').bootstrapValidator('addField', "mainHonours", {validators: {notEmpty: {message: '主要业绩及取得的荣誉不能为空'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "educationAndResume", {validators: {notEmpty: {message: '教育背景及工作简历不能为空'}}});
 
     }
-
+}
+$("#card_type").change(function () {
+    async_padding($("#card_number").val().trim(), $(this).val());
+})
+$("#card_number").blur(function () {
+    async_padding($(this).val().trim(), $("#card_type").val());
+})
+function async_padding(card_number, card_type) {
+    if (card_number != "" && card_number.length == 18 && card_type == "1") {
+        var year = card_number.substring(6, 10);
+        var month = card_number.substring(10, 12);
+        var day = card_number.substring(12, 14);
+        var birthday = year + "-" + month + "-" + day;
+        var rule = /\d{4}-\d{2}-\d{2}/;
+        if (rule.test(birthday))
+            $("#birthday").val(birthday);
+        var num = card_number.substring(17, 1);
+        if (num % 2 == 0) {
+            $("#sex").val(2);
+        } else {
+            $("#sex").val(1);
+        }
+    }
+}
+$(function () {
     Feng.initValidatorTip("talentInfoForm", TalentInfoInfoDlg.validateFields);
-    var hand = $("#hand").val();
     var id = $("#id").val();
     var checkState = $("#checkState").val();
     //批量加载字典表数据
     var arr = [
-        {"name": "talent_type", "code": "talent_type"},
         {"name": "enterprise_tag", "code": "enterprise_tag"},
         {"name": "nation", "code": "nation"},
         {"name": "talent_arrange", "code": "talent_arrange"},
@@ -821,7 +923,7 @@ $(function () {
         $("select").each(function () {
             $(this).val($(this).attr("value")).trigger("change");
         });
-        //Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": id, "typeFileId": "", "active": 1})
+        Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": id, "typeFileId": "", "active": 1})
     }
     $("#talent_type").val($("#talent_type").attr("value"));
     $("#card_type").val($("#card_type").attr("value"));

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

@@ -2,176 +2,37 @@
  * 初始化人才认定申报详情对话框
  */
 var TalentInfoInfoDlg = {
-    talentInfoInfoData : {},
+    talentInfoInfoData: {},
 };
 
-/**
- * 获取人才认定
- */
-TalentInfoInfoDlg.getIdentifyCondition = function() {
-    var level = $("#talentArrange").val();
-    var type = $("#type").val();
-    var source = $("#source").val();
-    var talentType = $("#talentType").val();
-    if(level==null||level==''){
-        $("#identifyCondition").empty();
-        $("#identifyCondition").trigger('chosen:updated');
-        return;
-    }
-    if(type==null||type==''){
-        Feng.info("请先选择申报类别");
-        return ;
-    }
-    if(source==null||source==''){
-        $("#identifyCondition").empty();
-        $("#identifyCondition").trigger('chosen:updated');
-        $("#talentArrange").val("");
-        Feng.info("请先选择申报来源");
-        return ;
-    }
-    if(talentType==null||talentType==''){
-        $("#identifyCondition").empty();
-        $("#identifyCondition").trigger('chosen:updated');
-        $("#talentArrange").val("");
-        Feng.info("请先选择人才标签");
-        return ;
-    }
-    if(source == 2){
-        source = 1;
-    }
-    Feng.addAjaxSelect({
-        "id": "identifyCondition",
-        "displayCode": "id",
-        "displayName": "name",
-        "type": "GET",
-        "url": Feng.ctxPath + "/api/common/findIdentifyConditionByLevel?talentLevel="+level+"&type="+type+"&source="+source+"&talentType="+talentType
-    });
-    $("#identifyCondition").trigger('chosen:updated');
-}
-
-TalentInfoInfoDlg.bankChange = function () {
-    var bank = $("#bank").val();
-    if($.trim(bank)=='中国工商银行'){
-        $("#bankNumber").val('102391050013');
-    }else {
-        $("#bankNumber").val('');
-    }
-}
-
-
-/**
- * 加载市
- */
-TalentInfoInfoDlg.afterSelectProvince = function () {
-    var province = $("#provinceCode").val();
-    $("#cityCode").empty();
-    $("#countyCode").empty();
-    if(province==null||province==''){
-        return;
-    }
-    Feng.addAjaxSelect({
-        "id": "cityCode",
-        "displayCode": "code",
-        "displayName": "name",
-        "type": "GET",
-        "url": Feng.ctxPath + "/api/commonLocation/findCityByProvinceSelect/"+province
-    });
-}
-/**
- * 加载县
- */
-TalentInfoInfoDlg.afterSelectCity = function (){
-    var city = $("#cityCode").val();
-    $("#countyCode").empty();
-    if(city==null||city==''){
-        return;
-    }
-    Feng.addAjaxSelect({
-        "id": "countyCode",
-        "displayCode": "code",
-        "displayName": "name",
-        "type": "GET",
-        "url": Feng.ctxPath + "/api/commonLocation/findCountyByCitySelect/"+city
-    });
-}
-
-//人才标签变化
-TalentInfoInfoDlg.typeChange = function(context){
-    var talentType = $(context).val();
-    if(talentType=='gbwszb' || talentType=='zzbsh' || talentType == 'sydw'){
-        $("#letterTime").parent().attr("style","display:block");
-        // }else if(talentType=='gyqyl' || talentType=="gyqyh"){
-        //     $("#letterTime").parent().attr("style","display:none");
-        //     $("#letterTime").val('');
-    }else{
-        $("#letterTime").parent().attr("style","display:none");
-        $("#letterTime").val('');
-    }
-}
-
-TalentInfoInfoDlg.sourceChange = function(){
-    var source = $("#source").val();
-    if(source==1){
-        $("#fromCity").parent().attr("style","display:none");
-        $("#qzBatch").parent().attr("style","display:block");
-        $("#qzgccrcActiveTime").parent().attr("style","display:block");
-        $("#certificateStartTime").parent().attr("style","display:block");
-        $("#ourCitySource").parent().attr("style","display:block");
-        $("#fromCity").val("");
-    }
-    if(source==2){
-        $("#qzgccrcActiveTime").parent().attr("style","display:block");
-        $("#certificateStartTime").parent().attr("style","display:block");
-        $("#fromCity").parent().attr("style","display:block");
-        $("#qzBatch").parent().attr("style","display:block");
-        $("#ourCitySource").parent().attr("style","display:none");
-        $("#ourCitySource").val("");
-    }
-    if(source==3||source==null||source==''){
-        $("#qzgccrcActiveTime").parent().attr("style","display:none");
-        $("#certificateStartTime").parent().attr("style","display:none");
-        $("#fromCity").parent().attr("style","display:none");
-        $("#qzBatch").parent().attr("style","display:none");
-        $("#ourCitySource").parent().attr("style","display:none");
-        $("#ourCitySource").val("");
-        $("#qzgccrcActiveTime").val('');
-        $("#certificateStartTime").val('');
-        $("#fromCity").val("");
-        $("#qzBatch").val("");
-    }
-    $("#talentArrange").val("").trigger("change");
-    // $("#identifyCondition").empty();
-    // $("#identifyCondition").trigger('chosen:updated');
-}
-
 
 //初始化附件类别表单
-TalentInfoInfoDlg.initFileTable = function (){
+TalentInfoInfoDlg.initFileTable = function () {
     var queryData = {};
     queryData['project'] = CONFIG.project_rcrd;
     queryData['type'] = $("#type").val();
     $("#fileTable").bootstrapTable({
-        url: Feng.ctxPath + "/api/talentInfo/findUnCommonFileType",
+        url: "/common/api/findCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-        search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
-        showRefresh: false,				// 是否显示刷新按钮
-        clickToSelect: true,			// 是否启用点击选中行
-        singleSelect: true,				// 设置True 将禁止多选
-        striped: true,  				// 是否显示行间隔色
+        search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
         escape: true,
-        pagination: false,   			// 设置为 true 会在表格底部显示分页条
+        pagination: false, // 设置为 true 会在表格底部显示分页条
         paginationHAlign: "left",
         paginationDetailHAlign: "right",
-        sidePagination: "server",   	// 设置在哪里进行分页，可选值为 'client' 或者 'server'
+        sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
         showColumns: false,
-        detailView: true,               //是否显示父子表
+        detailView: true, //是否显示父子表
         pageList: [10, 30, 50],
         queryParams: function (params) {
-            return $.extend(queryData,params)
+            return $.extend(queryData, params)
         },
         rowStyle: function (row, index) {
-            return {classes:"info"};
+            return {classes: "info"};
         },
         columns: TalentInfoInfoDlg.initFileTypeColumn(),
         onPostBody: function () {
@@ -184,30 +45,31 @@ TalentInfoInfoDlg.initFileTable = function (){
             $("#fileTable").bootstrapTable('expandAllRows');
         },
         onExpandRow: function (index, row, $detail) {
-            var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/listTalentFile", function (data) {
-                if(data==null||data.length==0){
+            var ajax = new $ax("/common/api/listTalentFile", function (data) {
+                loadFiles = true;
+                if (data == null || data.length == 0) {
                     return;
                 }
                 var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li>';
-                for(var key in data){
+                for (var key in data) {
                     var sn = data[key].url.lastIndexOf(".");
-                    var suffix = data[key].url.substring(sn+1,data[key].url.length);
+                    var suffix = data[key].url.substring(sn + 1, data[key].url.length);
                     var imgStr = "";
-                    if(suffix=="pdf"||suffix=="PDF"){
-                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
-                    }else if(suffix == "xlsx" || suffix=="XLSX" || suffix == 'xls' || suffix == 'XLS'){
-                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
-                    }else{
-                        imgStr = '<img class=\"imgUrl\"  src=\"'+data[key].url+'\" style=\"width:25px;height:25px;\">';
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        imgStr = '<img class=\"imgUrl\"  src=\"' + data[key].url + '\" style=\"width:25px;height:25px;\">';
                     }
 
-                    html = html + '<li style="display: none">'+data[key].id+'</li>\n'+
-                        '<li style="width: 80%;padding-top: 5px;">'+data[key].orignName+'</li>\n'+
-                        '<li style="width: 10%;">'+imgStr+'</li>\n';
+                    html = html + '<li style="display: none">' + data[key].id + '</li>\n' +
+                            '<li style="width: 80%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
+                            '<li style="width: 10%;">' + imgStr + '</li>\n';
                 }
                 html = html + '</ul>';
                 $detail.html(html);
-                $(".imgs").viewer({ fullscreen:false});
+                $(".imgs").viewer({fullscreen: false});
             }, function (data) {
                 Feng.error("查询失败!" + data.responseJSON.message + "!");
             });
@@ -221,125 +83,54 @@ TalentInfoInfoDlg.initFileTable = function (){
 
 }
 
-//校验是否保存基础信息
-TalentInfoInfoDlg.validId = function (){
-    var id = $("#id").val();
-    if(id!=null && id!=''){
-        $("#fileLi").removeAttr("style");
-    }else{
-        $("#fileLi").attr("style","pointer-events: none");
-    }
-}
-
 /**
  * 初始化表格的列
  */
 TalentInfoInfoDlg.initFileTypeColumn = function () {
     return [
-        {field: 'selectItem', checkbox:false,visible:false},
-        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:"30%",'class': 'uitd_showTip',
-            formatter : function(value,row,index){
-                if(row.must==1){
-                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> '+ value;
-                }if(row.must==2){
-                    return '<i class="fa fa-paste"></i>'+value;
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (row.must == 1) {
+                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
+                }
+                if (row.must == 2) {
+                    return '<i class="fa fa-paste"></i>' + value;
                 }
             }
         },
-        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle',width:"8%",
-            formatter : function(value,row,index){
-                if(value==null||value==''||value=='null'){
+        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "8%",
+            formatter: function (value, row, index) {
+                if (value == null || value == '' || value == 'null') {
                     return '无';
                 }
-                return "<button type='button' onclick=\"TalentInfoInfoDlg.downloadFile('"+row.id+"',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
-                    "<i class=\"fa fa-download\"></i>下载" +
-                    "</button>";
+                return "<button type='button' onclick=\"TalentInfoInfoDlg.downloadFile('" + row.id + "',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
+                        "<i class=\"fa fa-download\"></i>下载" +
+                        "</button>";
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"52%",'class': 'uitd_showTip'},
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip'},
     ]
 };
 
-TalentInfoInfoDlg.downloadFile = function (id,type){
-    window.location.href = Feng.ctxPath + "/api/common/downloadFile?id=" + id + "&type="+type;
+TalentInfoInfoDlg.downloadFile = function (id, type) {
+    window.location.href = Feng.ctxPath + "/api/common/downloadFile?id=" + id + "&type=" + type;
 }
 
 
-$(function() {
-    var hand = $("#hand").val();
+$(function () {
+    $(":input").prop("disabled", true);
+    $("#talent_type option").eq(0).prop("selected", true);
     var id = $("#id").val();
     var checkState = $("#checkState").val();
-    //批量加载字典表数据
-    var arr = [
-        {"name":"nation","code":"un_nation"},
-        {"name":"talentArrange","code":"un_talentLevel"},
-        {"name":"nationality","code":"un_nationality"},
-        {"name":"politics","code":"un_political"},
-        {"name":"highEducation","code":"un_education"},
-        {"name":"introductionMode","code":"un_introduction_mode"},
-        {"name":"industryField","code":"un_industryField"},
-        {"name":"address","code":"un_street"},
-        {"name":"talentType","code":"un_jbt_talentType"}];
-    Feng.findChildDictBatch(JSON.stringify(arr))
-    //加载省份
-    Feng.addAjaxSelect({
-        "id": "provinceCode",
-        "displayCode": "code",
-        "displayName": "name",
-        "type": "GET",
-        "url": Feng.ctxPath + "/api/commonLocation/getProvinceSelect"
-    });
-    //加载福建省泉州的县
-    Feng.addAjaxSelect({
-        "id": "fromCity",
-        "displayCode": "code",
-        "displayName": "name",
-        "type": "GET",
-        "url": Feng.ctxPath + "/api/commonLocation/findCountyByCitySelect/350500"
-    });
-    if(hand == 'add' || (hand == 'update' && (checkState == 1 || checkState == 10))){
-        //加载人才标签
-        Feng.addAjaxSelect({
-            "id": "talentType",
-            "displayCode": "code",
-            "displayName": "name",
-            "type": "GET",
-            "url": Feng.ctxPath + "/api/talentInfo/findTalentTypeByEnterprise"
-        });
-    }
-    var batchHtml = "<option value=''>请选择</option>";
-    for(var i=1;i<101;i++){
-        batchHtml = batchHtml + "<option value='"+i+"'>"+i+"</option>";
-    }
-    $("#qzBatch").append(batchHtml);
-    //批量加载时间控件
-    $(".date").each(function(){
-        laydate.render({
-            elem: this
-            ,type: 'date'
-            ,trigger: 'click'
-        });
-    });
-    if(id!=null && id!=''){
+    TalentInfoInfoDlg.initFileTable();
+    if (id != null && id != '') {
         //select初始化
         $("select").each(function () {
             $(this).val($(this).attr("value")).trigger("change");
         });
-        Feng.getCheckLog("logTable",{"type":CONFIG.project_rcrd,"mainId":id,"typeFileId":"","active":1})
+        Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": id, "typeFileId": "", "active": 1})
     }
-    $("#address").val($("#address").attr("value"));
-    $("#industryField").val($("#industryField").attr("value"));
-    $("#provinceCode").val($("#provinceCode").attr("value"));
-    TalentInfoInfoDlg.afterSelectProvince();
-    $("#cityCode").val($("#cityCode").attr("value"));
-    TalentInfoInfoDlg.afterSelectCity();
-    $("#countyCode").val($("#countyCode").attr("value"));
-    $("#talentArrange").val($("#talentArrange").attr("value"));
-    TalentInfoInfoDlg.getIdentifyCondition();
-    $("#talentArrange").val($("#talentArrange").attr("value"));
-    $("#identifyCondition").val($("#identifyCondition").attr("value"));
-    TalentInfoInfoDlg.validId();
-    $("input,select,textarea").not("input[type='hidden']").not("input[type='file']").attr("style","pointer-events: none;background-color: #eee;");
 });
 
 

public/static/modular/system/company/company.js

@@ -2,8 +2,8 @@
  * 单位管理初始化
  */
 var Company = {
-    id: "CompanyTable",	//表格id
-    seItem: null,		//选中的条目
+    id: "CompanyTable", //表格id
+    seItem: null, //选中的条目
     table: null,
     layerIndex: -1
 };
@@ -14,7 +14,7 @@ var Company = {
 Company.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
-        {title: 'id', field: 'id', align: 'center', valign: 'middle',visible: false},
+        {title: 'id', field: 'id', align: 'center', valign: 'middle', visible: false},
         {title: '单位简称', field: 'shortName', align: 'center', valign: 'middle', sortable: false},
         {title: '单位全称', field: 'name', align: 'center', valign: 'middle', sortable: false},
         {title: '社会信用代码(不可修改)', field: 'code', align: 'center', valign: 'middle', sortable: false},
@@ -28,10 +28,10 @@ Company.initColumn = function () {
  */
 Company.check = function () {
     var selected = $('#' + this.id).bootstrapTable('getSelections');
-    if(selected.length == 0){
+    if (selected.length == 0) {
         Feng.info("请先选中表格中的某一记录！");
         return false;
-    }else{
+    } else {
         Company.seItem = selected[0];
         return true;
     }
@@ -47,7 +47,7 @@ Company.openAddCompany = function () {
         area: ['800px', '380px'], //宽高
         fix: false, //不固定
         maxmin: true,
-        content: Feng.ctxPath + '/company/company_add'
+        content: '/admin/company/add'
     });
     this.layerIndex = index;
 };
@@ -63,7 +63,7 @@ Company.openCompanyDetail = function () {
             area: ['800px', '380px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/company/company_update/' + Company.seItem.id
+            content: '/admin/company/edit/id/' + Company.seItem.id
         });
         this.layerIndex = index;
     }
@@ -77,7 +77,7 @@ Company.select = function () {
             area: ['800px', '380px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/company/company_select/' + Company.seItem.id
+            content: '/admin/company/view/id/' + Company.seItem.id
         });
         this.layerIndex = index;
     }
@@ -88,14 +88,14 @@ Company.select = function () {
  */
 Company.delete = function () {
     if (this.check()) {
-        var operation = function(){
-            var ajax = new $ax(Feng.ctxPath + "/company/delete", function () {
+        var operation = function () {
+            var ajax = new $ax("/admin/company/delete", function () {
                 Feng.success("删除成功!");
                 Company.table.refresh();
             }, function (data) {
                 Feng.error("删除失败!" + data.responseJSON.message + "!");
             });
-            ajax.set("companyId",Company.seItem.id);
+            ajax.set("id", Company.seItem.id);
             ajax.start();
         };
         Feng.confirm("是否刪除该单位?", operation);
@@ -106,7 +106,7 @@ Company.delete = function () {
  * 查询表单提交参数对象
  * @returns {{}}
  */
-Company.formParams = function() {
+Company.formParams = function () {
     var queryData = {};
     queryData['name'] = $("#name").val();
     queryData['code'] = $("#code").val();
@@ -122,13 +122,13 @@ Company.search = function () {
 /**
  * 重置
  */
-Company.reset = function() {
+Company.reset = function () {
     $("#name").val("");
     $("#code").val("");
 };
 $(function () {
     var defaultColunms = Company.initColumn();
-    var table = new BSTable(Company.id, "/company/list", defaultColunms);
+    var table = new BSTable(Company.id, "/admin/company/list", defaultColunms);
     table.setPaginationType("server");
     table.setQueryParams(Company.formParams());
     Company.table = table.init();

public/static/modular/system/company/company_info.js

@@ -2,8 +2,8 @@
  * 初始化单位详情对话框
  */
 var CompanyInfoDlg = {
-    companyInfoData : {},
-    zTreeInstance : null,
+    companyInfoData: {},
+    zTreeInstance: null,
     validateFields: {
         name: {
             validators: {
@@ -39,7 +39,7 @@ var CompanyInfoDlg = {
 /**
  * 清除数据
  */
-CompanyInfoDlg.clearData = function() {
+CompanyInfoDlg.clearData = function () {
     this.companyInfoData = {};
 }
 
@@ -49,7 +49,7 @@ CompanyInfoDlg.clearData = function() {
  * @param key 数据的名称
  * @param val 数据的具体值
  */
-CompanyInfoDlg.set = function(key, val) {
+CompanyInfoDlg.set = function (key, val) {
     this.companyInfoData[key] = (typeof value == "undefined") ? $("#" + key).val() : value;
     return this;
 }
@@ -60,14 +60,14 @@ CompanyInfoDlg.set = function(key, val) {
  * @param key 数据的名称
  * @param val 数据的具体值
  */
-CompanyInfoDlg.get = function(key) {
+CompanyInfoDlg.get = function (key) {
     return $("#" + key).val();
 }
 
 /**
  * 关闭此对话框
  */
-CompanyInfoDlg.close = function() {
+CompanyInfoDlg.close = function () {
     parent.layer.close(window.parent.Company.layerIndex);
 }
 
@@ -75,13 +75,13 @@ CompanyInfoDlg.close = function() {
 /**
  * 收集数据
  */
-CompanyInfoDlg.collectData = function() {
+CompanyInfoDlg.collectData = function () {
     this.set('id')
-        .set('name')
-        .set('shortName')
-        .set('code')
-        .set('description')
-        .set('sn');
+            .set('name')
+            .set('shortName')
+            .set('code')
+            .set('description')
+            .set('sn');
 }
 
 /**
@@ -96,20 +96,20 @@ CompanyInfoDlg.validate = function () {
 /**
  * 提交添加单位
  */
-CompanyInfoDlg.addSubmit = function() {
+CompanyInfoDlg.addSubmit = function () {
     this.clearData();
     this.collectData();
     if (!this.validate()) {
         return;
     }
     //提交信息
-    var ajax = new $ax(Feng.ctxPath + "/company/add", function(data){
+    var ajax = new $ax("/admin/company/add", function (data) {
         Feng.success(data.msg);
-        if(data.code=="200"){
+        if (data.code == "200") {
             window.parent.Company.table.refresh();
             CompanyInfoDlg.close();
         }
-    },function(data){
+    }, function (data) {
         Feng.error("添加失败!" + data.responseJSON.message + "!");
     });
     ajax.set(this.companyInfoData);
@@ -119,20 +119,20 @@ CompanyInfoDlg.addSubmit = function() {
 /**
  * 提交修改
  */
-CompanyInfoDlg.editSubmit = function() {
+CompanyInfoDlg.editSubmit = function () {
     this.clearData();
     this.collectData();
     if (!this.validate()) {
         return;
     }
     //提交信息
-    var ajax = new $ax(Feng.ctxPath + "/company/update", function(data){
+    var ajax = new $ax("/admin/company/edit", function (data) {
         Feng.success(data.msg);
-        if(data.code=="200"){
+        if (data.code == "200") {
             window.parent.Company.table.refresh();
             CompanyInfoDlg.close();
         }
-    },function(data){
+    }, function (data) {
         Feng.error("修改失败!" + data.responseJSON.message + "!");
     });
     ajax.set(this.companyInfoData);
@@ -141,11 +141,11 @@ CompanyInfoDlg.editSubmit = function() {
 
 function onBodyDown(event) {
     if (!(event.target.id == "menuBtn" || event.target.id == "parentDeptMenu" || $(
-        event.target).parents("#parentDeptMenu").length > 0)) {
+            event.target).parents("#parentDeptMenu").length > 0)) {
         CompanyInfoDlg.hideDeptSelectTree();
     }
 }
 
-$(function() {
+$(function () {
     Feng.initValidator("companyInfoForm", CompanyInfoDlg.validateFields);
 });

public/static/modular/talentIdentify/identifyCondition/identifyCondition.js

@@ -2,8 +2,8 @@
  * 认定条件管理管理初始化
  */
 var IdentifyCondition = {
-    id: "IdentifyConditionTable",	//表格id
-    seItem: null,		//选中的条目
+    id: "IdentifyConditionTable", //表格id
+    seItem: null, //选中的条目
     table: null,
     layerIndex: -1
 };
@@ -15,50 +15,30 @@ var isShow = false;
 IdentifyCondition.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
-        {title: '申报来源', field: 'source', visible: isShow, align: 'center', valign: 'middle',
-            formatter : function (value,row,index) {
-                if(value==1){
-                    return "来源1和来源2";
-                }
-                if(value==3){
-                    return "来源3";
-                }
-            }
-        },
         {title: '人才层次', field: 'talentLevel', visible: true, align: 'center', valign: 'middle'},
         {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle',
-            formatter : function (value,row,index) {
-                if(value==1){
+            formatter: function (value, row, index) {
+                if (value == 1) {
                     return "晋江市优秀人才";
                 }
-                if(value==2){
+                if (value == 2) {
                     return "集成电路优秀人才";
                 }
             }
         },
-        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip'},
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip'},
         {title: '有效期', field: 'activeYear', visible: true, align: 'center', valign: 'middle'},
-        {title: '忽略常年工作判定条件', field: 'notWorkYear', visible: true, align: 'center', valign: 'middle',
+        {title: '是否启用', field: 'active', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row, index) {
                 if (value == 1) {
-                    return "<button type=\"button\" style=\"line-height: 1.3\" class=\"btn btn-primary btn-xs\">不忽略</button>";
+                    return "<button type=\"button\" style=\"line-height: 1.3\" class=\"btn btn-primary btn-xs\">启用</button>";
                 }
                 if (value == 2) {
-                    return "<button type=\"button\" style=\"line-height: 1.3\" class=\"btn btn-warning btn-xs\">忽略</button>";
-                }
-            }
-        },
-        {title: '是否启用', field: 'active', visible: true, align: 'center', valign: 'middle',
-            formatter: function (value, row, index) {
-                if(value == 1) {
-                    return "<button type=\"button\" style=\"line-height: 1.3\" class=\"btn btn-primary btn-xs\">启用</button>";
-                }if(value == 2) {
                     return "<button type=\"button\" style=\"line-height: 1.3\" class=\"btn btn-warning btn-xs\">停用</button>";
                 }
             }
         },
-        {title: '审核单位', field: 'companyNames', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip'},
-        {title: '人才标签限制', field: 'talentTypesName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip'},
+        {title: '审核单位', field: 'companyNames', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip'},
         {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle'},
     ];
 };
@@ -68,10 +48,10 @@ IdentifyCondition.initColumn = function () {
  */
 IdentifyCondition.check = function () {
     var selected = $('#' + this.id).bootstrapTable('getSelections');
-    if(selected.length == 0){
+    if (selected.length == 0) {
         Feng.info("请先选中表格中的某一记录！");
         return false;
-    }else{
+    } else {
         IdentifyCondition.seItem = selected[0];
         return true;
     }
@@ -87,7 +67,7 @@ IdentifyCondition.openAddIdentifyCondition = function () {
         area: ['1126px', '420px'], //宽高
         fix: false, //不固定
         maxmin: true,
-        content: Feng.ctxPath + '/identifyCondition/identifyCondition_add'
+        content: Feng.ctxPath + '/admin/talent_condition/add'
     });
     this.layerIndex = index;
 };
@@ -103,7 +83,7 @@ IdentifyCondition.openIdentifyConditionDetail = function () {
             area: ['1126px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/identifyCondition/identifyCondition_update/' + IdentifyCondition.seItem.id
+            content: Feng.ctxPath + '/admin/talent_condition/edit/id/' + IdentifyCondition.seItem.id
         });
         this.layerIndex = index;
     }
@@ -114,14 +94,14 @@ IdentifyCondition.openIdentifyConditionDetail = function () {
  */
 IdentifyCondition.delete = function () {
     if (this.check()) {
-        var operation = function(){
-            var ajax = new $ax(Feng.ctxPath + "/identifyCondition/delete", function (data) {
+        var operation = function () {
+            var ajax = new $ax(Feng.ctxPath + "/admin/talent_condition/delete/id/", function (data) {
                 Feng.success("删除成功!");
                 IdentifyCondition.table.refresh();
             }, function (data) {
                 Feng.error("删除失败!" + data.responseJSON.message + "!");
             });
-            ajax.set("identifyConditionId",IdentifyCondition.seItem.id);
+            ajax.set("id", IdentifyCondition.seItem.id);
             ajax.start();
         }
         Feng.confirm("是否刪除该认定条件?", operation);
@@ -132,9 +112,8 @@ IdentifyCondition.delete = function () {
  * 查询表单提交参数对象
  * @returns {{}}
  */
-IdentifyCondition.formParams = function() {
+IdentifyCondition.formParams = function () {
     var queryData = {};
-    queryData['source'] = $("#source").val();
     queryData['talentLevel'] = $("#talentLevel").val();
     queryData['type'] = $("#type").val();
     queryData['name'] = $("#name").val();
@@ -153,20 +132,19 @@ IdentifyCondition.search = function () {
 /**
  * 重置
  */
-IdentifyCondition.reset = function (){
+IdentifyCondition.reset = function () {
     $("#talentLevel").val("");
     $("#type").val("");
     $("#name").val("");
     $("#active").val("");
-    $("#source").val("");
 }
 
-IdentifyCondition.import = function(){
+IdentifyCondition.import = function () {
     $("#import-form")[0].reset();
     $("#importModal").modal("show");
 }
 
-IdentifyCondition.importSubmit = function(){
+IdentifyCondition.importSubmit = function () {
     $("#import-form")[0].submit();
 }
 
@@ -180,19 +158,19 @@ IdentifyCondition.callBack = function (data) {
 }
 
 //模板下载
-IdentifyCondition.download = function(){
+IdentifyCondition.download = function () {
     window.location.href = Feng.ctxPath + "/static/downloadFile/identifyConditiontemplate.xlsx";
 }
 
 $(function () {
     var userTYpe = $("#userType").val();
-    if(userTYpe == 1){
+    if (userTYpe == 1) {
         isShow = true;
-    }else{
+    } else {
         isShow = false;
     }
     var defaultColunms = IdentifyCondition.initColumn();
-    var table = new BSTable(IdentifyCondition.id, "/identifyCondition/list", defaultColunms);
+    var table = new BSTable(IdentifyCondition.id, "/admin/talent_condition/list", defaultColunms);
     table.setPaginationType("server");
     IdentifyCondition.table = table.init();
     //下拉框数据动态加载
@@ -201,6 +179,6 @@ $(function () {
         "displayCode": "code",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/dict/findChildDictByCode?code=un_talentLevel"
+        "url": "/admin/dict/findChildDictByCode?code=talent_arrange"
     });
 });

public/static/modular/talentIdentify/identifyCondition/identifyCondition_info.js

@@ -31,24 +31,6 @@ var IdentifyConditionInfoDlg = {
                     message: '启用状态不能为空'
                 }
             }
-        },
-        notWorkYear: {
-            validators: {
-                notEmpty: {
-                    message: '常年工作判定条件不能为空'
-                }
-            }
-        },
-        activeYear:{
-            validators: {
-                notEmpty: {
-                    message: '有效期不能为空'
-                },
-                regexp :{
-                    regexp: /^\d+$/,
-                    message:"只能输入数字"
-                }
-            }
         }
     }
 };
@@ -94,12 +76,9 @@ IdentifyConditionInfoDlg.close = function() {
 IdentifyConditionInfoDlg.collectData = function() {
     this
     .set('id')
-    .set('source')
     .set('type')
     .set('talentLevel')
     .set('name')
-    .set('activeYear')
-    .set('notWorkYear')
     .set('active')
     .set('description');
     var companys = $("#companyIds").val();
@@ -139,7 +118,7 @@ IdentifyConditionInfoDlg.addSubmit = function() {
     //     Feng.error("审核单位不能为空");return ;
     // }
     //提交信息
-    var ajax = new $ax(Feng.ctxPath + "/identifyCondition/add", function(data){
+    var ajax = new $ax("/admin/talent_condition/add", function(data){
         if(data.code=="200"){
             Feng.success(data.msg);
             window.parent.IdentifyCondition.table.refresh();
@@ -167,7 +146,7 @@ IdentifyConditionInfoDlg.editSubmit = function() {
     //     Feng.error("审核单位不能为空");return ;
     // }
     //提交信息
-    var ajax = new $ax(Feng.ctxPath + "/identifyCondition/update", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talent_condition/edit", function(data){
         if(data.code=="200"){
             Feng.success(data.msg);
             window.parent.IdentifyCondition.table.refresh();
@@ -203,10 +182,7 @@ $(function() {
     // });
     var arr = [{
         "name": "talentLevel",
-        "code": "un_talentLevel"
-    }, {
-        "name": "talentTypes",
-        "code": "un_jbt_talentType"
+        "code": "talent_arrange"
     }];
     Feng.findChildDictBatch(JSON.stringify(arr));
     Feng.addAjaxSelect({
@@ -214,7 +190,7 @@ $(function() {
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/company/selectAll"
+        "url": Feng.ctxPath + "/common/api/getCompanyKvs"
     });
     $('#companyIds').chosen({
         // search_contains:false,

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

@@ -117,7 +117,7 @@ TalentInfo.getIdentifyCondition = function() {
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/identifyCondition/findIdentifyConditionByLevel"
+        "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel"
     });
     $("#identifyCondition").trigger('chosen:updated');
 }
@@ -184,15 +184,16 @@ TalentInfo.export = function(process){
 TalentInfo.init = function(){
     //批量加载字典表数据
     var arr = [
-        {"name":"nation","code":"un_nation"},
-        {"name":"nationality","code":"un_nationality"},
-        {"name":"politics","code":"un_political"},
-        {"name":"industryField","code":"un_industryField"},
-        {"name":"introductionMode","code":"un_introduction_mode"},
-        {"name":"highEducation","code":"un_education"},
-        {"name":"talentType","code":"un_jbt_talentType"},
-        {"name":"talentArrange","code":"un_talentLevel"},
-        {"name":"address","code":"un_street"}];
+        {"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":"source","code":"source"},
+        {"name":"address","code":"street"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
     TalentInfo.getIdentifyCondition();
     $("#identifyCondition,#enterpriseId").on('chosen:ready', function(e, params) {
@@ -211,7 +212,7 @@ TalentInfo.init = function(){
  */
 TalentInfo.download = function(){
     if (this.check()) {
-        window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/api/commonDownload/downloadZip?type=1&id="+TalentInfo.seItem.id));
+        window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/common/api/downloadZip?type=1&id="+TalentInfo.seItem.id));
     }
 }
 

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

@@ -1,9 +1,9 @@
- /**
+/**
  * 初始化人才认定申报详情对话框
  */
- var locked = false;
+var locked = false;
 var TalentInfoInfoDlg = {
-    talentInfoInfoData : {},
+    talentInfoInfoData: {},
 
 };
 
@@ -11,74 +11,74 @@ var TalentInfoInfoDlg = {
 /**
  * 关闭此对话框
  */
-TalentInfoInfoDlg.close = function() {
+TalentInfoInfoDlg.close = function () {
     parent.layer.close(window.parent.TalentInfo.layerIndex);
 }
 
 //人才标签变化
-TalentInfoInfoDlg.typeChange = function(){
+TalentInfoInfoDlg.typeChange = function () {
     var talentType = $("#talentType").val();
-    if(talentType=='gbwszb' || talentType=='zzbsh' || talentType == 'sydw'){
-        $("#letterTime").parent().attr("style","display:block");
-    // }else if(talentType=='gyqyl' || talentType=="gyqyh"){
-    //     $("#letterTime").parent().attr("style","display:none");
-    }else{
-        $("#letterTime").parent().attr("style","display:none");
+    if (talentType == 'gbwszb' || talentType == 'zzbsh' || talentType == 'sydw') {
+        $("#letterTime").parent().attr("style", "display:block");
+        // }else if(talentType=='gyqyl' || talentType=="gyqyh"){
+        //     $("#letterTime").parent().attr("style","display:none");
+    } else {
+        $("#letterTime").parent().attr("style", "display:none");
     }
 }
-TalentInfoInfoDlg.sourceChange = function(){
+TalentInfoInfoDlg.sourceChange = function () {
     var source = $("#source").val();
-    if(source==1){
-        $("#fromCityName").parent().attr("style","display:none");
-        $("#qzBatch").parent().attr("style","display:block");
-        $("#qzgccrcActiveTime").parent().attr("style","display:block");
-        $("#certificateStartTime").parent().attr("style","display:block");
-        $("#ourCitySource").parent().attr("style","display:block");
+    if (source == 1) {
+        $("#fromCityName").parent().attr("style", "display:none");
+        $("#qzBatch").parent().attr("style", "display:block");
+        $("#qzgccrcActiveTime").parent().attr("style", "display:block");
+        $("#certificateStartTime").parent().attr("style", "display:block");
+        $("#ourCitySource").parent().attr("style", "display:block");
     }
-    if(source==2){
-        $("#certificateStartTime").parent().attr("style","display:block");
-        $("#qzgccrcActiveTime").parent().attr("style","display:block");
-        $("#fromCityName").parent().attr("style","display:block");
-        $("#qzBatch").parent().attr("style","display:block");
-        $("#ourCitySource").parent().attr("style","display:none");
+    if (source == 2) {
+        $("#certificateStartTime").parent().attr("style", "display:block");
+        $("#qzgccrcActiveTime").parent().attr("style", "display:block");
+        $("#fromCityName").parent().attr("style", "display:block");
+        $("#qzBatch").parent().attr("style", "display:block");
+        $("#ourCitySource").parent().attr("style", "display:none");
     }
-    if(source==3||source==null||source==''){
-        $("#certificateStartTime").parent().attr("style","display:none");
-        $("#qzgccrcActiveTime").parent().attr("style","display:none");
-        $("#fromCityName").parent().attr("style","display:none");
-        $("#qzBatch").parent().attr("style","display:none");
-        $("#ourCitySource").parent().attr("style","display:none");
+    if (source == 3 || source == null || source == '') {
+        $("#certificateStartTime").parent().attr("style", "display:none");
+        $("#qzgccrcActiveTime").parent().attr("style", "display:none");
+        $("#fromCityName").parent().attr("style", "display:none");
+        $("#qzBatch").parent().attr("style", "display:none");
+        $("#ourCitySource").parent().attr("style", "display:none");
     }
 }
 
 //初始化附件类别表单
-TalentInfoInfoDlg.initFileTable = function (){
-    Feng.showMiniFileModal(CONFIG.project_rcrd,$("#type").val(),$("#id").val());
+TalentInfoInfoDlg.initFileTable = function () {
     var queryData = {};
     queryData['project'] = CONFIG.project_rcrd;
     queryData['type'] = $("#type").val();
+    queryData["checkState"] = $("#checkState").val();
     $("#fileTable").bootstrapTable({
-        url: Feng.ctxPath + "/api/talentInfo/findUnCommonFileType",
+        url: "/common/api/findCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-        search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
-        showRefresh: false,				// 是否显示刷新按钮
-        clickToSelect: true,			// 是否启用点击选中行
-        singleSelect: true,				// 设置True 将禁止多选
-        striped: true,  				// 是否显示行间隔色
+        search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
         escape: true,
-        pagination: false,   			// 设置为 true 会在表格底部显示分页条
+        pagination: false, // 设置为 true 会在表格底部显示分页条
         paginationHAlign: "left",
         paginationDetailHAlign: "right",
-        sidePagination: "server",   	// 设置在哪里进行分页，可选值为 'client' 或者 'server'
+        sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
         showColumns: false,
-        detailView: true,               //是否显示父子表
+        detailView: true, //是否显示父子表
         pageList: [10, 30, 50],
         queryParams: function (params) {
-            return $.extend(queryData,params)
+            return $.extend(queryData, params)
         },
         rowStyle: function (row, index) {
-            return {classes:"info"};
+            return {classes: "info"};
         },
         columns: TalentInfoInfoDlg.initFileTypeColumn(),
         onPostBody: function () {
@@ -91,32 +91,32 @@ TalentInfoInfoDlg.initFileTable = function (){
             $("#fileTable").bootstrapTable('expandAllRows');
         },
         onExpandRow: function (index, row, $detail) {
-            var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/listTalentFile", function (data) {
-                if(data==null||data.length==0){
+            var ajax = new $ax("/common/api/listTalentFile", function (data) {
+                if (data == null || data.length == 0) {
                     return;
                 }
                 var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
-                for(var key in data){
+                for (var key in data) {
                     var sn = data[key].url.lastIndexOf(".");
-                    var suffix = data[key].url.substring(sn+1,data[key].url.length);
+                    var suffix = data[key].url.substring(sn + 1, data[key].url.length);
                     var imgStr = "";
-                    if(suffix=="pdf"||suffix=="PDF"){
-                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
-                    }else if(suffix == "xlsx" || suffix=="XLSX" || suffix == 'xls' || suffix == 'XLS'){
-                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
-                    }else{
-                        imgStr = '<img class=\"imgUrl\"  src=\"'+data[key].url+'\" style=\"width:25px;height:25px;\">';
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        imgStr = '<img class=\"imgUrl\"  src=\"' + data[key].url + '\" style=\"width:25px;height:25px;\">';
                     }
-                    html = html + '<li style="display: none">'+data[key].id+'</li>\n'+
-                        '<li style="width: 80%;padding-top: 5px;">'+data[key].orignName+'</li>\n'+
-                        '<li style="width: 10%;">'+imgStr+'</li>\n'+
-                        "<li style='width: 10%;padding-top: 2px;'><button type='button' onclick=\"TalentInfoInfoDlg.downloadFile('"+data[key].id+"',1)\" class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\" aria-hidden=\"true\"></i>下载</button></li>";
+                    html = html + '<li style="display: none">' + data[key].id + '</li>\n' +
+                            '<li style="width: 80%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
+                            '<li style="width: 10%;">' + imgStr + '</li>\n' +
+                            "<li style='width: 10%;padding-top: 2px;'><button type='button' onclick=\"TalentInfoInfoDlg.downloadFile('" + data[key].id + "',1)\" class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\" aria-hidden=\"true\"></i>下载</button></li>";
                 }
                 html = html + '</ul>';
                 $detail.html(html);
                 $(".imgs").viewer({
                     // toolbar:false,
-                    fullscreen:false
+                    fullscreen: false
                 });
             }, function (data) {
                 Feng.error("查询失败!" + data.responseJSON.message + "!");
@@ -131,7 +131,7 @@ TalentInfoInfoDlg.initFileTable = function (){
 }
 
 
-TalentInfoInfoDlg.callback = function(data){
+TalentInfoInfoDlg.callback = function (data) {
     Feng.info(data.msg);
 }
 
@@ -139,11 +139,11 @@ TalentInfoInfoDlg.callback = function(data){
  * 下载附件
  * @param value
  */
-TalentInfoInfoDlg.downloadFile = function (id,type){
-    window.location.href = Feng.ctxPath + "/api/common/downloadFile?id=" + id + "&type="+type;
+TalentInfoInfoDlg.downloadFile = function (id, type) {
+    window.location.href = "/common/api/downloadFile?id=" + id + "&type=" + type;
 }
 
-TalentInfoInfoDlg.expandRows = function(){
+TalentInfoInfoDlg.expandRows = function () {
     $("#fileTable").bootstrapTable('expandAllRows')
 }
 
@@ -152,25 +152,26 @@ TalentInfoInfoDlg.expandRows = function(){
  */
 TalentInfoInfoDlg.initFileTypeColumn = function () {
     return [
-        {field: 'selectItem', checkbox:false,visible:false},
-        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:"20%",'class': 'uitd_showTip',
-            formatter : function(value,row,index){
-                if(row.must==1){
-                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> '+ value;
-                }if(row.must==2){
-                    return '<i class="fa fa-paste"></i>'+value;
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "20%", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (row.must == 1) {
+                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
+                }
+                if (row.must == 2) {
+                    return '<i class="fa fa-paste"></i>' + value;
                 }
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"68%",'class': 'uitd_showTip'},
-        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle',width:"10%",
-            formatter : function(value,row,index){
-                if(value==null||value==''||value=='null'){
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "68%", 'class': 'uitd_showTip'},
+        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "10%",
+            formatter: function (value, row, index) {
+                if (value == null || value == '' || value == 'null') {
                     return '无';
                 }
-                return "<button type='button' onclick=\"TalentInfoInfoDlg.downloadFile('"+row.id+"',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
-                    "<i class=\"fa fa-download\"></i>下载" +
-                    "</button>";
+                return "<button type='button' onclick=\"TalentInfoInfoDlg.downloadFile('" + row.id + "',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
+                        "<i class=\"fa fa-download\"></i>下载" +
+                        "</button>";
             }
         }
     ]
@@ -180,29 +181,29 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
 /**
  * 显示审核模态框
  */
-TalentInfoInfoDlg.showCommonCheckModal = function (){
-    var ajax = new $ax(Feng.ctxPath + "/talentInfo/validateIsCheck", function (data) {
-        if(data.code==200){
+TalentInfoInfoDlg.showCommonCheckModal = function () {
+    var ajax = new $ax("/admin/talent/validateIsCheck", function (data) {
+        if (data.code == 200) {
             layer.open({
                 type: 1,
-                id:"neewFieldFormModel",
+                id: "neewFieldFormModel",
                 title: '审核',
                 area: ['800px', '350px'], //宽高
                 fix: false, //不固定
-                shade:0,
+                shade: 0,
                 maxmin: true,
                 content: TalentInfoInfoDlg.createNoFieldCheckModal(),
-                btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交' ,'<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+                btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
                 btnAlign: 'c',
                 zIndex: layer.zIndex,
-                success:function(layero, index){
+                success: function (layero, index) {
                     layer.setTop(layero);
                     $("#commonCheckForm")[0].reset();
                     var process = $("#process").val();
-                    if(process==2){
+                    if (process == 2) {
                         var html = '<option value=""></option>\n' +
-                            '                            <option value="3">审核通过</option>\n' +
-                            '                            <option value="2">审核驳回</option>';
+                                '                            <option value="3">审核通过</option>\n' +
+                                '                            <option value="2">审核驳回</option>';
                         $("#checkStateModal").empty().append(html);
                     }
                     $("#checkStateModal").val(data.obj.checkState);
@@ -212,74 +213,83 @@ TalentInfoInfoDlg.showCommonCheckModal = function (){
                     TalentInfoInfoDlg.commonCheck(index);
                 }
             });
-        }else{
+        } else {
             Feng.error(data.msg);
         }
     }, function (data) {
         Feng.error("校验失败!" + data.responseJSON.message + "!");
     });
-    ajax.setData({"id":$("#id").val(),"process":$("#process").val(),"companyId":$("#companyId").val()})
+    ajax.setData({"id": $("#id").val(), "process": $("#process").val(), "companyId": $("#companyId").val()})
     ajax.start();
 }
 
 /**
  * 显示初审审核模态框
  */
-TalentInfoInfoDlg.showFirstCheckModal = function (){
-    var process = $("#process").val();
-    var ajax = new $ax(Feng.ctxPath + "/talentInfo/validateIsCheck", function (data) {
-        if(data.code==200){
+TalentInfoInfoDlg.showFirstCheckModal = function () {
+    var ajax = new $ax("/admin/talent/validateIsCheck", function (data) {
+        if (data.code == 200) {
             layer.open({
                 type: 1,
-                id:"neewFieldFormModel",
+                id: "neewFieldFormModel",
                 title: '审核',
                 area: ['800px', '450px'], //宽高
                 fix: false, //不固定
-                shade:0,
+                shade: 0,
                 maxmin: true,
-                content:TalentInfoInfoDlg.creatFieldCheckModal(),
-                btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交' ,'<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+                content: TalentInfoInfoDlg.creatFieldCheckModal(),
+                btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
                 btnAlign: 'c',
                 zIndex: layer.zIndex,
-                success:function(layero, index){
+                success: function (layero, index) {
                     layer.setTop(layero);
                     var obj = data.obj.talentInfo;
                     var fileList = data.obj.fileList;
-                    var html = '';
-                    for(var key in fileList){
-                        html = html + '<ul><li style="width: 100%"><input type="checkbox" value="'+fileList[key].id+'"><span>'+fileList[key].name+'</span></li></ul>';
+                    var process = data.obj.process;
+                    if (typeof data.obj.fieldList != "undefined" && data.obj.fieldList.length > 0) {
+                        var fieldList = data.obj.fieldList;
+                        var html1 = '';
+                        for (var key in fieldList) {
+                            html1 = html1 + '<li style="float:left;margin:0 10px 10px 0;"><input type="checkbox" value="' + fieldList[key]["key"] + '"><span>' + fieldList[key]["value"] + '</span></li>';
+                        }
+                    }
+                    var html2 = '';
+                    for (var key in fileList) {
+                        html2 = html2 + '<ul><li style="width: 100%"><input type="checkbox" value="' + fileList[key].id + '"><span>' + fileList[key].name + '</span></li></ul>';
                     }
-                    $("#field_file").empty().append(html);
+                    $("#field_info ul").empty().append(html1);
+                    $("#field_file").empty().append(html2);
                     var optionHtml = "";
-                    if(process == 1){
+                    if (process <= 3) {
                         optionHtml = '<option value="">请选择</option>\n' +
-                            '                            <option value="3">审核通过</option>\n' +
-                            '                            <option value="2">审核驳回</option>\n' ;
-                    }if(process == 3){
+                                '                            <option value="3">审核通过</option>\n' +
+                                '                            <option value="2">审核驳回</option>\n';
+                    }
+                    if (process == 4) {
                         optionHtml = '<option value="">请选择</option>\n' +
-                            '                            <option value="3">审核通过</option>\n' +
-                            '                            <option value="2">审核驳回</option>\n' +
-                            '                            <option value="-1">审核不通过</option>';
+                                '                            <option value="3">审核通过</option>\n' +
+                                '                            <option value="2">审核驳回</option>\n' +
+                                '                            <option value="-1">审核不通过</option>';
                     }
                     $("#checkStateFirstModal").empty().append(optionHtml);
                     $("#firstCheckForm")[0].reset();
-                    $("#checkStateFirstModal").val(obj.checkState);
+                    //$("#checkStateFirstModal").val(obj.checkState);
                     $("#checkStateFirstModal").trigger("change");
                     $("#checkMsgFirst").val(obj.checkMsg);
-                    if(obj.fields!=null && obj.fields!=''){
+                    if (obj.fields != null && obj.fields != '') {
                         $("#field_info input").each(function () {
                             var arr = obj.fields.split(",");
-                            for(var key in arr){
-                                if($(this).val()==arr[key]){
+                            for (var key in arr) {
+                                if ($(this).val() == arr[key]) {
                                     this.checked = true;
                                 }
                             }
                         });
                     }
-                    if(obj.files!=null && obj.files!=''){
+                    if (obj.files != null && obj.files != '') {
                         $("#field_file input").each(function () {
-                            if(obj.files.indexOf($(this).val())!=-1){
-                                this.checked=true;
+                            if (obj.files.indexOf($(this).val()) != -1) {
+                                this.checked = true;
                             }
                         });
                     }
@@ -288,24 +298,24 @@ TalentInfoInfoDlg.showFirstCheckModal = function (){
                     TalentInfoInfoDlg.firstCheck(index);
                 }
             });
-        }else{
+        } else {
             Feng.error(data.msg);
         }
     }, function (data) {
         Feng.error("校验失败!" + data.responseJSON.message + "!");
     });
-    ajax.setData({"id":$("#id").val(),"process":process,"companyId":$("#companyId").val()})
+    ajax.setData({"id": $("#id").val(), "companyId": $("#companyId").val()})
     ajax.start();
 }
 
-TalentInfoInfoDlg.toggledepField = function(){
+TalentInfoInfoDlg.toggledepField = function () {
     var checkState = $("#checkStateModal").val();
     var checkMsg = $("#checkMsg").val();
-    if(checkState==3){
-        if(checkMsg == null || checkMsg == ''){
+    if (checkState == 3) {
+        if (checkMsg == null || checkMsg == '') {
             $("#checkMsg").val("部门审核通过，待复核");
         }
-    }else{
+    } else {
         $("#checkMsg").val("");
     }
 }
@@ -314,25 +324,25 @@ TalentInfoInfoDlg.toggledepField = function(){
 /**
  * 显示字段或者隐藏字段选择
  */
-TalentInfoInfoDlg.toggleField = function (){
+TalentInfoInfoDlg.toggleField = function () {
     var checkState = $("#checkStateFirstModal").val();
     var process = $("#process").val();
     var source = $("#source").val();
     var checkMsgFirst = $("#checkMsgFirst").val();
-    if(checkState==2){
+    if (checkState == 2) {
         $("#field").show();
         $("#checkMsgFirst").val("");
-    }else if(checkState == 3){
+    } else if (checkState == 3) {
         $("#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)?"初审通过，待部门审核。":"复核通过，待核查征信。");
+        if (checkMsgFirst == null || checkMsgFirst == '') {
+            if (source == 1 || source == 2) {
+                $("#checkMsgFirst").val((process == 1) ? "初审通过，待复核。" : "复核通过，待核查征信。");
+            } else if (source == 3) {
+                $("#checkMsgFirst").val((process == 1) ? "初审通过，待部门审核。" : "复核通过，待核查征信。");
             }
         }
-    }else if(checkState == -1){
+    } else if (checkState == -1) {
         $("#field").hide();
         $("#checkMsgFirst").val("复核不通过");
     }
@@ -342,7 +352,7 @@ TalentInfoInfoDlg.toggleField = function (){
 /**
  * 全选
  */
-TalentInfoInfoDlg.checkAll = function(){
+TalentInfoInfoDlg.checkAll = function () {
     $("#field input").each(function () {
         this.checked = true;
     })
@@ -350,11 +360,11 @@ TalentInfoInfoDlg.checkAll = function(){
 /**
  * 反选
  */
-TalentInfoInfoDlg.unCheckAll = function(){
+TalentInfoInfoDlg.unCheckAll = function () {
     $("#field input").each(function () {
-        if(this.checked){
+        if (this.checked) {
             this.checked = false;
-        }else{
+        } else {
             this.checked = true;
         }
     })
@@ -363,25 +373,26 @@ TalentInfoInfoDlg.unCheckAll = function(){
 /**
  * 审核提交
  */
-TalentInfoInfoDlg.commonCheck = function (i){
+TalentInfoInfoDlg.commonCheck = function (i) {
     var checkState = $("#checkStateModal").val();
     var checkMsg = $("#checkMsg").val();
-    if(checkState==null||checkState==''){
+    if (checkState == null || checkState == '') {
         Feng.info("请选择审核状态");
-        return ;
+        return;
     }
-    if(checkMsg == null || checkMsg == ''){
+    if (checkMsg == null || checkMsg == '') {
         Feng.info("请填写审核意见");
-        return ;
+        return;
     }
-    if(locked)return;
-    locked =true;
-    var ajax = new $ax(Feng.ctxPath + "/talentInfo/check", function (data) {
-        if(data.code==200){
+    if (locked)
+        return;
+    locked = true;
+    var ajax = new $ax(Feng.ctxPath + "/admin/talent/check", function (data) {
+        if (data.code == 200) {
             Feng.success(data.msg);
             // $("#commonModal").modal("hide");
             layer.close(i);
-        }else{
+        } else {
             Feng.error(data.msg);
         }
         locked = false;
@@ -389,48 +400,49 @@ TalentInfoInfoDlg.commonCheck = function (i){
         Feng.error("提交审核失败!" + data.responseJSON.message + "!");
         locked = false;
     });
-    ajax.setData({"id":$("#id").val(),"checkState":checkState,"checkMsg":checkMsg,"process":$("#process").val(),"companyId":$("#companyId").val()})
+    ajax.setData({"id": $("#id").val(), "checkState": checkState, "checkMsg": checkMsg, "process": $("#process").val(), "companyId": $("#companyId").val()})
     ajax.start();
 }
 
 /**
  * 初审提交
  */
-TalentInfoInfoDlg.firstCheck = function(i){
+TalentInfoInfoDlg.firstCheck = function (i) {
     var checkState = $("#checkStateFirstModal").val();
     var checkMsg = $("#checkMsgFirst").val();
-    if(checkState==null||checkState==''){
+    if (checkState == null || checkState == '') {
         Feng.info("请选择审核状态");
-        return ;
+        return;
     }
-    if(checkMsg == null || checkMsg == ''){
+    if (checkMsg == null || checkMsg == '') {
         Feng.info("请填写审核意见");
-        return ;
+        return;
     }
     var fields = '';
     var files = '';
-    $("#field_info li input").each(function(index){
-        if($(this).is(":checked")){
+    $("#field_info li input").each(function (index) {
+        if ($(this).is(":checked")) {
             fields = fields + $(this).val() + ",";
         }
     });
-    $("#field_file li input").each(function(index){
-        if($(this).is(":checked")){
+    $("#field_file li input").each(function (index) {
+        if ($(this).is(":checked")) {
             files = files + $(this).val() + ",";
         }
     });
-    if(checkState==2 && fields=='' && files==''){
+    if (checkState == 2 && fields == '' && files == '') {
         Feng.info("请选择可修改的字段或附件！");
-        return ;
+        return;
     }
-    if(locked)return;
-    locked =true;
-    var ajax = new $ax(Feng.ctxPath + "/talentInfo/check", function (data) {
-        if(data.code==200){
+    if (locked)
+        return;
+    locked = true;
+    var ajax = new $ax("/admin/talent/check", function (data) {
+        if (data.code == 200) {
             // $("#firstModal").modal("hide");
             layer.close(i);
             Feng.success(data.msg);
-        }else{
+        } else {
             Feng.error(data.msg);
         }
         locked = false;
@@ -438,227 +450,215 @@ TalentInfoInfoDlg.firstCheck = function(i){
         Feng.error("提交审核失败!" + data.responseJSON.message + "!");
         locked = false;
     });
-    ajax.setData({"id":$("#id").val(),"checkState":checkState,"checkMsg":checkMsg,
-        "process":$("#process").val(),"fields":fields,"files":files})
+    ajax.setData({"id": $("#id").val(), "checkState": checkState, "checkMsg": checkMsg,
+        "process": $("#process").val(), "fields": fields, "files": files})
     ajax.start();
 }
 
 
-TalentInfoInfoDlg.submitCheck = function(){
-    var operation = function(){
-        var ajax = new $ax(Feng.ctxPath + "/talentInfo/submitCheck", function (data) {
-            if(data.code==200){
+TalentInfoInfoDlg.submitCheck = function () {
+    var operation = function () {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talent/submitCheck", function (data) {
+            if (data.code == 200) {
                 Feng.success(data.msg);
                 window.parent.TalentInfo.table.refresh();
                 TalentInfoInfoDlg.close();
-            }else{
+            } else {
                 Feng.error(data.msg);
             }
         }, function (data) {
             Feng.error("提交审核失败!" + data.responseJSON.message + "!");
         });
-        ajax.setData({"id":$("#id").val(),"process":$("#process").val(),"companyId":$("#companyId").val()});
+        ajax.setData({"id": $("#id").val(), "process": $("#process").val(), "companyId": $("#companyId").val()});
         ajax.start();
     }
     Feng.confirm("一旦提交无法修改，是否审核完毕且无误?", operation);
 }
 
-TalentInfoInfoDlg.fieldCheckd = function(context){
-    if($(context).get(0).checked){
-        $(context).parent().next().children()[0].checked=true;
+TalentInfoInfoDlg.fieldCheckd = function (context) {
+    if ($(context).get(0).checked) {
+        $(context).parent().next().children()[0].checked = true;
         $(context).parent().next().children().eq(0).trigger("change");
     }
 }
 
- TalentInfoInfoDlg.sourceCheckd = function(context){
-     if($(context).get(0).checked){
-         $("#talentArrangeCheckBox").attr("checked",true);
-         $("#talentArrangeCheckBox").trigger("change");
-     }
- }
+TalentInfoInfoDlg.sourceCheckd = function (context) {
+    if ($(context).get(0).checked) {
+        $("#talentArrangeCheckBox").attr("checked", true);
+        $("#talentArrangeCheckBox").trigger("change");
+    }
+}
 
-TalentInfoInfoDlg.download = function(){
-    window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/api/commonDownload/downloadZip?type=1&id="+$("#id").val()));
+TalentInfoInfoDlg.download = function () {
+    window.location.href = encodeURI(encodeURI("/common/api/downloadZip?type=1&id=" + $("#id").val()));
 }
 
 
- TalentInfoInfoDlg.creatFieldCheckModal = function () {
+TalentInfoInfoDlg.creatFieldCheckModal = function () {
     var type = $("#type").val();
-    if(type==1){
+    if (type == 1) {
         return '<form id="firstCheckForm">\n' +
-            '                    <div class="form-group" style="margin: 10px;">\n' +
-            '                        <label for="checkState" class="control-label">审核状态</label>\n' +
-            '                        <select class="form-control" id="checkStateFirstModal" onchange="TalentInfoInfoDlg.toggleField()">\n' +
-            '                            <option value="">请选择</option>\n' +
-            '                            <option value="3">审核通过</option>\n' +
-            '                            <option value="2">审核驳回</option>\n' +
-            '                            <option value="-1">审核不通过</option>\n' +
-            '                        </select>\n' +
-            '                    </div>\n' +
-            '                    <div class="form-group" style="margin: 10px;">\n' +
-            '                        <label for="checkMsg" class="control-label" >审核意见</label>\n' +
-            '                        <textarea class="form-control" id="checkMsgFirst" placeholder="审核状态属“审核通过”的，仅代表此步骤已操作完成，不代表用户提交的信息符合认定条件。若不符合认定条件的，请写明不符合原因。" rows="6"></textarea>\n' +
-            '                        <div id="field" style="padding-top: 5px;display: none">\n' +
-            '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
-            '                            <div id="field_info">\n' +
-            '                                <ul>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="name"><span>姓名</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="sex"><span>性别</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="birthday"><span>出生日期</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="nationality"><span>国籍/地区</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="provinceCode" onchange="TalentInfoInfoDlg.fieldCheckd(this)"><span>籍贯省</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="cityCode" onchange="TalentInfoInfoDlg.fieldCheckd(this)"><span>籍贯市</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="countyCode"><span>籍贯县</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="nation"><span>民族</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="politics"><span>政治面貌</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="cardType"><span>证件类型</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="idCard"><span>证件号码</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="firstInJJTime"><span>首次来晋工作时间</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="source" onchange="TalentInfoInfoDlg.sourceCheckd(this)"><span>申报来源</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="ourCitySource"><span>公布入选来源</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="fromCity"><span>入选来源县市</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="qzBatch"><span>入选名单批次</span></li>\n' +
-            '                                    <li style="width:31%"><input type="checkbox" value="certificateStartTime"><span>泉州高层次人才证书发证日期</span></li>\n' +
-            '                                    <li style="width:31%"><input type="checkbox" value="qzgccrcActiveTime"><span>泉州高层次人才证书的有效期</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" id="talentArrangeCheckBox" value="talentArrange" onchange="TalentInfoInfoDlg.fieldCheckd(this)"><span>人才层次</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="identifyCondition"><span>认定条件</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="talentType"><span>人才标签</span></li>\n' +
-            '                                    <li style="width:31%"><input type="checkbox" value="letterTime"><span>首次来晋行政介绍信时间</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="introductionMode"><span>引进方式</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="post"><span>职务</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="lastYearWages"><span>上一年度年薪</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="highEducation"><span>最高学历</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="graduateSchool"><span>毕业院校</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="major"><span>专业</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="title"><span>职称</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="studyAbroad"><span>是否有留学经历</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="phone"><span>手机号码</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="email"><span>电子邮箱</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="bank"><span>开户银行</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>\n' +
-            '                                    <li style="width:31%"><input type="checkbox" value="breakFaith"><span>曾被相关主管部门列为失信个人</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="educationAndResume"><span>教育背景及工作简历</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>\n' +
-            '                                    <li style="width:10%"><input type="checkbox" value="description"><span>备注</span></li>\n' +
-            '                                </ul>\n' +
-            '                            </div>\n' +
-            '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
-            '                            <div id="field_file">\n' +
-            '                            </div>\n' +
-            '                            <div class="form-group" style="text-align: center">\n' +
-            '                                <button type="button" class="btn btn-primary" onclick="TalentInfoInfoDlg.checkAll()">全选</button>\n' +
-            '                                <button type="button" class="btn btn-success" onclick="TalentInfoInfoDlg.unCheckAll()">反选</button>\n' +
-            '                            </div>\n' +
-            '                        </div>\n' +
-            '                    </div>\n' +
-            '                </form>';
-    }else if(type==2){
+                '                    <div class="form-group" style="margin: 10px;">\n' +
+                '                        <label for="checkState" class="control-label">审核状态</label>\n' +
+                '                        <select class="form-control" id="checkStateFirstModal" onchange="TalentInfoInfoDlg.toggleField()">\n' +
+                '                            <option value="">请选择</option>\n' +
+                '                            <option value="3">审核通过</option>\n' +
+                '                            <option value="2">审核驳回</option>\n' +
+                '                            <option value="-1">审核不通过</option>\n' +
+                '                        </select>\n' +
+                '                    </div>\n' +
+                '                    <div class="form-group" style="margin: 10px;">\n' +
+                '                        <label for="checkMsg" class="control-label" >审核意见</label>\n' +
+                '                        <textarea class="form-control" id="checkMsgFirst" placeholder="审核状态属“审核通过”的，仅代表此步骤已操作完成，不代表用户提交的信息符合认定条件。若不符合认定条件的，请写明不符合原因。" rows="6"></textarea>\n' +
+                '                        <div id="field" style="padding-top: 5px;display: none">\n' +
+                '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
+                '                            <div id="field_info">\n' +
+                '                                <ul style="overflow:hidden;">\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="name"><span>姓名</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="sex"><span>性别</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="birthday"><span>出生日期</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="industryField"><span>行业领域</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="address"><span>所属镇街</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="nationality"><span>国籍/地区</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="provinceCode"><span>籍贯省</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="cityCode"><span>籍贯市</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="countyCode"><span>籍贯县</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="cardType"><span>证件类型</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="idCard"><span>证件号码</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="nation"><span>民族</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="politics"><span>政治面貌</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="post"><span>职务</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="highEducation"><span>最高学历</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="graduateSchool"><span>毕业院校</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="major"><span>专业</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="title"><span>职称</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="studyAbroad"><span>是否有留学经历</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="phone"><span>手机号码</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="email"><span>电子邮箱</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="bank"><span>开户银行</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>\n' +
+                '                                <li style="width:31%"><input type="checkbox" value="breakFaith"><span>曾被相关主管部门列为失信个人</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="talentArrange"><span>人才层次</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="identifyCondition"><span>认定条件</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="educationAndResume"><span>教育背景及工作简历</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="description"><span>备注</span></li>\n' +
+                '                                </ul>\n' +
+                '                            </div>\n' +
+                '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
+                '                            <div id="field_file">\n' +
+                '                            </div>\n' +
+                '                            <div class="form-group" style="text-align: center">\n' +
+                '                                <button type="button" class="btn btn-primary" onclick="TalentInfoInfoDlg.checkAll()">全选</button>\n' +
+                '                                <button type="button" class="btn btn-success" onclick="TalentInfoInfoDlg.unCheckAll()">反选</button>\n' +
+                '                            </div>\n' +
+                '                        </div>\n' +
+                '                    </div>\n' +
+                '                </form>';
+    } else if (type == 2) {
 
         return  '<form id="firstCheckForm">\n' +
+                '                    <div class="form-group" style="margin: 10px;">\n' +
+                '                        <label for="checkState" class="control-label">审核状态</label>\n' +
+                '                        <select class="form-control" id="checkStateFirstModal" onchange="TalentInfoInfoDlg.toggleField()">\n' +
+                '                            <option value="">请选择</option>\n' +
+                '                            <option value="3">审核通过</option>\n' +
+                '                            <option value="2">审核驳回</option>\n' +
+                '                            <option value="-1">审核不通过</option>\n' +
+                '                        </select>\n' +
+                '                    </div>\n' +
+                '                    <div class="form-group" style="margin: 10px;">\n' +
+                '                        <label for="checkMsg" class="control-label" >审核意见</label>\n' +
+                '                        <textarea class="form-control" id="checkMsgFirst" placeholder="审核状态属“审核通过”的，仅代表此步骤已操作完成，不代表用户提交的信息符合认定条件。若不符合认定条件的，请写明不符合原因。" rows="6"></textarea>\n' +
+                '                        <div id="field" style="padding-top: 5px;display: none">\n' +
+                '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
+                '                            <div id="field_info">\n' +
+                '                                <ul>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="name"><span>姓名</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="sex"><span>性别</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="birthday"><span>出生日期</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="industryField"><span>行业领域</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="address"><span>所属镇街</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="nationality"><span>国籍/地区</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="provinceCode"><span>籍贯省</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="cityCode"><span>籍贯市</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="countyCode"><span>籍贯县</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="cardType"><span>证件类型</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="idCard"><span>证件号码</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="nation"><span>民族</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="politics"><span>政治面貌</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="post"><span>职务</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="highEducation"><span>最高学历</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="graduateSchool"><span>毕业院校</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="major"><span>专业</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="title"><span>职称</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="studyAbroad"><span>是否有留学经历</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="phone"><span>手机号码</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="email"><span>电子邮箱</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="bank"><span>开户银行</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>\n' +
+                '                                <li style="width:31%"><input type="checkbox" value="breakFaith"><span>曾被相关主管部门列为失信个人</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="talentArrange"><span>人才层次</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="identifyCondition"><span>认定条件</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="educationAndResume"><span>教育背景及工作简历</span></li>\n' +
+                '                                <li style="width:20.5%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>\n' +
+                '                                <li style="width:10%"><input type="checkbox" value="description"><span>备注</span></li>\n' +
+                '                            </ul>\n' +
+                '                            </div>\n' +
+                '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
+                '                            <div id="field_file">\n' +
+                '                            </div>\n' +
+                '                            <div class="form-group" style="text-align: center">\n' +
+                '                                <button type="button" class="btn btn-primary" onclick="TalentInfoInfoDlg.checkAll()">全选</button>\n' +
+                '                                <button type="button" class="btn btn-success" onclick="TalentInfoInfoDlg.unCheckAll()">反选</button>\n' +
+                '                            </div>\n' +
+                '                        </div>\n' +
+                '                    </div>\n' +
+                '                </form>';
+    }
+}
+
+TalentInfoInfoDlg.createNoFieldCheckModal = function () {
+    return '<form id="commonCheckForm" >\n' +
             '                    <div class="form-group" style="margin: 10px;">\n' +
             '                        <label for="checkState" class="control-label">审核状态</label>\n' +
-            '                        <select class="form-control" id="checkStateFirstModal" onchange="TalentInfoInfoDlg.toggleField()">\n' +
-            '                            <option value="">请选择</option>\n' +
+            '                        <select class="form-control" id="checkStateModal" >\n' +
+            '                            <option value=""></option>\n' +
             '                            <option value="3">审核通过</option>\n' +
             '                            <option value="2">审核驳回</option>\n' +
-            '                            <option value="-1">审核不通过</option>\n' +
             '                        </select>\n' +
             '                    </div>\n' +
             '                    <div class="form-group" style="margin: 10px;">\n' +
-            '                        <label for="checkMsg" class="control-label" >审核意见</label>\n' +
-            '                        <textarea class="form-control" id="checkMsgFirst" placeholder="审核状态属“审核通过”的，仅代表此步骤已操作完成，不代表用户提交的信息符合认定条件。若不符合认定条件的，请写明不符合原因。" rows="6"></textarea>\n' +
-            '                        <div id="field" style="padding-top: 5px;display: none">\n' +
-            '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
-            '                            <div id="field_info">\n' +
-            '                                <ul>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="name"><span>姓名</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="sex"><span>性别</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="birthday"><span>出生日期</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="industryField"><span>行业领域</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="address"><span>所属镇街</span></li>\n' +
-            '                                <li style="width:20.5%"><input type="checkbox" value="nationality"><span>国籍/地区</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="provinceCode"><span>籍贯省</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="cityCode"><span>籍贯市</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="countyCode"><span>籍贯县</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="cardType"><span>证件类型</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="idCard"><span>证件号码</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="nation"><span>民族</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="politics"><span>政治面貌</span></li>\n' +
-            '                                <li style="width:20.5%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="post"><span>职务</span></li>\n' +
-            '                                <li style="width:20.5%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>\n' +
-            '                                <li style="width:20.5%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="highEducation"><span>最高学历</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="graduateSchool"><span>毕业院校</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="major"><span>专业</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="title"><span>职称</span></li>\n' +
-            '                                <li style="width:20.5%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>\n' +
-            '                                <li style="width:20.5%"><input type="checkbox" value="studyAbroad"><span>是否有留学经历</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="phone"><span>手机号码</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="email"><span>电子邮箱</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="bank"><span>开户银行</span></li>\n' +
-            '                                <li style="width:20.5%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>\n' +
-            '                                <li style="width:31%"><input type="checkbox" value="breakFaith"><span>曾被相关主管部门列为失信个人</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="talentArrange"><span>人才层次</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="identifyCondition"><span>认定条件</span></li>\n' +
-            '                                <li style="width:20.5%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>\n' +
-            '                                <li style="width:20.5%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>\n' +
-            '                                <li style="width:20.5%"><input type="checkbox" value="educationAndResume"><span>教育背景及工作简历</span></li>\n' +
-            '                                <li style="width:20.5%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>\n' +
-            '                                <li style="width:10%"><input type="checkbox" value="description"><span>备注</span></li>\n' +
-            '                            </ul>\n' +
-            '                            </div>\n' +
-            '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
-            '                            <div id="field_file">\n' +
-            '                            </div>\n' +
-            '                            <div class="form-group" style="text-align: center">\n' +
-            '                                <button type="button" class="btn btn-primary" onclick="TalentInfoInfoDlg.checkAll()">全选</button>\n' +
-            '                                <button type="button" class="btn btn-success" onclick="TalentInfoInfoDlg.unCheckAll()">反选</button>\n' +
-            '                            </div>\n' +
-            '                        </div>\n' +
+            '                        <label for="checkMsg" class="control-label">审核意见</label>\n' +
+            '                        <textarea class="form-control" id="checkMsg" placeholder="审核状态属“审核通过”的，仅代表此步骤已操作完成，不代表用户提交的信息符合认定条件。若不符合认定条件的，请写明不符合原因。" rows="6"></textarea>\n' +
             '                    </div>\n' +
             '                </form>';
-    }
- }
+}
 
- TalentInfoInfoDlg.createNoFieldCheckModal = function(){
-    return '<form id="commonCheckForm" >\n' +
-        '                    <div class="form-group" style="margin: 10px;">\n' +
-        '                        <label for="checkState" class="control-label">审核状态</label>\n' +
-        '                        <select class="form-control" id="checkStateModal" >\n' +
-        '                            <option value=""></option>\n' +
-        '                            <option value="3">审核通过</option>\n' +
-        '                            <option value="2">审核驳回</option>\n' +
-        '                        </select>\n' +
-        '                    </div>\n' +
-        '                    <div class="form-group" style="margin: 10px;">\n' +
-        '                        <label for="checkMsg" class="control-label">审核意见</label>\n' +
-        '                        <textarea class="form-control" id="checkMsg" placeholder="审核状态属“审核通过”的，仅代表此步骤已操作完成，不代表用户提交的信息符合认定条件。若不符合认定条件的，请写明不符合原因。" rows="6"></textarea>\n' +
-        '                    </div>\n' +
-        '                </form>';
- }
-
-
-
-$(function() {
-    $("select").each(function () {
-        $(this).val($(this).attr("value")).trigger("change");
-    });
+
+
+$(function () {
     $("select:not(#checkStateModal,#checkStateFirstModal)").each(function () {
-        $(this).attr("disabled","disabled");
+        //$(this).attr("disabled", "disabled");
     });
     $("input,textarea").not("#checkMsg,#checkMsgFirst").each(function () {
-        $(this).attr("readonly","readonly");
+        $(this).attr("readonly", "readonly");
     });
     // TalentInfoInfoDlg.initFileTable();
     TalentInfoInfoDlg.typeChange();
@@ -666,7 +666,7 @@ $(function() {
     $("#photoImg").viewer();
     $('[data-toggle="tooltip"]').tooltip();
     TalentInfoInfoDlg.initFileTable();
-    Feng.getCheckLog("logTable",{"type":CONFIG.project_rcrd,"mainId":$("#id").val(),"typeFileId":"","active":1})
+    Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": $("#id").val(), "typeFileId": "", "active": 1})
 });