Merge branch 'master' of http://59.57.98.130:3000/jjhc/report

app/admin/controller/Talent.php

@@ -307,17 +307,33 @@ class Talent extends AdminController {
      * @auth {{/talentInfo/gotoIndex/4}}
      */
     public function pre_list() {
-        if ($this->user["type"] == 1) {
-            $message = [
-                "typeName" => "晋江市现代产业体系人才认定", "address" => "聚才网/人才晋江微信公众号", "dep" => "中共晋江市委人才办、晋江市纪委监委驻市人力资源和社会保障局纪检监察组或晋江市公共就业和人才服务中心",
-                "phone" => "0595-85633128", "email" => "jjrc85661234@163.com"
-            ];
-        } else {
-            $message = [
-                "typeName" => "晋江市集成电路产业优秀人才认定", "address" => "福建（晋江）集成电路产业园官方网站及微信公众号", "dep" => "集成电路产业园区",
-                "phone" => "0595-82250007、0595-82250001", "email" => "jjjcdr@163.com"
-            ];
+        switch ($this->user["type"]){
+            case 1:
+                $message = [
+                    "typeName" => "晋江市现代产业体系人才认定", "address" => "聚才网/人才晋江微信公众号", "dep" => "中共晋江市委人才办、晋江市纪委监委驻市人力资源和社会保障局纪检监察组或晋江市公共就业和人才服务中心",
+                    "phone" => "0595-85633128", "email" => "jjrc85661234@163.com"
+                ];
+                break;
+            case 2:
+                $message = [
+                    "typeName" => "晋江市集成电路产业优秀人才认定", "address" => "福建（晋江）集成电路产业园官方网站及微信公众号", "dep" => "集成电路产业园区",
+                    "phone" => "0595-82250007、0595-82250001", "email" => "jjjcdr@163.com"
+                ];
+                break;
+            case 5:
+                $message = [
+                    "typeName" => "晋江市医疗卫生人才认定", "address" => "“健康晋江”微信公众号", "dep" => "晋江市卫生健康局",
+                    "phone" => "0595-85636159", "email" => "jjswjjrsk@163.com"
+                ];
+                break;
+            case 6:
+                $message = [
+                    "typeName" => "晋江市高等教育人才认定", "address" => "“泉州市高教发展中心”微信公众号", "dep" => "泉州市高教发展中心",
+                    "phone" => "0595-85002588", "email" => "jjsgjrc@126.com"
+                ];
+                break;
         }
+
         $commonAssigns = $this->getCommonAssigns();
         $assigns = ["message" => $message];
         $newAssigns = array_merge($assigns, $commonAssigns);
@@ -465,7 +481,21 @@ class Talent extends AdminController {
             }
         }
         if ($rows) {
-            $filename = "现代产业体系人才公示预览导出";
+            switch ($this->user["type"]){
+                case 1:
+                    $filename = "现代产业体系人才公示预览导出";
+                    break;
+                case 2:
+                    $filename = "晋江市集成电路产业优秀人才公示预览导出";
+                    break;
+                case 5:
+                    $filename = "晋江市医疗卫生人才公示预览导出";
+                    break;
+                case 6:
+                    $filename = "晋江市高等教育人才公示预览导出";
+                    break;
+            }
+
             export($columns, $rows, $filename);
             exit();
         }
@@ -500,7 +530,20 @@ class Talent extends AdminController {
             $i++;
         }
         if ($rows) {
-            $filename = "现代产业体系人才公示导出";
+            switch ($this->user["type"]){
+                case 1:
+                    $filename = "现代产业体系人才公示预览导出";
+                    break;
+                case 2:
+                    $filename = "晋江市集成电路产业优秀人才公示预览导出";
+                    break;
+                case 5:
+                    $filename = "晋江市医疗卫生人才公示预览导出";
+                    break;
+                case 6:
+                    $filename = "晋江市高等教育人才公示预览导出";
+                    break;
+            }
             export($columns, $rows, $filename);
             exit();
         }
@@ -662,7 +705,20 @@ class Talent extends AdminController {
             }
         }
         $columns = ["序号", "批次", "姓名", "性别", "工作单位", "本人具备的认定条件", "认定人才层次", "审核状态", "备注"];
-        $filename = "现代产业体系人才" . date("Ym") . "公布预览名单导出(公示批次-" . $list[0]["publicBatch"] . ")";
+        switch ($this->user["type"]){
+            case 1:
+                $filename = "现代产业体系人才" . date("Ym") . "公布预览名单导出(公示批次-" . $list[0]["publicBatch"] . ")";
+                break;
+            case 2:
+                $filename = "晋江市集成电路产业优秀人才" . date("Ym") . "公布预览名单导出(公示批次-" . $list[0]["publicBatch"] . ")";
+                break;
+            case 5:
+                $filename = "晋江市医疗卫生人才" . date("Ym") . "公布预览名单导出(公示批次-" . $list[0]["publicBatch"] . ")";
+                break;
+            case 6:
+                $filename = "晋江市高等教育人才" . date("Ym") . "公布预览名单导出(公示批次-" . $list[0]["publicBatch"] . ")";
+                break;
+        }
         if ($rows) {
             export($columns, $rows, $filename);
             exit();
@@ -696,8 +752,22 @@ class Talent extends AdminController {
             $rows[] = $row;
             $i++;
         }
+
         $columns = ["序号", "批次", "姓名", "性别", "工作单位", "本人具备的认定条件", "认定人才层次", "审核状态", "备注"];
-        $filename = "现代产业体系人才" . date("Ym") . "公布名单导出(公示批次-" . $list[0]["publicBatch"] . ")";
+        switch ($this->user["type"]){
+            case 1:
+                $filename = "现代产业体系人才" . date("Ym") . "公布名单导出(公示批次-" . $list[0]["publicBatch"] . ")";
+                break;
+            case 2:
+                $filename = "晋江市集成电路产业优秀人才" . date("Ym") . "公布名单导出(公示批次-" . $list[0]["publicBatch"] . ")";
+                break;
+            case 5:
+                $filename = "晋江市医疗卫生人才" . date("Ym") . "公布名单导出(公示批次-" . $list[0]["publicBatch"] . ")";
+                break;
+            case 6:
+                $filename = "晋江市高等教育人才" . date("Ym") . "公布名单导出(公示批次-" . $list[0]["publicBatch"] . ")";
+                break;
+        }
         if ($rows) {
             export($columns, $rows, $filename);
             exit();
@@ -971,15 +1041,15 @@ class Talent extends AdminController {
             if ($talent_info["isImport"] && $talent_info["isMatchZhiren"]) {
                 $data["pass_dept_check"] = 1;
             }
-            if (in_array($ep["type"], [CommonConst::ENTERPRISE_GJ, CommonConst::ENTERPRISE_WJ]) && $talent_info["is_fujian_talent"] == 1 && $talent_info["is_jinjiang_talent"] == 1) {
-                $data["pass_dept_check"] = 1;
-            }
+            /* if (in_array($ep["type"], [CommonConst::ENTERPRISE_GJ, CommonConst::ENTERPRISE_WJ]) && $talent_info["is_fujian_talent"] == 1 && $talent_info["is_jinjiang_talent"] == 1) {
+              $data["pass_dept_check"] = 1;
+              } */
         } else if ($params["checkState"] == 4) {
-            if ($talent_info["highProcess"] < 3)
+            if ($talent_info["highProcess"] < 3 && $ep["type"] != CommonConst::ENTERPRISE_GJ)
                 return json(["msg" => "只有曾经达到过部门并审，初审时才可以选择直接跳过部门并审阶段"]);
 //审核成功,并设置越过部门并审。附加条件：最高进度曾经通过初审3，上级驳回后重新初审的
             $log_checkState = $checkState = TalentState::FST_VERIFY_PASS; //初审成功
-            if ($talent_info["highProcess"] >= 3) {
+            if ($talent_info["highProcess"] >= 3 || $ep["type"] == CommonConst::ENTERPRISE_GJ) {
                 $data["pass_dept_check"] = 1;
             }
         } else if ($params["checkState"] == 5) {
@@ -1100,7 +1170,7 @@ class Talent extends AdminController {
 
                 $where = [];
                 $where[] = ["status", "=", 1];
-                $where[] = ["type", "=", $this->user["type"]];
+                //$where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["companyId", "in", $unpass_companyIds];
                 $where[] = ["roleid", "<>", 1];
                 $regstr = ",(" . implode("|", $roleIds) . "),";
@@ -1285,7 +1355,7 @@ class Talent extends AdminController {
 
                 $where = [];
                 $where[] = ["status", "=", 1];
-                $where[] = ["type", "=", $this->user["type"]];
+                $where[] = ["type", "=", $talent_info["enterprise_type"]];
                 $where[] = ["roleid", "<>", 1];
                 $regstr = ",(" . implode("|", $roleIds) . "),";
                 $whereRaw = "concat(',',roleid,',') REGEXP '$regstr'";
@@ -1560,6 +1630,7 @@ class Talent extends AdminController {
         if ($ep["type"] != $this->user["type"] && in_array($checkState, [TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS, TalentState::SCND_SUBMIT, TalentState::DEPT_VERIFY_PASS])) {
             return json(["msg" => "不能审核的人才类型"]);
         }
+        $talent_info["enterprise_type"] = $ep["type"];
         if ($checkState == TalentState::FST_SUBMIT) {
             return $this->baseSubmitCheck($talent_info);
         } else if ($checkState == TalentState::BASE_VERIFY_PASS) {

app/admin/controller/TalentTypeChange.php

@@ -88,7 +88,7 @@ class TalentTypeChange extends AdminController {
                 $where[] = ["checkState", "not in", [3, 5]];
                 break;
             case 2:
-                $where[] = ["ttc.type", "=", $this->user["type"]];
+                //$where[] = ["ttc.type", "=", $this->user["type"]];
                 $companyId = $this->user["companyId"];
                 $where[] = ["td.companyId", "=", $companyId];
                 $where[] = ["td.type", "=", ProjectState::LEVELCHANGE];
@@ -133,7 +133,10 @@ class TalentTypeChange extends AdminController {
         }
         foreach ($list as $key => $item) {
             if ($item["beforeCheckCompany"]) {
-                $list[$key]["beforeCheckCompanyName"] = getCacheById("Company", $item["beforeCheckCompany"]);
+                $list[$key]["beforeCheckCompanyName"] = getCacheById("Company", $item["beforeCheckCompany"], "name");
+            }
+            if ($item["companyId"]) {
+                $list[$key]["companyName"] = getCacheById("Company", $item["companyId"], "name");
             }
             $list[$key]["oldTalentArrangeName"] = $levelMap[$item["oldTalentArrange"]];
             $list[$key]["newTalentArrangeName"] = $levelMap[$item["newTalentArrange"]];

app/admin/view/talent/fst_verify.html

@@ -119,11 +119,11 @@
                                         <option value="2">初审驳回</option>
                                         <option value="3">待初审（首次提交）</option>
                                         <option value="4">待初审（重新提交）</option>
-                                        {if condition="in_array($type,[1])"}
+                                        {if condition="in_array($type,[1,5,6])"}
                                         <option value="5">待初审（部门并审驳回）</option>
                                         {/if}
                                         <option value="6">待初审（复审驳回）</option>
-                                        {if condition="in_array($type,[1])"}
+                                        {if condition="in_array($type,[1,5,6])"}
                                         <option value="7">初审通过（待部门并审）</option>
                                         {/if}
                                         <option value="8">初审通过（待复审）</option>
@@ -341,9 +341,9 @@
                             </button>
                             {/if}
                             {if condition="chkCommission('/admin/talent/cancleFirstCheck','/talentInfo/cancelFirstCheck')"}
-                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.cancleFirstCheck()" id="">
-                                    <i class="fa fa-file-excel-o"></i>&nbsp;撤销初审失败
-                                </button>
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.cancleFirstCheck()" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;撤销初审失败
+                            </button>
                             {/if}
                             {if condition="chkCommission('/admin/talent/fstVerifyListExport','/talentInfo/firstExport')"}
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.showExportModal(1)" id="">

app/admin/view/talent/hospital/fst_verify.html

@@ -119,13 +119,9 @@
                                         <option value="2">初审驳回</option>
                                         <option value="3">待初审（首次提交）</option>
                                         <option value="4">待初审（重新提交）</option>
-                                        {if condition="in_array($type,[1])"}
                                         <option value="5">待初审（部门并审驳回）</option>
-                                        {/if}
                                         <option value="6">待初审（复审驳回）</option>
-                                        {if condition="in_array($type,[1])"}
                                         <option value="7">初审通过（待部门并审）</option>
-                                        {/if}
                                         <option value="8">初审通过（待复审）</option>
                                         <option value="9">初审不通过</option>
                                     </select>

app/admin/view/talent/school/talentInfo_common_check.html

@@ -170,19 +170,28 @@
                                                             <input type="text" class="form-control" id="email" name="email" value="{$info.email}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*是否认定福建省或泉州市高层次人才</span></label>
+                                                            <label class=" control-label spacing"><span style="color: red">*是否经我市认定福建省或泉州市高层次人才</span></label>
                                                             <select class="form-control" id="is_fujian_talent" name="is_fujian_talent" value="{$info.is_fujian_talent}">
                                                                 {eq name="info.is_fujian_talent" value="1"}<option value="1">是</option>{/eq}
                                                                 {eq name="info.is_fujian_talent" value="2"}<option value="2">否</option>{/eq}
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*是否与晋江人才认定标准一致</span></label>
+                                                            <label class=" control-label spacing"><span style="color: red">*与申请认定我市高教人才的条款是否一样</span></label>
                                                             <select class="form-control" id="is_jinjiang_talent" name="is_jinjiang_talent" value="{$info.is_jinjiang_talent}">
                                                                 {eq name="info.is_jinjiang_talent" value="1"}<option value="1">是</option>{/eq}
                                                                 {eq name="info.is_jinjiang_talent" value="2"}<option value="2">否</option>{/eq}
                                                             </select>
                                                         </div>
+                                                        <div class="rowGroup col-sm-4 parent_talent">
+                                                            <label class=" control-label spacing"><span style="color: red">*认定层次</span></label>
+                                                            <input type="text" class="form-control" id="parent_talent_level" name="parent_talent_level" value="{$info.parent_talent_level}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4 parent_talent">
+                                                            <label class=" control-label spacing"><span style="color: red">*认定条款</span></label>
+                                                            <input type="text" class="form-control" id="parent_talent_condition" name="parent_talent_condition" value="{$info.parent_talent_condition}"/>
+
+                                                        </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>人才层次</label>
                                                             <select class="form-control" id="talent_arrange" name="talent_arrange">

app/admin/view/talent_type_change/fst_verify.html

@@ -189,7 +189,7 @@
                             </button>
                             {/if}
                             {if condition="chkCommission('/admin/talentTypeChange/firstExport','/talentTypeChange/firstExport')"}
-                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentTypeChange.showExportModal(1)" id="">
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentTypeChange.export(1)" id="">
                                 <i class="fa fa-file-excel-o"></i>&nbsp;导出
                             </button>
                             {/if}

app/common/api/ChuanglanSmsApi.php

@@ -31,6 +31,14 @@ class ChuanglanSmsApi {
         $deny_list = ["jjrcw.test", "jjrcw.test:8080","report.com","report.jinjianghc.com"]; //拒绝短信名单
         if (in_array($_SERVER["HTTP_HOST"], $deny_list))
             return false; //测试不发送信息
+        $redis = \app\common\Redis::instance(\think\facade\Config::get("cache.stores.redis.select"));
+        $unique = sha1($mobile.$msg);
+        $time = $redis->get($unique);
+        $now = time();
+        if(!empty($time) && $now-$time < 10800){
+            return false;//3小时内同一个手机号码同一条信息不重复发送
+        }
+        $redis->set($unique,$now,12000);
         $result = $this->curlPost(self::API_SEND_URL, $postArr);
         return $result;
     }

app/common/api/DictApi.php

@@ -331,8 +331,8 @@ class DictApi {
             "pro_qua" => "职业资格",
             "phone" => "手机号码",
             "email" => "电子邮箱",
-            "is_fujian_talent" => "是否认定福建省或泉州市高层次人才",
-            "is_jinjiang_talent" => "是否符合晋江人才认定标准",
+            "is_fujian_talent" => "是否经我市认定福建省或泉州市高层次人才",
+            "is_jinjiang_talent" => "与申请认定我市高教人才的条款是否一样",
             "parent_talent_level" => "福建省或泉州认定人才层次",
             "parent_talent_condition" => "福建省或泉州市认定人才条件",
             "talent_arrange" => "人才层次",

app/enterprise/controller/Talent.php

@@ -1575,6 +1575,7 @@ class Talent extends EnterpriseController {
         if ($type == ProjectState::QUIT) {
             $_where = [];
             $_where[] = ["checkState", "not in", [3]];
+            $_where[] = ["delete", "<>", 1];
             $idCards = Db::table("un_talent_quit")->where($_where)->column("idCard");
             $sList = array_merge($sList, (array) $idCards);
             $where[] = ["active", "=", 1];
@@ -1582,6 +1583,7 @@ class Talent extends EnterpriseController {
         if ($type == ProjectState::BANKCHANGE) {
             $_where = [];
             $_where[] = ["checkState", "not in", [3]];
+            $_where[] = ["delete", "<>", 1];
             $idCards = Db::table("un_talent_bank_change")->where($_where)->column("idCard");
             $sList = array_merge($sList, (array) $idCards);
         }
@@ -1589,6 +1591,7 @@ class Talent extends EnterpriseController {
             $_where = [];
             $_where[] = ["checkState", "not in", [35, -1]];
             $_where[] = ["isPublic", "<", 5];
+            $_where[] = ["delete", "<>", 1];
             $idCards = Db::table("un_talent_type_change")->where($_where)->column("idCard");
             $sList = array_merge($sList, (array) $idCards);
         }

app/enterprise/view/talent/school/apply.html

@@ -177,12 +177,19 @@
                                                             <input type="text" class="form-control" id="email" name="email" value="{$row.email}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*是否认定福建省或泉州市高层次人才</span></label>
+                                                            <label class=" control-label spacing"><span style="color: red">*是否经我市认定福建省或泉州市高层次人才</span></label>
                                                             <select class="form-control" id="is_fujian_talent" name="is_fujian_talent" value="{$row.is_fujian_talent}">                                                                
                                                                 <option value="2">否</option>
                                                                 <option value="1">是</option>
                                                             </select>
                                                         </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*与申请认定我市高教人才的条款是否一样</span></label>
+                                                            <select class="form-control" id="is_jinjiang_talent" name="is_jinjiang_talent" value="{$row.is_jinjiang_talent}">
+                                                                <option value="2">否</option>
+                                                                <option value="1">是</option>
+                                                            </select>
+                                                        </div>
                                                         <div class="rowGroup col-sm-4 parent_talent"  style="display: none">
                                                             <label class=" control-label spacing"><span style="color: red">*认定层次</span></label>
                                                             <input type="text" class="form-control" id="parent_talent_level" name="parent_talent_level" value="{$row.parent_talent_level}"/>

app/enterprise/view/talent/school/view.html

@@ -177,19 +177,28 @@
                                                             <input type="text" class="form-control" id="email" name="email" value="{$row.email}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*是否认定福建省或泉州市高层次人才</span></label>
+                                                            <label class=" control-label spacing"><span style="color: red">*是否经我市认定福建省或泉州市高层次人才</span></label>
                                                             <select class="form-control" id="is_fujian_talent" name="is_fujian_talent" value="{$row.is_fujian_talent}">                                                                
                                                                 <option value="2">否</option>
                                                                 <option value="1">是</option>
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*是否符合晋江人才认定标准</span></label>
+                                                            <label class=" control-label spacing"><span style="color: red">*与申请认定我市高教人才的条款是否一样</span></label>
                                                             <select class="form-control" id="is_jinjiang_talent" name="is_jinjiang_talent" value="{$row.is_jinjiang_talent}">
                                                                 <option value="2">否</option>
                                                                 <option value="1">是</option>
                                                             </select>
                                                         </div>
+                                                        <div class="rowGroup col-sm-4 parent_talent" >
+                                                            <label class=" control-label spacing"><span style="color: red">*认定层次</span></label>
+                                                            <input type="text" class="form-control" id="parent_talent_level" name="parent_talent_level" value="{$row.parent_talent_level}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-4 parent_talent">
+                                                            <label class=" control-label spacing"><span style="color: red">*认定条款</span></label>
+                                                            <input type="text" class="form-control" id="parent_talent_condition" name="parent_talent_condition" value="{$row.parent_talent_condition}"/>
+
+                                                        </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>人才层次</label>
                                                             <select class="form-control" id="talent_arrange" name="talent_arrange" value="{$row.talent_arrange}">

app/enterprise/view/talent_type_change/apply.html

@@ -217,15 +217,6 @@
                                                 <input class="form-control date" id="newIdentifyGetTime" name="newIdentifyGetTime" value="{$info.newIdentifyGetTime}"/>
                                             </div>
                                         </div>
-                                        {if condition="$enterprise['type'] == 1"}
-                                        <div class="rowGroup">
-                                            <label class="col-sm-2 control-label spacing">新引进方式</label>
-                                            <div class="col-sm-4 spacing">
-                                                <select class="form-control" id="newIntroductionMode" name="newIntroductionMode" value="{$info.newIntroductionMode}">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        {/if}
                                     </div>
                                     <div class="row">
                                         <label class="col-sm-2 control-label spacing" style="text-align: left"></label>

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

@@ -251,10 +251,10 @@ TalentInfoInfoDlg.infoCallback = function (data) {
  */
 TalentInfoInfoDlg.getIdentifyCondition = function () {
     let talent_arrange_category = $("#talent_arrange_category").val(),talent_arrange = ['A+','A','A1','B','B1','C','C1','D1','E1'];
-    if(talent_arrange.indexOf(talent_arrange_category) !== -1){
-        $("#is_fujian_talent").val(1);
-        $("#is_fujian_talent").trigger("change");
-    }
+    // if(talent_arrange.indexOf(talent_arrange_category) !== -1){
+    //     $("#is_fujian_talent").val(1);
+    //     $("#is_fujian_talent").trigger("change");
+    // }
     console.log()
     $("#talent_condition").html("<option value=''>---请选择---</option>");
     var level = $("#talent_arrange").val();

public/static/modular/gate/talentLibrary/talentQuit/talentQuit_info.js

@@ -173,24 +173,27 @@ TalentQuitInfoDlg.editSubmit = function (type) {
 //点击按钮初始化
 TalentQuitInfoDlg.talentInfoDetail = function () {
     var talentId = $("#talentId").val();
-    var ajax = new $ax(Feng.ctxPath + "/enterprise/talent/getInfoById/id/" + talentId, function (data) {
-        $("#type").val(data.enterpriseType);
-        $("#enterpriseId").val(data.enterprise_id);
-        $("#talentName").val(data.name);
-        $("#idCard").val(data.card_number);
-        $("#identifyTime").val(data.identifyMonth);
-        $("#enterpriseName").val(data.enterpriseName);
-        $("#talentArrange").val(data.talent_arrange);
-        $("#talentTypeName").val(data.talentTypeName);
-        $("#starttime").val(data.startTime);
-        $("#endtime").val(data.endTime);
-        $("#entryTime").val(data.cur_entry_time);
-        $("#phone").val(data.phone);
-    }, function (data) {
-        Feng.error("查询失败!" + data.responseJSON.message + "!");
-    });
-    ajax.set();
-    ajax.start();
+    if(typeof(talentId) != "undefined" && talentId > 0){
+        var ajax = new $ax(Feng.ctxPath + "/enterprise/talent/getInfoById/id/" + talentId, function (data) {
+            $("#type").val(data.enterpriseType);
+            $("#enterpriseId").val(data.enterprise_id);
+            $("#talentName").val(data.name);
+            $("#idCard").val(data.card_number);
+            $("#identifyTime").val(data.identifyMonth);
+            $("#enterpriseName").val(data.enterpriseName);
+            $("#talentArrange").val(data.talent_arrange);
+            $("#talentTypeName").val(data.talentTypeName);
+            $("#starttime").val(data.startTime);
+            $("#endtime").val(data.endTime);
+            $("#entryTime").val(data.cur_entry_time);
+            $("#phone").val(data.phone);
+        }, function (data) {
+            Feng.error("查询失败!" + data.responseJSON.message + "!");
+        });
+        ajax.set();
+        ajax.start();
+    }
+
 }
 //附件初始化
 TalentQuitInfoDlg.initFileTable = function () {
@@ -415,7 +418,30 @@ TalentQuitInfoDlg.submitToCheck = function () {
 }
 
 $(function () {
-    Feng.initValidator("talentQuitForm", TalentQuitInfoDlg.validateFields);
+    $('#talentQuitForm').bootstrapValidator({
+        feedbackIcons: {
+            valid: 'glyphicon glyphicon-ok',
+            invalid: 'glyphicon glyphicon-remove',
+            validating: 'glyphicon glyphicon-refresh'
+        },
+        container: 'tooltip',
+        group: '.rowGroup',
+        fields: TalentQuitInfoDlg.validateFields,
+        live: 'enabled',
+        message: '该字段不能为空'
+    }).on('error.field.bv', function (e, data) {
+        // Get the tooltip
+        var $parent = data.element.parents('.form-group-sm'),
+            $icon = $parent.find('.form-control-feedback[data-bv-icon-for="' + data.field + '"]'),
+            title = $icon.data('bs.tooltip').getTitle();
+        $icon.tooltip('destroy').tooltip({
+            html: true,
+            placement: 'right',
+            title: title,
+            container: 'body'
+        });
+    });
+    //Feng.initValidator("talentQuitForm", TalentQuitInfoDlg.validateFields);
     Feng.addAjaxSelect({
         "id": 'talentArrange',
         "displayCode": "code",

public/static/modular/gate/talentLibrary/talentTypeChange/talentTypeChange_info.js

@@ -378,7 +378,7 @@ TalentTypeChangeInfoDlg.getLayerCatdByLayer = function (isNew) {
                 }
             }
         }();
-    } else if (type == 5 || type == 6) {
+    } else if (type == 6) {
         $("#" + conditionElem).html("<option value=''>---请选择---</option>");
         var level = $("#" + arrangeElem).val();
         Feng.addAjaxSelect({
@@ -395,7 +395,7 @@ TalentTypeChangeInfoDlg.getLayerCatdByLayer = function (isNew) {
             "displayCode": "id",
             "displayName": "name",
             "type": "GET",
-            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/showAll/1"
+            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + (!isNew ? "/showAll/1" : "")
         });
     }
     $("#" + conditionElem).trigger("chosen:updated");
@@ -429,7 +429,7 @@ TalentTypeChangeInfoDlg.getIdentifyCondition = function (isNew) {
             "displayCode": "id",
             "displayName": "name",
             "type": "GET",
-            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat + "/showAll/1"
+            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat
         });
         $("#newIdentifyCondition").trigger('chosen:updated');
     } else {

public/static/modular/talentIdentify/talentInfo/hospital/talentInfo_common_check_new.js

@@ -410,8 +410,8 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     var optionHtml = "";
                     if (process <= 4 && process != 2) {
                         optionHtml = '<option value="">请选择</option>\n' +
-                                (obj.highProcess >= 3 && companyList.length > 0 && process == 3 && obj.isMatchZhiren == 0 && !another_way_pass_deptverify ? '<option value="5">审核通过(需要再次部门并审)</option>\n' : '<option value="3">审核通过</option>') +
-                                (obj.highProcess >= 3 && companyList.length > 0 && process == 3 && obj.isMatchZhiren == 0 && !another_way_pass_deptverify ? '<option value="4">审核通过(跳过部门并审)</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' +
                                 (type == 5 && process == 3 ? '<option value="6">驳回到分院</option>\n' : '');
                     }

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

@@ -391,6 +391,7 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     var companyList = data.obj.companys;
                     var fileList = data.obj.fileList;
                     var process = data.obj.process;
+                    var type = data.obj.type;
                     if (typeof data.obj.fieldList != "undefined" && data.obj.fieldList.length > 0) {
                         var fieldList = data.obj.fieldList;
                         var html1 = '';
@@ -413,8 +414,8 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     var optionHtml = "";
                     if (process <= 4 && process != 2) {
                         optionHtml = '<option value="">请选择</option>\n' +
-                                (obj.highProcess >= 3 && companyList.length > 0 && process == 3 && obj.isMatchZhiren == 0 && !another_way_pass_deptverify ? '<option value="5">审核通过(需要再次部门并审)</option>\n' : '<option value="3">审核通过</option>') +
-                                (obj.highProcess >= 3 && companyList.length > 0 && process == 3 && obj.isMatchZhiren == 0 && !another_way_pass_deptverify ? '<option value="4">审核通过(跳过部门并审)</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) || (type == 6 && process == 3) ? '<option value="4">审核通过(跳过部门并审)</option>\n' : "") +
                                 '                            <option value="2">审核驳回</option>\n';
                     }
                     if (process == 5 || process == 2) {