增加卫健和高教直认人才申报选项

app/admin/controller/Talent.php

@@ -965,6 +965,9 @@ 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;
+            }
         } else if ($params["checkState"] == 4) {
             if ($talent_info["highProcess"] < 3)
                 return json(["msg" => "只有曾经达到过部门并审，初审时才可以选择直接跳过部门并审阶段"]);

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

@@ -296,7 +296,39 @@
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
                                     <div class="panel-body">
-                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered"><tr>                                    
+                                                <td style="width:22%">
+                                                    <label class=" control-label spacing"><span style="color: red;font-size:12px;">*是否认定福建省或泉州市高层次人才</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>
+                                                </td>
+                                                <td style="width:22%;overflow: inherit">
+                                                    <label class=" control-label spacing"><span style="color: red;font-size:12px;">*是否符合晋江人才认定标准</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>
+                                                </td>                                 
+                                                <td style="width:23%">
+                                                    <div class="rowGroup col-sm-12">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>                                                        
+                                                        <input type="text" class="form-control" id="talent_arrange" name="talent_arrange" value="{$info.talentArrangeName}"/>
+                                                    </div>
+                                                </td>
+                                                <td style="width:33%" rowspan="2">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                            <tr>               
+                                                <td style="width:67%;overflow: inherit" colspan="3">
+                                                    <div class="rowGroup col-sm-10">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
+                                                        <input type="text" class="form-control" id="talent_condition_rel" value="{$info.talentConditionName}"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
                                             <tr>                                                
                                                 <td style="width:22%">
                                                     <div class="rowGroup col-sm-12">

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

@@ -169,6 +169,20 @@
                                                             <label class=" control-label spacing">电子邮箱</label>
                                                             <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>
+                                                            <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>
+                                                            <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">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>人才层次</label>
                                                             <select class="form-control" id="talent_arrange" name="talent_arrange">

app/common/api/DictApi.php

@@ -287,6 +287,8 @@ class DictApi {
             "labor_contract_rangetime" => "工作合同起止时间",
             "title" => "职称",
             "fst_city_work_time" => "来泉工作时间",
+            "is_fujian_talent" => "是否认定福建省或泉州市高层次人才",
+            "is_jinjiang_talent" => "是否符合晋江人才认定标准",
             "talent_arrange" => "人才层次",
             "talent_condition" => "认定条件",
             "phone" => "手机号码",
@@ -329,6 +331,8 @@ class DictApi {
             "pro_qua" => "职业资格",
             "phone" => "手机号码",
             "email" => "电子邮箱",
+            "is_fujian_talent" => "是否认定福建省或泉州市高层次人才",
+            "is_jinjiang_talent" => "是否符合晋江人才认定标准",
             "talent_arrange" => "人才层次",
             "talent_arrange_category" => "人才条款",
             "talent_condition" => "认定条件",
@@ -362,9 +366,6 @@ class DictApi {
                 break;
             case CommonConst::ENTERPRISE_JC:
                 $fields = [
-                    "newSource" => "新申报来源",
-                    "newSourceCity" => "新入选来源地级市",
-                    "newSourceCounty" => "新入选来源县市区",
                     "newTalentArrange" => "新人才层次",
                     "newIdentifyCondition" => "新认定条件",
                     "newIdentifyConditionName" => "新认定条件名称",
@@ -374,7 +375,6 @@ class DictApi {
             case CommonConst::ENTERPRISE_WJ:
                 $fields = [
                     "newTalentArrange" => "新人才层次",
-                    "newIdentifyConditionCategory" => "新人才条款",
                     "newIdentifyCondition" => "新认定条件",
                     "newIdentifyGetTime" => "新认定条件证书取得时间",
                     "newAnnualSalary" => "新年薪",

app/enterprise/controller/Talent.php

@@ -1271,7 +1271,7 @@ class Talent extends EnterpriseController {
             $all_valid_keys = ["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", "fst_city_work_time",
-                "talent_arrange", "talent_condition",
+                "is_fujian_talent", "is_jinjiang_talent", "talent_arrange", "talent_condition",
                 "phone", "email", "bank", "bank_account", "bank_number", "bank_branch_name", "experience", "education"];
             foreach ($all_valid_keys as $key) {
                 $value = trim($param[$key]);
@@ -1415,7 +1415,7 @@ class Talent extends EnterpriseController {
             $all_valid_keys = ["name", "nation", "card_type", "card_number", "sex", "birthday", "politics", "nationality", "province", "city", "county", "talent_type",
                 "position", "cur_entry_time", "labor_contract_rangetime",
                 "highest_degree", "graduate_school", "major", "study_abroad", "title", "pro_qua", "phone", "email",
-                "talent_arrange", "talent_condition", "identifyGetTime",
+                "is_fujian_talent", "is_jinjiang_talent", "talent_arrange", "talent_condition", "identifyGetTime",
                 "bank", "bank_account", "bank_number", "bank_branch_name", "experience", "education"];
             foreach ($all_valid_keys as $key) {
                 $value = trim($param[$key]);

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

@@ -296,14 +296,33 @@
                                     <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
                                     <div class="panel-body">
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>                                                
+                                            <tr>                                    
                                                 <td style="width:22%">
+                                                    <label class=" control-label spacing"><span style="color: red;font-size:12px;">*是否认定福建省或泉州市高层次人才</span></label>
+                                                    <select class="form-control" id="is_fujian_talent" name="is_fujian_talent" onchange="TalentInfoInfoDlg.onTalentRuleChange()" autocomplete='off' value="{$row.is_fujian_talent}">
+                                                        <option value="2">否</option>
+                                                        <option value="1">是</option>
+                                                    </select>
+                                                </td>
+                                                <td style="width:22%;overflow: inherit">
+                                                    <label class=" control-label spacing"><span style="color: red;font-size:12px;">*是否符合晋江人才认定标准</span></label>
+                                                    <select class="form-control" id="is_jinjiang_talent" name="is_jinjiang_talent" onchange="TalentInfoInfoDlg.onTalentRuleChange()" autocomplete='off' value="{$row.is_jinjiang_talent}">
+                                                        <option value="2">否</option>
+                                                        <option value="1">是</option>
+                                                    </select>
+                                                </td>                                 
+                                                <td style="width:23%">
                                                     <div class="rowGroup col-sm-12">
                                                         <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>
                                                         <select class="form-control" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange}"></select>
                                                     </div>
                                                 </td>
-                                                <td style="width:45%;overflow: inherit">
+                                                <td style="width:33%" rowspan="2">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                            <tr>               
+                                                <td style="width:67%;overflow: inherit" colspan="3">
                                                     <div class="rowGroup col-sm-10">
                                                         <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
                                                         <div class="form-control" style="border:none;padding:0;">
@@ -311,9 +330,6 @@
                                                         </div>
                                                     </div>
                                                 </td>
-                                                <td style="width:33%">
-                                                    <table class="fileTable"></table>
-                                                </td>
                                             </tr>
                                         </table>
                                     </div>

app/enterprise/view/talent/hospital/view.html

@@ -131,7 +131,7 @@
                                                         请上传近期免冠半身彩照（两寸）
                                                     </p>
                                                     <img id="photoImg" {if condition="$row['headimgurl']"} src="{$row.headimgurl|getStoragePath}" {else/} src="/static/img/avatar.png" {/if} onclick="$('#photo').click();" style="height:147px;width:105px;margin:0 auto;display:block;">
-                                                         <hr />
+                                                        <hr />
                                                         附件：
                                                         <table class="fileTable"></table>
                                                 </td>
@@ -295,22 +295,38 @@
                                     <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
                                     <div class="panel-body">
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>                                                
+                                            <tr>                                    
                                                 <td style="width:22%">
+                                                    <label class=" control-label spacing"><span style="color: red;font-size:12px;">*是否认定福建省或泉州市高层次人才</span></label>
+                                                    <select class="form-control" id="is_fujian_talent" name="is_fujian_talent" value="{$row.is_fujian_talent}">
+                                                        {eq name="row.is_fujian_talent" value="1"}<option value="1">是</option>{/eq}
+                                                        {eq name="row.is_fujian_talent" value="2"}<option value="2">否</option>{/eq}
+                                                    </select>
+                                                </td>
+                                                <td style="width:22%;overflow: inherit">
+                                                    <label class=" control-label spacing"><span style="color: red;font-size:12px;">*是否符合晋江人才认定标准</span></label>
+                                                    <select class="form-control" id="is_jinjiang_talent" name="is_jinjiang_talent" value="{$row.is_jinjiang_talent}">
+                                                        {eq name="row.is_jinjiang_talent" value="1"}<option value="1">是</option>{/eq}
+                                                        {eq name="row.is_jinjiang_talent" value="2"}<option value="2">否</option>{/eq}
+                                                    </select>
+                                                </td>                                 
+                                                <td style="width:23%">
                                                     <div class="rowGroup col-sm-12">
                                                         <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>                                                        
                                                         <input type="text" class="form-control" id="talent_arrange" name="talent_arrange" value="{$row.talentArrangeName}"/>
                                                     </div>
                                                 </td>
-                                                <td style="width:45%;overflow: inherit">
+                                                <td style="width:33%" rowspan="2">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                            <tr>               
+                                                <td style="width:67%;overflow: inherit" colspan="3">
                                                     <div class="rowGroup col-sm-10">
                                                         <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
                                                         <input type="text" class="form-control" id="talent_condition_rel" value="{$row.talentConditionName}"/>
                                                     </div>
                                                 </td>
-                                                <td style="width:33%">
-                                                    <table class="fileTable"></table>
-                                                </td>
                                             </tr>
                                         </table>
                                     </div>

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

@@ -176,7 +176,20 @@
                                                             <label class=" control-label spacing">电子邮箱</label>
                                                             <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>
+                                                            <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">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>人才层次</label>
                                                             <select class="form-control" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getLayerCatdByLayer()" value="{$row.talent_arrange}"></select>

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

@@ -44,15 +44,16 @@
                                         <form id="talentInfoForm" class="form-horizontal" action="/enterprise/talent/apply" method="post" enctype="multipart/form-data" target="hiddenIframe">
                                             <div class="col-sm-12 form-group-sm">                                                
                                                 <input type="hidden" name="id" id="id" value="{$row.id}">
-                                                <input type="hidden" name="year" id="year" value="{$year}">
-                                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise.id}">
-                                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterprise.type}">
-                                                <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$row.enterprise.enterpriseTag}">
+                                                <input type="hidden" name="year" id="year" value="{$row.apply_year}">
+                                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise_id}">
+                                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterpriseType}">
+                                                <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$row.enterpriseTag}">
                                                 <input type="file" name="photo" id="photo" style="display: none">
                                                 <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
                                                 <input type="hidden" name="realState" id="realState" value="{$row.real_state}">
                                                 <input type="hidden" name="files" id="files" value="{$row.modify_files}">
                                                 <input type="hidden" name="fields" id="fields" value="{$row.modify_fields}">
+                                                <input type="hidden" name="talent_condition" id="talent_condition" value="{$row.talent_condition}">
                                                 <div class="row">
                                                     <div class="col-sm-11">
                                                         <div class="rowGroup col-sm-4">
@@ -114,12 +115,11 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>人才类型</label>
-                                                            <select class="form-control" id="talent_type" name="talent_type" value="{$row.talent_type}">
-                                                            </select>
+                                                            <input type="text" class="form-control" id="talent_type" name="talent_type" value="{$row.talentTypeName}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>学校名称</label>
-                                                            <input type="text" class="form-control" readonly="readonly" value="{$row.enterprise.name}"/>
+                                                            <input type="text" class="form-control" readonly="readonly" value="{$row.enterpriseName}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>职务</label>
@@ -176,18 +176,35 @@
                                                             <label class=" control-label spacing">电子邮箱</label>
                                                             <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>
+                                                            <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">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>人才层次</label>
-                                                            <select class="form-control" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getLayerCatdByLayer()" value="{$row.talent_arrange}"></select>
+                                                            <select class="form-control" id="talent_arrange" name="talent_arrange" value="{$row.talent_arrange}">
+                                                                <option value="">{$row.talentArrangeName}</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="talent_arrange_category" name="talent_arrange_category" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange_category}"></select>
+                                                            <select class="form-control" id="talent_arrange_category" name="talent_arrange_category">
+                                                                <option value="">{$row.talentArrangeCatName}</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="talent_condition" name="talent_condition" onchange="TalentInfoInfoDlg.changeIdentifyCondition()" value="{$row.talent_condition}"></select>
+                                                            <input type="text" class="form-control" id="talent_condition_rel" value="{$row.talentConditionName}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>

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

@@ -162,6 +162,8 @@ TalentInfoInfoDlg.collectData = function () {
             .set('bank_number')
             .set('cur_entry_time')
             .set('labor_contract_rangetime')
+            .set('is_fujian_talent')
+            .set('is_jinjiang_talent')
             .set('talent_arrange')
             .set('talent_condition')
             .set('identifyGetTime')
@@ -495,6 +497,14 @@ TalentInfoInfoDlg.ajaxGetConditionFile = function (source) {
     }
 }
 
+TalentInfoInfoDlg.onTalentRuleChange = function(){
+    var is_fujian_talent = $("#is_fujian_talent").val();
+    var is_jinjiang_talent = $("#is_jinjiang_talent").val();
+    if(is_fujian_talent == 1 && is_jinjiang_talent == 2){
+        
+    }
+}
+
 TalentInfoInfoDlg.bankChange = function () {
     var bank = $("#bank").val();
     if ($.trim(bank) == '中国工商银行') {

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

@@ -152,6 +152,8 @@ TalentInfoInfoDlg.collectData = function () {
             .set('pro_qua')
             .set('phone')
             .set('email')
+            .set('is_fujian_talent')
+            .set('is_jinjiang_talent')
             .set('talent_arrange')
             .set('talent_arrange_category')
             .set('talent_condition')

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

@@ -80,6 +80,7 @@ TalentInfoInfoDlg.initFileTable = function (){
     var queryData = {};
     queryData['project'] = CONFIG.project_rcrd;
     queryData['type'] = $("#type").val();
+    queryData["talent_condition"] = $("#talent_condition").val();
     queryData['checkState'] = $("#checkState").val();
     queryData['isMix'] = 1;
     $("#fileTable").bootstrapTable({

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

@@ -406,11 +406,12 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     $("#field_info ul").css("overflow", "hidden").empty().append(html1);
                     $("#field_file").css("overflow", "hidden").empty().append(html2);
                     $("#company_list ul").css("overflow", "hidden").empty().append(html3);
+                    var another_way_pass_deptverify = (obj.is_fujian_talent == 1 && obj.is_jinjiang_talent == 1) ? true : false;
                     var optionHtml = "";
                     if (process <= 4 && process != 2) {
                         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' : "") +
+                                (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' : "") +
                                 '                            <option value="2">审核驳回</option>\n' +
                                 (type == 5 && process == 3 ? '<option value="6">驳回到分院</option>\n' : '');
                     }
@@ -486,7 +487,7 @@ TalentInfoInfoDlg.toggledepField = function () {
 /**
  * 显示字段或者隐藏字段选择
  */
-TalentInfoInfoDlg.toggleField = function () {    
+TalentInfoInfoDlg.toggleField = function () {
     var checkState = $("#checkStateFirstModal").val();
     var checkMsgFirst = $("#checkMsgFirst").val();
     $("#company_list").hide();

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

@@ -409,11 +409,12 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     $("#field_info ul").css("overflow", "hidden").empty().append(html1);
                     $("#field_file").css("overflow", "hidden").empty().append(html2);
                     $("#company_list ul").css("overflow", "hidden").empty().append(html3);
+                    var another_way_pass_deptverify = (obj.is_fujian_talent == 1 && obj.is_jinjiang_talent == 1) ? true : false;
                     var optionHtml = "";
                     if (process <= 4 && process != 2) {
                         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' : "") +
+                                (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' : "") +
                                 '                            <option value="2">审核驳回</option>\n';
                     }
                     if (process == 5 || process == 2) {