高教的一些功能修改

app/enterprise/controller/Talent.php

@@ -1431,7 +1431,7 @@ class Talent extends EnterpriseController {
                 "position", "cur_entry_time", "labor_contract_rangetime",
                 "highest_degree", "graduate_school", "major", "study_abroad", "title", "pro_qua", "phone", "email",
                 "is_fujian_talent", "is_jinjiang_talent", "talent_arrange", "talent_condition", "identifyGetTime",
-                "bank", "bank_account", "bank_number", "bank_branch_name", "experience", "education"];
+                "bank", "bank_account", "bank_number", "bank_branch_name", "experience", "education","parent_talent_level","parent_talent_condition"];
             foreach ($all_valid_keys as $key) {
                 $value = trim($param[$key]);
                 if ($value) {

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

@@ -183,12 +183,14 @@
                                                                 <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 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}"/>
+                                                        </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_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>

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

@@ -55,6 +55,34 @@ var TalentInfoInfoDlg = {
                 }
             }
         },
+        parent_talent_level: {
+            validators: {
+                callback: {
+                    message: "请填写您认定为福建省或泉州市高层次人才的人才层次",
+                    callback: function (value, validator) {
+                        if ($("#is_fujian_talent").val() == 1 && $("#parent_talent_level").val() == '') {
+                            //当省市都有值时，如果县有列表，必选
+                            return false;
+                        }
+                        return true;
+                    }
+                }
+            }
+        },
+        parent_talent_condition: {
+            validators: {
+                callback: {
+                    message: "请填写您认定为福建省或泉州市高层次人才的人才层次",
+                    callback: function (value, validator) {
+                        if ($("#is_fujian_talent").val() == 1 && $("#parent_talent_condition").val() == '') {
+                            //当省市都有值时，如果县有列表，必选
+                            return false;
+                        }
+                        return true;
+                    }
+                }
+            }
+        },
         talent_arrange: {validators: {notEmpty: {message: '人才层次不能为空'}}},
         talent_arrange_category: {validators: {notEmpty: {message: '人才条款不能为空'}}},
         talent_condition: {validators: {notEmpty: {message: '认定条件不能为空'}}},
@@ -153,7 +181,8 @@ TalentInfoInfoDlg.collectData = function () {
             .set('phone')
             .set('email')
             .set('is_fujian_talent')
-            .set('is_jinjiang_talent')
+            .set('parent_talent_level')
+            .set('parent_talent_condition')
             .set('talent_arrange')
             .set('talent_arrange_category')
             .set('talent_condition')
@@ -221,6 +250,12 @@ 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");
+    }
+    console.log()
     $("#talent_condition").html("<option value=''>---请选择---</option>");
     var level = $("#talent_arrange").val();
     var cat = $("#talent_arrange_category").val();
@@ -693,6 +728,13 @@ function async_padding(card_number, card_type) {
 }
 
 $(function () {
+    $("#is_fujian_talent").on('change',function(){
+        if($(this).val() == 1){
+            $(".parent_talent").css('display','block');
+        }else{
+            $(".parent_talent").css('display','none');
+        }
+    });
     $('#talentInfoForm').bootstrapValidator({
         feedbackIcons: {
             valid: 'glyphicon glyphicon-ok',