修复人才条件联动中年薪在某些情况下会不显示

app/enterprise/controller/Talent.php

@@ -104,6 +104,9 @@ class Talent extends EnterpriseController {
         $batch = \app\common\api\BatchApi::getValidBatch(\app\common\state\ProjectState::TALENT, $this->user["type"]);
         $info["enterprise"] = $ep;
         $info["talent_type_list"] = DictApi::findChildDictByCode("talent_type");
+        if ($info["talent_condition"]) {
+            $info["isSalary"] = \app\common\api\TalentConditionApi::getOne($info["talent_condition"])["isSalary"] ?: 0;
+        }
         return view($tpl, ["year" => $batch["batch"], "checkState" => $checkState, "row" => $info]);
     }
 

app/enterprise/view/talent/apply.html

@@ -91,6 +91,7 @@
                                 <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="import" id="import" value="{$row.isImport}"/>
+                                <input type="hidden" name="isSalary" id="isSalary" value="{$row.isSalary}"/>
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                     <div class="panel-body">

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

@@ -426,11 +426,11 @@ TalentInfoInfoDlg.infoCallback = function (data) {
     }
     return;
 }
-
+TalentInfoInfoDlg.isSalary = false;
 TalentInfoInfoDlg.getLayerCatdByLayer = function () {
     $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
     $("#talent_condition").html("<option>---请选择---</option>");
-    $("#annual_salary").parents("td").css("display", "none");
+
     $('#talentInfoForm').bootstrapValidator('removeField', "annual_salary");
 
     var level = $("#talent_arrange").val();
@@ -442,14 +442,22 @@ TalentInfoInfoDlg.getLayerCatdByLayer = function () {
         "url": Feng.ctxPath + "/common/api/getLayerCatsByLayer/level/" + level
     });
     $("#talent_condition").trigger("chosen:updated");
-}
 
+    TalentInfoInfoDlg.displaySalary();
+}
+TalentInfoInfoDlg.displaySalary = function () {
+    if (!TalentInfoInfoDlg.isSalary || $("#talent_condition").val() == "" || $("#talent_condition").val() == "---请选择---") {
+        $("#annual_salary").parents("td").css("display", "none");
+    } else {
+        $("#annual_salary").parents("td").css("display", "table-cell");
+    }
+}
 /**
  * 获取人才认定
  */
 TalentInfoInfoDlg.getIdentifyCondition = function () {
     $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
-    $("#annual_salary").parents("td").css("display", "none");
+
     $('#talentInfoForm').bootstrapValidator('removeField', "annual_salary");
     var level = $("#talent_arrange").val();
     var cat = $("#talent_arrange_category").val();
@@ -462,11 +470,13 @@ TalentInfoInfoDlg.getIdentifyCondition = function () {
         "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat + "/id/" + id
     });
     $("#talent_condition").trigger('chosen:updated');
+
+    TalentInfoInfoDlg.displaySalary();
 }
 
 TalentInfoInfoDlg.getIdentifyNeedsFileTypes = function () {
     $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
-    $("#annual_salary").parents("td").css("display", "none");
+
     $('#talentInfoForm').bootstrapValidator('removeField', "annual_salary");
 
     if (TalentInfoInfoDlg.isImport() && $("input[name=isMatchZhiren]:checked").length == 0) {
@@ -483,6 +493,8 @@ TalentInfoInfoDlg.getIdentifyNeedsFileTypes = function () {
         return;
     }
     TalentInfoInfoDlg.ajaxGetConditionFile(source);
+
+    TalentInfoInfoDlg.displaySalary();
 }
 TalentInfoInfoDlg.ajaxGetConditionFile = function (source) {
     var condition = $("#talent_condition option:selected").val();
@@ -492,6 +504,7 @@ TalentInfoInfoDlg.ajaxGetConditionFile = function (source) {
                 return;
             }
             if (typeof data.info != "undefined" && data.info.isSalary == 1) {
+                TalentInfoInfoDlg.isSalary = true;
                 $("#annual_salary").parents("td").css("display", "table-cell");
                 $('#talentInfoForm').bootstrapValidator('addField', "annual_salary", {validators: {
                         notEmpty: {message: '年薪不能放空'},
@@ -506,6 +519,8 @@ TalentInfoInfoDlg.ajaxGetConditionFile = function (source) {
                         }
                     }
                 });
+            } else {
+                TalentInfoInfoDlg.isSalary = false;
             }
             var isMatchZhiren = $("input[name=isMatchZhiren]").length > 0 ? parseInt($("input[name=isMatchZhiren]:checked").val()) : false;
             if (source != "5" || isMatchZhiren == 1) {
@@ -1147,6 +1162,7 @@ $(function () {
     //Feng.initValidatorTip("talentInfoForm", TalentInfoInfoDlg.validateFields);
     var id = $("#id").val();
     var checkState = $("#checkState").val();
+    TalentInfoInfoDlg.isSalary = $("#isSalary").val() == "1" ? true : false;
     //批量加载字典表数据
     var arr = [
         {"name": "nation", "code": "nation"},
@@ -1219,7 +1235,7 @@ $(function () {
     $("#city").val($("#city").attr("value"));
     TalentInfoInfoDlg.afterSelectCity();
     $("#county").val($("#county").attr("value"));
-    TalentInfoInfoDlg.getIdentifyCondition();
+    //TalentInfoInfoDlg.getIdentifyCondition();
     $("#politics").val($("#politics").attr("value"));
     $("#tax_insurance_month").val($("#tax_insurance_month").attr("value"));
     $("#labor_contract_rangetime").val($("#labor_contract_rangetime").attr("value"));
@@ -1280,6 +1296,7 @@ $(function () {
         TalentInfoInfoDlg.changeStudyAbroad();
     }
     TalentInfoInfoDlg.initBirthday();
+    TalentInfoInfoDlg.displaySalary();
 });