sugangqiang 1 年之前
父節點
當前提交
779a78c394

+ 2 - 2
app/admin/controller/IntegralVerify.php

@@ -1129,7 +1129,7 @@ class IntegralVerify extends AdminController {
     }
 
     public function getPhones() {
-        $list = VerifyApi::getListByProcess($this->request->param("process"));
+        $list = VerifyApi::getListByProcess($this->request->param());
         $result = [];
         if ($list) {
             foreach ($list as $item) {
@@ -1142,7 +1142,7 @@ class IntegralVerify extends AdminController {
     }
 
     public function getEnterprisePhones() {
-        $list = VerifyApi::getListByProcess($this->request->param("process"));
+        $list = VerifyApi::getListByProcess($this->request->param());
         $result = [];
         if ($list) {
             foreach ($list as $item) {

+ 85 - 78
app/admin/controller/Talent.php

@@ -264,12 +264,24 @@ class Talent extends AdminController {
      * @auth {{/talentInfo/gotoIndex/2}}
      */
     public function dept_verify() {
+        $tpl = "";
         $companys = CompanyApi::getAll();
         $superpriv = VerifyApi::chkUserInSuperDeptUsers();
         $commonAssigns = $this->getCommonAssigns();
         $assigns = ["companys" => $companys, "superpriv" => $superpriv];
         $newAssigns = array_merge($assigns, $commonAssigns);
-        return view("", $newAssigns);
+        switch ($this->user["type"]) {
+            case CommonConst::ENTERPRISE_WJ:
+                $tpl = "/talent/hospital/dept_verify";
+                $medicalCommunities = \app\common\api\Nhc::getMedicalCommunityList();
+                $newAssigns["medicalCommunities"] = $medicalCommunities;
+                break;
+            case CommonConst::ENTERPRISE_GJ:
+                //$tpl = "/talent/school/dept_verify";
+                break;
+        }
+
+        return view($tpl, $newAssigns);
     }
 
     /**
@@ -277,7 +289,20 @@ class Talent extends AdminController {
      * @auth {{/talentInfo/gotoIndex/3}}
      */
     public function re_verify() {
-        return view("", $this->getCommonAssigns());
+        $tpl = "";
+        $assigns = $this->getCommonAssigns();
+        switch ($this->user["type"]) {
+            case CommonConst::ENTERPRISE_WJ:
+                $tpl = "/talent/hospital/re_verify";
+                $medicalCommunities = \app\common\api\Nhc::getMedicalCommunityList();
+                $_assigns = ["medicalCommunities" => $medicalCommunities];
+                $assigns = array_merge($assigns, $_assigns);
+                break;
+            case CommonConst::ENTERPRISE_GJ:
+                $tpl = "/talent/school/re_verify";
+                break;
+        }
+        return view($tpl, $assigns);
     }
 
     /**
@@ -775,7 +800,7 @@ class Talent extends AdminController {
             $_prefix_type = "";
             $subindex = 5;
             switch ($user["type"]) {
-                case 2:
+                case CommonConst::ENTERPRISE_JC:
                     $_prefix_type = "IC";
                     $subindex += strlen($_prefix_type);
                     break;
@@ -948,7 +973,7 @@ class Talent extends AdminController {
      * @param type $talent_info
      * @return type json
      */
-    private function fstCheck(\think\Request $request, $talent_info) {
+    private function fstCheck(\think\Request $request, $talent_info, $ep) {
         $params = $request->param();
         $data["pass_dept_check"] = 0;
         if ($params["checkState"] == 3) {
@@ -999,7 +1024,24 @@ class Talent extends AdminController {
             $log_checkState = $checkState = TalentState::FST_VERIFY_PASS; //初审成功
         } else {
 //审核驳回并记录需要修改的字段和上传文件
-            $checkState = TalentState::SCND_SAVE; //退回材料编辑状态
+            if ($ep["type"] == CommonConst::ENTERPRISE_WJ) {
+                if ($params["checkState"] == 6) {
+                    //驳回到分院
+                    if ($ep["isGeneral"] == 1) {
+                        return json(["msg" => "总院不能驳回到分院"]);
+                    } else {
+                        $checkState = TalentState::FST_SAVE;
+                    }
+                } else {
+                    if ($ep["isGeneral"] == 1) {
+                        $checkState = TalentState::SCND_SAVE; //退回材料编辑状态
+                    } else {
+                        $checkState = TalentState::FST_SUBMIT;
+                    }
+                }
+            } else {
+                $checkState = TalentState::SCND_SAVE; //退回材料编辑状态
+            }
             $log_checkState = TalentState::FST_VERIFY_REJECT; //日志记录拒绝状态
         }
         $log = TalentLogApi::getLastLog($talent_info["id"], 1);
@@ -1023,7 +1065,7 @@ class Talent extends AdminController {
      * @param type $talent_info
      * @return type json
      */
-    private function fstSubmitCheck($talent_info) {
+    private function fstSubmitCheck($talent_info, $ep) {
         $nowProcess = 3;
         $log = TalentLogApi::getLastLog($talent_info["id"], 1);
         if (!$log || $log["active"] == 1)
@@ -1469,10 +1511,14 @@ class Talent extends AdminController {
         $fields = $params["fields"];
         $id = $params["id"];
         $talent_info = VerifyApi::getOne($id);
+        $ep = EnterpriseApi::getOne($talent_info["enterprise_id"]);
         $checkState = $talent_info["checkState"];
-        if (!$talent_info) {
+        if (!$talent_info || !$ep) {
             return json(["msg" => "数据错误"]);
         }
+        if ($ep["type"] != $this->user["type"]) {
+            return json(["msg" => "不能审核的人才类型"]);
+        }
         if (!$check) {
             return json(["msg" => "请选择审核状态"]);
         }
@@ -1484,7 +1530,7 @@ class Talent extends AdminController {
         } else if ($checkState == TalentState::BASE_VERIFY_PASS) {
             return $this->baseReCheck($request, $talent_info);
         } else if ($checkState == TalentState::SCND_SUBMIT) {
-            return $this->fstCheck($request, $talent_info);
+            return $this->fstCheck($request, $talent_info, $ep);
         } else if ($checkState == TalentState::FST_VERIFY_PASS) {
             $condition = TalentConditionApi::getOne($talent_info["talent_condition"]);
             $companys = array_filter(explode(",", $condition["companyIds"]));
@@ -1506,16 +1552,20 @@ class Talent extends AdminController {
 //公共调度方法
         $id = $this->request->param("id");
         $talent_info = VerifyApi::getOne($id);
+        $ep = EnterpriseApi::getOne($talent_info["enterprise_id"]);
         $checkState = $talent_info["checkState"];
-        if (!$talent_info) {
+        if (!$talent_info || !$ep) {
             return json(["msg" => "数据错误"]);
         }
+        if ($ep["type"] != $this->user["type"]) {
+            return json(["msg" => "不能审核的人才类型"]);
+        }
         if ($checkState == TalentState::FST_SUBMIT) {
             return $this->baseSubmitCheck($talent_info);
         } else if ($checkState == TalentState::BASE_VERIFY_PASS) {
             return $this->baseReSubmitCheck($talent_info);
         } else if ($checkState == TalentState::SCND_SUBMIT) {
-            return $this->fstSubmitCheck($talent_info);
+            return $this->fstSubmitCheck($talent_info, $ep);
         } else if ($checkState == TalentState::FST_VERIFY_PASS) {
             $condition = TalentConditionApi::getOne($talent_info["talent_condition"]);
             $companys = array_filter(explode(",", $condition["companyIds"]));
@@ -1584,73 +1634,29 @@ class Talent extends AdminController {
         $id = $params["id"];
         $process = $params["process"];
         $talent_info = VerifyApi::getOne($id);
-        $fstLog = TalentLogApi::getFstLog($id, 1);
-        $isMix = false;
-        if (in_array($fstLog["state"], [TalentState::SCND_SAVE, TalentState::SCND_SUBMIT])) {
-            //初次提交是待初审状态,则为新的混合基础信息和人才认证信息的申报
-            $isMix = true;
-        }
         $enterprise = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
         if ($talent_info) {
             $checkState = $talent_info["checkState"];
             if (!$process || ($process == 3 && $checkState != TalentState::SCND_SUBMIT) || ($process == 4 && ($checkState != TalentState::FST_VERIFY_PASS || $talent_info["pass_dept_check"] == 1)) || ($process == 5 && !in_array($checkState, [TalentState::DEPT_VERIFY_PASS, TalentState::FST_VERIFY_PASS]))) {
                 return json(["msg" => "该申报不在审核范围内,无法审核"]);
             }
-            $process = 0;
-            switch ($checkState) {
-                case TalentState::FST_SUBMIT:
-                    $fields = DictApi::getTalentFields(1, $talent_info["isImport"]);
-                    $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 TalentState::BASE_VERIFY_PASS:
-                    $fields = DictApi::getTalentFields(1, $talent_info["isImport"]);
-                    $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 = 2;
-                    break;
-                case TalentState::SCND_SUBMIT:
-                    $fields = DictApi::getTalentFields(2, $talent_info["isImport"]);
-                    $process = 3;
-                    break;
-                case TalentState::FST_VERIFY_PASS:
-                    $tc = TalentConditionApi::getOne($talent_info["talent_condition"]);
-                    if ($tc["companyIds"] && $talent_info["pass_dept_check"] != 1) {
-                        $process = 4;
-                        $fields = DictApi::getTalentFields(3, $talent_info["isImport"]);
-                    } else {
-                        $process = 5;
-                        $fields = DictApi::getTalentFields(2, $talent_info["isImport"]);
-                    }
-                    break;
-                case TalentState::DEPT_VERIFY_PASS:
-                    $process = 5;
-                    $fields = DictApi::getTalentFields(2, $talent_info["isImport"]);
-                    break;
-            }
-            if ($isMix && $process != 4) {
-                if ($enterprise["type"] == 2) {
-                    $fields = DictApi::getTalentFields_IC();
-                } else {
-                    $fields = DictApi::getTalentFields(4, $talent_info["isImport"]);
+            if ($process != 4) {
+                switch ($enterprise["type"]) {
+                    case CommonConst::ENTERPRISE_NORMAL:
+                        $fields = DictApi::getTalentFields(4, $talent_info["isImport"]);
+                        break;
+                    case CommonConst::ENTERPRISE_JC:
+                        $fields = DictApi::getTalentFields_IC();
+                        break;
+                    case CommonConst::ENTERPRISE_WJ:
+                        $fields = DictApi::getTalentFields_WJ();
+                        break;
+                    case CommonConst::ENTERPRISE_GJ:
+                        $fields = DictApi::getTalentFields_GJ();
+                        break;
                 }
+            } else {
+                $fields = null; //部门审核不需要审核字段
             }
             if ($fields["fst_work_time"] && in_array($enterprise['enterpriseTag'], ['mtdw', 'gyqyh', 'mbfqy', 'jrjg']) && $enterprise["type"] == 1) {
                 $fields["fst_work_time"] = $talent_info['talent_type'] == 1 ? "近三年来晋工作时间" : "近三年(首次)来晋工作时间";
@@ -1675,7 +1681,7 @@ class Talent extends AdminController {
                     }
                     $_companys[] = $company;
                 }
-                if ($process == 4 && $enterprise["type"] == 1) {
+                if ($process == 4 && in_array($enterprise["type"], [CommonConst::ENTERPRISE_NORMAL, CommonConst::ENTERPRISE_WJ])) {
                     $where = [];
                     $cwfts = explode(";", $condition["companyWithFileType"]);
                     foreach ($cwfts as $cwft) {
@@ -1694,9 +1700,6 @@ class Talent extends AdminController {
                 } else {
                     $where = [];
                     $whr = [];
-                    if (!$isMix) {
-                        $where[] = ["step", "=", 2];
-                    }
                     $where[] = ["project", "=", 1];
                     $where[] = ["active", "=", 1];
                     $where[] = ["type", "=", $enterprise["type"]];
@@ -1758,7 +1761,7 @@ class Talent extends AdminController {
                 $check["checkState"] = -1; //复审失败
             }
             /* 保存的审核内容end */
-            return json(["code" => 200, "obj" => ["process" => $process, "talentInfo" => $talent_info, "check" => $check, "fieldList" => $field_tmp, "fileList" => $files, "companys" => $_companys]]);
+            return json(["code" => 200, "obj" => ["process" => $process, "type" => $enterprise["type"], "talentInfo" => $talent_info, "check" => $check, "fieldList" => $field_tmp, "fileList" => $files, "companys" => $_companys]]);
         }
     }
 
@@ -1768,8 +1771,12 @@ class Talent extends AdminController {
         $lastLog = TalentLogApi::getLastLog($id, ProjectState::TALENT);
         $responseObj = new \stdClass();
         if ($talentInfo["checkState"] == TalentState::SCND_SAVE && $lastLog["state"] == TalentState::FST_VERIFY_REJECT) {
-            if ($this->user["type"] == 2) {
+            if ($this->user["type"] == CommonConst::ENTERPRISE_JC) {
                 $fields = DictApi::getTalentFields_IC();
+            } else if ($this->user["type"] == CommonConst::ENTERPRISE_WJ) {
+                $fields = DictApi::getTalentFields_WJ();
+            } else if ($this->user["type"] == CommonConst::ENTERPRISE_GJ) {
+                $fields = DictApi::getTalentFields_GJ();
             } else {
                 $fields = DictApi::getTalentFields(4, $talentInfo["isImport"]);
             }
@@ -2004,7 +2011,7 @@ class Talent extends AdminController {
     }
 
     public function getPhones() {
-        $list = VerifyApi::getListByProcess($this->request->param("process"));
+        $list = VerifyApi::getListByProcess($this->request->param());
         $result = [];
         if ($list) {
             foreach ($list as $item) {
@@ -2017,7 +2024,7 @@ class Talent extends AdminController {
     }
 
     public function getEnterprisePhones() {
-        $list = VerifyApi::getListByProcess($this->request->param("process"));
+        $list = VerifyApi::getListByProcess($this->request->param());
         $result = [];
         if ($list) {
             foreach ($list as $item) {

+ 42 - 6
app/common/api/DictApi.php

@@ -301,6 +301,42 @@ class DictApi {
         return $dict;
     }
 
+    public static function getTalentFields_GJ() {
+        $dict = [
+            "name" => "姓名",
+            "sex" => "性别",
+            "nation" => "民族",
+            "politics" => "政治面貌",
+            "card_type" => "证件类型",
+            "card_number" => "证件号码",
+            "birthday" => "出生日期",
+            "talent_type" => "人才类型",
+            "highest_degree" => "最高学历",
+            "graduate_school" => "毕业院校",
+            "major" => "专业",
+            "study_abroad" => "是否有留学经历",
+            "abroad_school" => "留学毕业院校",
+            "abroad_major" => "留学专业",
+            "position" => "职务",
+            "cur_entry_time" => "入职时间",
+            "labor_contract_rangetime" => "工作合同起止时间",
+            "title" => "职称",
+            "talent_arrange" => "人才层次",
+            "talent_arrange_category" => "人才条款",
+            "talent_condition" => "认定条件",
+            "phone" => "手机号码",
+            "email" => "电子邮箱",
+            "bank" => "开户银行",
+            "bank_account" => "银行账号",
+            "bank_number" => "银行行号",
+            "bank_branch_name" => "开户银行网点",
+            "education" => "教育背景及工作简历",
+            "experience" => "主要业绩及取得的荣誉",
+            "headimgurl" => "头像"
+        ];
+        return $dict;
+    }
+
     // 1保存未提交 2已提交未审核 3已审核 4驳回 5保存补充材料未提交 6提交补充材料进入初审 7初审通过 8初审驳回 9部门审核通过 10部门审核驳回 11复核通过 12复核驳回 13复核失败
     public static function getCheckLogStepName($state, $step) {
         $stepName = "";
@@ -308,7 +344,7 @@ class DictApi {
             case -1:
             case 3:
             case 4:
-                $stepName = '<span class="label label-primary">基础信息审核</span>';
+                $stepName = '<span class="label label-primary">总院审核</span>';
                 break;
             case 5:
             case 6:
@@ -383,9 +419,9 @@ class DictApi {
                 break;
             case 1:
                 if ($last_state > $state) {
-                    $str = '<span class="label label-danger">基础信息审核驳回</span>';
+                    $str = '<span class="label label-danger">驳回到分院</span>';
                 } else {
-                    $str = '<span class="label">待提交基础信息</span>';
+                    $str = '<span class="label">待提交总院</span>';
                 }
                 break;
             case 2:
@@ -395,14 +431,14 @@ class DictApi {
                 if ($last_state == 3) {
                     $str = '<span class="label label-danger">基础信息复审驳回</span>';
                 } else {
-                    $str = '<span class="label label-success">待审核</span>';
+                    $str = '<span class="label label-success">待总院审核</span>';
                 }
                 break;
             case 3:
-                $str = '<span class="label label-primary">基础信息审核通过</span>';
+                $str = '<span class="label label-primary">总院审核通过</span>';
                 break;
             case 4:
-                $str = '<span class="label">再提交基础信息</span>';
+                $str = '<span class="label">再提交总院</span>';
                 break;
             case 5:
                 $str = '<span class="label label-primary">基础信息复审通过</span>';

+ 1 - 1
app/common/api/Nhc.php

@@ -39,7 +39,7 @@ class Nhc {
         $where[] = ["checkState", "=", 3];
         $where[] = ["active", "=", 1];
         $where[] = ["delete", "=", 0];
-        return \app\admin\model\Enterprise::where($where)->find()->toArray();
+        return \app\admin\model\Enterprise::where($where)->findOrEmpty()->toArray();
     }
 
 }

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

@@ -17,9 +17,7 @@ use app\common\model\TalentCondition;
 class VerifyApi {
 
     public static function getTalentInfoById($id, $isAdmin = false) {//添加admin只为区别导入数据管理端的显示差异
-        $where = [];
-        $where[] = ["id", "=", $id];
-        $info = Talent::findOrEmpty($id)->toArray();
+        $info = self::getOne($id);
         if ($info) {
             if ($info["talent_type"]) {
                 $info["talentTypeName"] = DictApi::selectByParentCode("talent_type")[$info["talent_type"]];
@@ -148,7 +146,7 @@ class VerifyApi {
     }
 
     public static function getOne($id) {
-        return Talent::findOrEmpty($id);
+        return Talent::findOrEmpty($id)->toArray();
     }
 
     /**
@@ -298,15 +296,17 @@ class VerifyApi {
                         ->where($where)
                         ->where($whereRaw)
                         ->whereRaw("find_in_set(:companyId,companyIds)", ["companyId" => $companyId])
-                        ->field("ti.*,tl.last_state as 'lastState',tl.state as 'realState',tl.new_state as 'newState',e.name as enterprise_name,e.type as enterprise_type,enterpriseTag,tc.name as talentConditionName,tl2.resubmit,tl.active as deptActive")
+                        ->field("ti.*,tl.last_state as 'lastState',tl.state as 'realState',tl.new_state as 'newState',e.name as enterprise_name,e.type as enterprise_type,enterpriseTag,e.isGeneral,e.medicalCommunityId,tc.name as talentConditionName,tl2.resubmit,tl.active as deptActive")
                         ->limit($offset, $limit)->order("ti.createTime " . $order)
                         ->select()->toArray();
+        $medicalCommunity_kvs = Nhc::getMedicalCommunityMap();
         foreach ($list as &$item) {
             $item["talent_type"] = $item["enterprise_type"] == 1 ? "晋江市现代产业体系人才" : "集成电路优秀人才";
             $item["enterprise_tag"] = $enterprise_tag_kvs[$item["enterpriseTag"]];
             $lastCheckLog = TalentLogApi::getCompanyNewestCheckedLog($item["id"], $companyId);
             $item["deptCheckState"] = $lastCheckLog["new_state"] ?: TalentState::FST_VERIFY_PASS;
             $item["talentArrangeName"] = $talent_arrange_kvs[$item["talent_arrange"]];
+            $item["medicalCommunityName"] = $item["medicalCommunityId"] ? $medicalCommunity_kvs[$item["medicalCommunityId"]] : null;
         }unset($item);
         return ["total" => $count, "rows" => $list];
     }
@@ -1108,11 +1108,11 @@ class VerifyApi {
                         if ($log["active"] == 1) {
                             if ($log["new_state"] == 9) {
                                 $verifyDepts[$k] .= "(审核驳回)";
-                                $item["deptReject"]++;
+                                $item["deptReject"] ++;
                             }
                             if ($log["new_state"] == 12) {
                                 $verifyDepts[$k] .= "(审核通过)";
-                                $item["deptPass"]++;
+                                $item["deptPass"] ++;
                             }
                             $deptDescriptions[] = sprintf("%s:%s", $company["name"], $log["description"]);
                         } else {
@@ -1121,7 +1121,7 @@ class VerifyApi {
                                 continue;
                             }
                             $verifyDepts[$k] .= "(待审核)";
-                            $item["deptWait"]++;
+                            $item["deptWait"] ++;
                         }
                     }
                     $item["verifyDepts"] = implode(chr(10), $verifyDepts);
@@ -1134,7 +1134,93 @@ class VerifyApi {
         return $list;
     }
 
-    public static function getListByProcess($process) {
+    public static function getListByProcess($params) {
+        $process = $params["process"];
+        $type = session("user")["type"];
+        $where[] = ["e.type", "=", $type];
+        if ($params["name"]) {
+            $where[] = ["ti.name", "like", "%{$params["name"]}%"];
+        }
+        if ($params["card_number"]) {
+            $where[] = ["ti.card_number", "like", "%" . $params["card_number"] . "%"];
+        }
+        if ($params["sex"]) {
+            $where[] = ["ti.sex", "=", $params["sex"]];
+        }
+        if ($params["nation"]) {
+            $where[] = ["ti.nation", "=", $params["nation"]];
+        }
+        if ($params["apply_year"]) {
+            $where[] = ["ti.apply_year", "like", "{$params["apply_year"]}%"];
+        }
+        if ($params["phone"]) {
+            $where[] = ["ti.phone", "like", "%{$params["phone"]}%"];
+        }
+        if ($params["email"]) {
+            $where[] = ["ti.email", "like", "%{$params["email"]}%"];
+        }
+        if ($params["nationality"]) {
+            $where[] = ["ti.nationality", "=", $params["nationality"]];
+        }
+        if ($params["province"]) {
+            $where[] = ["ti.province", "=", $params["province"]];
+        }
+        if ($params["politics"]) {
+            $where[] = ["ti.politics", "=", $params["politics"]];
+        }
+        if ($params["enterprise_id"]) {
+            $where[] = ["ti.enterprise_id", "=", $params["enterprise_id"]];
+        }
+        if ($params["medicalCommunityId"]) {
+            $where[] = ["e.medicalCommunityId", "=", $params["medicalCommunityId"]];
+        }
+        if ($params["isGeneral"]) {
+            $where[] = ["e.isGeneral", "=", $params["isGeneral"]];
+        }
+        if ($params["street"]) {
+            $where[] = ["e.street", "=", $params["street"]];
+        }
+        if ($params["industry_field"]) {
+            $where[] = ["e.industryFieldNew", "=", $params["industry_field"]];
+        }
+        if ($params["industry_field_old"]) {
+            $where[] = ["e.industryFieldOld", "=", $params["industry_field_old"]];
+        }
+        if ($params["enterprise_tag"]) {
+            $where[] = ["e.enterpriseTag", "=", $params["enterprise_tag"]];
+        }
+        if ($params["talent_type"]) {
+            $where[] = ["ti.talent_type", "=", $params["talent_type"]];
+        }
+        if ($params["import_way"]) {
+            $where[] = ["ti.import_way", "=", $params["import_way"]];
+        }
+        if ($params["highest_degree"]) {
+            $where[] = ["ti.highest_degree", "=", $params["highest_degree"]];
+        }
+        if ($params["study_abroad"]) {
+            $where[] = ["ti.study_abroad", "=", $params["study_abroad"]];
+        }
+        if ($params["source"]) {
+            $where[] = ["ti.source", "=", $params["source"]];
+        }
+        if ($params["talent_arrange"]) {
+            $where[] = ["ti.talent_arrange", "=", $params["talent_arrange"]];
+        }
+        if ($params["talent_condition"]) {
+            $where[] = ["ti.talent_condition", "=", $params["talent_condition"]];
+        }
+        if ($params["isMatchZhiren"]) {
+            $params["isMatchZhiren"] = $params["isMatchZhiren"] == 1 ?: 0;
+            $where[] = ["ti.isMatchZhiren", "=", $params["isMatchZhiren"]];
+        }
+        if ($params["active"]) {
+            $where[] = ["ti.active", "=", $params["active"]];
+        }
+        if ($params["breakFaith"]) {
+            $where[] = ["ti.break_faith", "=", $params["breakFaith"]];
+        }
+
         switch ($process) {
             case 1:
                 $where[] = ["ti.checkState", "in", [TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_FAIL]];

+ 1 - 1
app/enterprise/api/TalentApi.php

@@ -204,7 +204,7 @@ class TalentApi {
             $where[] = ["e.type", "=", $user["type"]];
             $where[] = ["e.isGeneral", "=", 2];
             $where[] = ["e.medicalCommunityId", "=", $user["medicalCommunityId"]];
-            $where[] = ["ti.checkState", ">", TalentState::FST_SAVE];
+            $where[] = ["ti.first_submit_time", "EXP", \think\facade\Db::raw("is not null")];
             if ($name) {
                 $where[] = ["ti.name", "like", "%" . $name . "%"];
             }

+ 6 - 1
app/enterprise/controller/Talent.php

@@ -33,7 +33,12 @@ class Talent extends EnterpriseController {
         if ($isMix == 1) {
             $tpl = "newIndex";
         }
-        return view($tpl, ['type' => session("user")['type']]);
+        switch ($this->user["type"]) {
+            case CommonConst::ENTERPRISE_WJ:
+                $tpl = "/talent/hospital/index";
+                break;
+        }
+        return view($tpl, ['type' => $this->user["type"]]);
     }
 
     public function list() {

+ 15 - 19
app/enterprise/view/talent/hospital/index.html

@@ -17,7 +17,7 @@
                 <div class="row row-lg">
                     <div class="col-sm-12">
                         <div class="row">
-                            <input type="hidden" id="type" value="${type}">
+                            <input type="hidden" id="type" value="{$type}">
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">
                                     <div class="input-group-btn">
@@ -61,17 +61,6 @@
                                     </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="nationality">
-                                    </select>
-                                </div>
-                            </div>
                             <div class="col-sm-3">                        
                                 <div class="input-group input-group-sm">
                                     <div class="input-group-btn">
@@ -109,17 +98,24 @@
                                 </button>
                             </div>
                         </div>
+                        {if condition="$type == 1"}
+                        <p style="font-size: 20px;color: #ff0000">直认数据请先选中后再点击下方菜单“修改申报”进行操作!</p>
+                        {/if}
                         <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
-                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openTalentInfoDetail()" id="">
-                                <i class="fa fa-edit"></i>&nbsp;继续申报
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.addTalentInfo()" id="">
+                                <i class="fa fa-plus"></i>&nbsp;添加申报
                             </button>
-                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openTalentInfoSelect()" id="">
-                                <i class="fa fa-book"></i>&nbsp;查看申报
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.editTalentInfo()" id="">
+                                <i class="fa fa-edit"></i>&nbsp;修改申报
                             </button>
-                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.delete()" id="">
-                                <i class="fa fa-remove"></i>&nbsp;删除申报
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.viewTalentInfo()" id="">
+                                <i class="fa fa-book"></i>&nbsp;查看申报
                             </button>
+<!--                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.delete()" id="">-->
+<!--                                <i class="fa fa-remove"></i>&nbsp;删除申报-->
+<!--                            </button>-->
                         </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>
@@ -135,7 +131,7 @@
 </div>
 <!--<script src="${ctxPath}/static/modular/gate/talentInfo/talentInfo.js"></script>-->
 <script type="text/javascript">
-    document.write('<script src="/static/modular/gate/talentInfo/talentInfo.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/gate/talentInfo/new_talentInfo.js?v=' + (new Date()).getTime() + '"><\/script>');
     document.write('<script src="/static/modular/common/config.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
 {/block}

+ 18 - 45
public/static/modular/gate/enterprise/talentIdentify/examine_center.js

@@ -33,8 +33,9 @@ TalentInfo.initColumn = function () {
         {title: '最新提交时间', field: 'new_submit_time', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
         {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px",
             formatter: function (value, row, index) {
+                console.log(value, row.real_state, row.last_state)
                 if (typeof row.deptCheckState != "undefined") {
-                    if ((row.deptActive == 0 && row.realState == 10) || !row.deptActive) {
+                    if ((row.deptActive == 0 && row.real_state == 10) || !row.deptActive) {
                         if (row.resubmit) {
                             return "<span class='label label-success'>待部门并审(重新提交)</span>";
                         } else {
@@ -48,11 +49,19 @@ TalentInfo.initColumn = function () {
                         return "<span class='label label-danger'>部门并审驳回</span>";
                     }
                 } else {
+                    if (value == 1) {
+                        if (row.real_state == 4) {
+                            return "<span class='label label-danger'>审核驳回</span>"
+                        }
+                        if (row.real_state == 11) {
+                            return "<span class='label label-danger'>初审驳回</span>"
+                        }
+                    }
                     if (value == 2) {
-                        if (row.lastState == 4) {
+                        if (row.last_state == 4) {
                             return "<span class='label label-success'>待审核(重新提交)</span>"
                         }
-                        if (row.realState == 6) {
+                        if (row.real_state == 6) {
                             return "<span class='label label-danger'>复审驳回</span>"
                         }
                         return "<span class='label label-success'>待审核</span>"
@@ -64,48 +73,22 @@ TalentInfo.initColumn = function () {
                         return "<span class='label label-success'>复审通过</span>"
                     }
                     if (value == 10) {
-                        if (process == 3) {
-                            if (row.pass_dept_check == 1) {
-                                return "<span class='label label-success'>初审通过(待复审)</span>"
-                            }
-                            return "<span class='label label-success'>初审通过(待部门并审)</span>"
-                        }
-                        if (process == 4) {
-                            if (row.resubmit) {
-                                return "<span class='label label-success'>待部门并审(重新提交)</span>";
-                            } else {
-                                return "<span class='label label-success'>待部门并审(首次提交)</span>";
-                            }
-                        }
-                        if (row.resubmit) {
-                            return "<span class='label label-success'>待复审(重新提交)</span>";
-                        } else {
-                            return "<span class='label label-success'>待复审(首次提交)</span>";
-                        }
+                        return "<span class='label label-success'>待上级审核</span>";
                     }
                     if (value == 8) {
-                        if (row.realState == 11) {
+                        if (row.real_state == 11) {
                             return "<span class='label label-danger'>初审驳回</span>"
                         } else {
                             return "<span class='label label-success'>保存未提交</span>"
                         }
                     }
                     if (value == 9) {
-                        if (row.realState == 13) {
-                            if (process == 3) {
-                                return "<span class='label label-danger'>待初审(部门并审驳回)</span>";
-                            }
+                        if (row.real_state == 13) {
                             return "<span class='label label-danger'>部门并审驳回</span>";
-                        } else if (row.realState == 15) {
-                            if (process == 3) {
-                                return "<span class='label label-danger'>待初审(复审驳回)</span>";
-                            }
+                        } else if (row.real_state == 15) {
                             return "<span class='label label-danger'>复审驳回</span>";
                         } else {
-                            if (row.lastState == 11) {
-                                return "<span class='label label-success'>待初审(重新提交)</span>"
-                            }
-                            return "<span class='label label-success'>待初审(首次提交)</span>"
+                            return "<span class='label label-success'>待初审</span>"
                         }
                     }
                     if (value == -2) {
@@ -132,17 +115,7 @@ TalentInfo.initColumn = function () {
                         }
                     }
                     if (value == 12) {
-                        if (process == 4) {
-                            return "<span class='label label-success'>部门并审通过</span>";
-                        }
-                        if (process == 3) {
-                            return "<span class='label label-success'>待复审(部门并审通过)</span>";
-                        }
-                        if (row.resubmit) {
-                            return "<span class='label label-success'>待复审(重新提交)</span>";
-                        } else {
-                            return "<span class='label label-success'>待复审(首次提交)</span>";
-                        }
+                        return "<span class='label label-success'>待复审</span>";
                     }
                     if (value == 13) {
                         if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 4) {

+ 2 - 12
public/static/modular/gate/talentInfo/new_talentInfo.js

@@ -13,7 +13,7 @@ var TalentInfo = {
 TalentInfo.initColumn = function () {
     var type = $("#type").val();
     var isShow = true;
-    if (type == 2) {
+    if (type == 2 || type == 5 || type == 6) {
         isShow = false;
     }
     return [
@@ -34,16 +34,6 @@ TalentInfo.initColumn = function () {
                 }
             }
         },
-        // {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle', width: "100px",
-        //     formatter: function (value, row, index) {
-        //         if (value == 1) {
-        //             return '晋江市现代产业体系人才';
-        //         }
-        //         if (value == 2) {
-        //             return '集成电路优秀人才';
-        //         }
-        //     }
-        // },
         {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "80px", },
         {title: '单位标签', field: 'enterpriseTagName', visible: isShow, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "80px"},
         {title: '证件号码', field: 'card_number', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
@@ -53,7 +43,7 @@ TalentInfo.initColumn = function () {
                 if (row.real_state != row.checkState) {
                     switch (row.real_state) {
                         case 4:
-                            return "<span class='label label-danger'>基础信息审核驳回</span>";
+                            return "<span class='label label-danger'>总院驳回</span>";
                             break;
                         case 6:
                             return "<span class='label label-danger'>基础信息复审驳回</span>";

+ 7 - 1
public/static/modular/gate/talentInfo/talentInfo_wj_select.js

@@ -306,6 +306,12 @@ TalentInfoInfoDlg.creatFieldCheckModal = function () {
             '                </form>';
 
 }
+TalentInfoInfoDlg.addSubmit = function () {
+    Feng.error("当前状态不能修改");
+}
+TalentInfoInfoDlg.submitToCheck = function () {
+    Feng.error("当前状态不能修改");
+}
 
 /**
  * 显示字段或者隐藏字段选择
@@ -336,7 +342,7 @@ $(function () {
     }
 
     $("input,select,textarea").not("input[type='hidden']").not("input[type='file']").attr("style", "pointer-events: none;background-color: #e2ecf2;;");
-    
+
     TalentInfoInfoDlg.initFileTable();
 });
 

+ 6 - 0
public/static/modular/talentIdentify/talentInfo/hospital/talentInfo_base.js

@@ -78,6 +78,9 @@ TalentInfo.initColumn = function () {
                         return "<span class='label label-danger'>部门并审驳回</span>";
                     }
                 } else {
+                    if (value == 1) {
+                        return "<span class='label label-danger'>驳回到分院</span>"
+                    }
                     if (value == 2) {
                         if (row.lastState == 4) {
                             return "<span class='label label-success'>待审核(重新提交)</span>"
@@ -85,6 +88,9 @@ TalentInfo.initColumn = function () {
                         if (row.realState == 6) {
                             return "<span class='label label-danger'>复审驳回</span>"
                         }
+                        if(row.realState == 11){
+                            return "<span class='label label-danger'>驳回到总院</span>"
+                        }
                         return "<span class='label label-success'>待审核</span>"
                     }
                     if (value == 3) {

+ 78 - 152
public/static/modular/talentIdentify/talentInfo/hospital/talentInfo_common_check.js

@@ -221,6 +221,7 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     layer.setTop(layero);
                     var obj = data.obj.talentInfo;
                     var companyList = data.obj.companys;
+                    var type = data.obj.type;
                     var fileList = data.obj.fileList;
                     var process = data.obj.process;
                     if (typeof data.obj.fieldList != "undefined" && data.obj.fieldList.length > 0) {
@@ -246,7 +247,8 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                         optionHtml = '<option value="">请选择</option>\n' +
                                 (obj.highProcess >= 3 && companyList.length > 0 && process == 3 && obj.isMatchZhiren == 0 ? '<option value="5">审核通过(需要再次部门并审)</option>\n' : '<option value="3">审核通过</option>') +
                                 (obj.highProcess >= 3 && companyList.length > 0 && process == 3 && obj.isMatchZhiren == 0 ? '<option value="4">审核通过(跳过部门并审)</option>\n' : "") +
-                                '                            <option value="2">审核驳回</option>\n';
+                                '                            <option value="2">审核驳回</option>\n' +
+                                (type == 5 && process == 3 ? '<option value="6">驳回到分院</option>\n' : '');
                     }
                     if (process == 5 || process == 2) {
                         optionHtml = '<option value="">请选择</option>\n' +
@@ -324,7 +326,7 @@ TalentInfoInfoDlg.toggleField = function () {
     var checkState = $("#checkStateFirstModal").val();
     var checkMsgFirst = $("#checkMsgFirst").val();
     $("#company_list").hide();
-    if (checkState == 2) {
+    if (checkState == 2 || checkState == 6) {
         $("#field").show();
         $("#checkMsgFirst").val("");
     } else if (checkState == 3 || checkState == 4 || checkState == 5) {
@@ -499,155 +501,79 @@ TalentInfoInfoDlg.download = function () {
 
 
 TalentInfoInfoDlg.creatFieldCheckModal = function () {
-    var type = $("#type").val();
-    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="company_list" style="padding-top:5px;display:none;">\n' +
-                '                            <label for="checkMsg" class="control-label">选择需要再次审核的部门</label>\n' +
-                '                            <div id="companys">' +
-                '                               <ul style="overflow:hidden;list-style:none;"></ul>' +
-                '                            </div>' +
-                '                        </div>\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;list-style:none;">\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="company_list" style="padding-top:5px;display:none;">\n' +
-                '                            <label for="checkMsg" class="control-label">选择需要再次审核的部门</label>\n' +
-                '                            <div id="companys">' +
-                '                               <ul style="overflow:hidden;list-style:none;"></ul>' +
-                '                            </div>' +
-                '                        </div>\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;list-style:none;">\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>';
-    }
+    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="company_list" style="padding-top:5px;display:none;">\n' +
+            '                            <label for="checkMsg" class="control-label">选择需要再次审核的部门</label>\n' +
+            '                            <div id="companys">' +
+            '                               <ul style="overflow:hidden;list-style:none;"></ul>' +
+            '                            </div>' +
+            '                        </div>\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;list-style:none;">\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 () {
@@ -677,7 +603,7 @@ $(function () {
     });
     $('[data-toggle="tooltip"]').tooltip();
 
-    
+
     $("input,select,textarea").not("input[type='hidden']").not("input[type='file']").attr("style", "pointer-events: none;background-color: #e2ecf2;;");
     TalentInfoInfoDlg.initFileTable();
     Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": $("#id").val(), "typeFileId": "", "active": 1})