认定条件证书取得时间->认定条件取得时间，去掉"请先选择来源"的提示

app/admin/view/talent/dept_fst_verify.html

@@ -247,7 +247,7 @@
                                 <li style="width:12%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>
                                 <li style="width:12%"><input type="checkbox" value="identifyConditionText"><span>认定条件</span></li>
                                 <li style="width:12%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>
+                                <li style="width:24%"><input type="checkbox" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:12%"><input type="checkbox" value="enterpriseTalentTypeName"><span>企业标签</span></li>
                                 <li style="width:12%"><input type="checkbox" value="talentTypeName"><span>人才标签</span></li>
                                 <li style="width:24%"><input type="checkbox" value="letterTime"><span>首次来晋行政介绍信时间</span></li>
@@ -307,7 +307,7 @@
                                 <li style="width:12%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>
                                 <li style="width:12%"><input type="checkbox" value="identifyConditionText"><span>认定条件</span></li>
                                 <li style="width:12%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>
+                                <li style="width:24%"><input type="checkbox" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:12%"><input type="checkbox" value="title"><span>职称</span></li>
                                 <li style="width:12%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>
                                 <li style="width:24.5%"><input type="checkbox" value="studyAbroadName"><span>是否有留学经历</span></li>

app/admin/view/talent/talentInfo_common_check.html

@@ -614,7 +614,7 @@
                                         <tr>
                                             <td colspan="2">
                                                 <div class="rowGroup col-sm-12">
-                                                    <label class="control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
+                                                    <label class="control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime" value="{$info.identifyGetTime}"/>
                                                 </div>
                                             </td>

app/admin/view/talent/talentInfo_common_checkIC.html

@@ -173,7 +173,7 @@
                                                             <input type="text" class="form-control" id="identifyConditionName" name="identifyConditionName" value="{$info.identifyConditionName}" title="{$info.identifyConditionName}"/>
                                                         </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>
                                                             <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime" value="{$info.identifyGetTime}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">

app/admin/view/talent/talentInfo_library.html

@@ -282,7 +282,7 @@
                                 <li style="width:24%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>
                                 <li style="width:24%"><input type="checkbox" value="identifyConditionText"><span>认定条件</span></li>
                                 <li style="width:24%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>
+                                <li style="width:24%"><input type="checkbox" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:24%"><input type="checkbox" value="enterpriseTalentTypeName"><span>企业标签</span></li>
                                 <li style="width:24%"><input type="checkbox" value="talentTypeName"><span>人才标签</span></li>
                                 <li style="width:24%"><input type="checkbox" value="letterTime"><span>首次来晋行政介绍信时间</span></li>
@@ -344,7 +344,7 @@
                                 <li style="width:24%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>
                                 <li style="width:24%"><input type="checkbox" value="identifyConditionText"><span>认定条件</span></li>
                                 <li style="width:24%"><input type="checkbox" value="identifyConditionName"><span>认定条件名称</span></li>
-                                <li style="width:24%"><input type="checkbox" value="identifyGetTime"><span>认定条件证书取得时间</span></li>
+                                <li style="width:24%"><input type="checkbox" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:24%"><input type="checkbox" value="title"><span>职称</span></li>
                                 <li style="width:24%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>
                                 <li style="width:24%"><input type="checkbox" value="studyAbroadName"><span>是否有留学经历</span></li>

app/admin/view/talent_allowance/talentAllowanceInfo_info.html

@@ -196,7 +196,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
-                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyGetTime" name="identifyGetTime" value="${item.identifyGetTime}"/>
                                                     </div>

app/admin/view/talent_allowance/talentAllowanceInfo_public_check.html

@@ -194,7 +194,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
-                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyGetTime" name="identifyGetTime" value="${item.identifyGetTime}"/>
                                                     </div>

app/admin/view/talent_allowance/talentAllowanceInfo_select.html

@@ -191,7 +191,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
-                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyGetTime" name="identifyGetTime" value="${item.identifyGetTime}"/>
                                                     </div>

app/common/api/DictApi.php

@@ -200,7 +200,7 @@ class DictApi {
             "talent_arrange" => "人才层次",
             "talent_arrange_category" => "人才条款",
             "talent_condition" => "认定条件",
-            "identifyGetTime" => "认定条件证书取得时间",
+            "identifyGetTime" => "认定条件取得时间",
             "annual_salary" => "上一年度年薪（元）",
             "bank" => "开户银行",
             "bank_number" => "银行行号",
@@ -251,7 +251,7 @@ class DictApi {
             "talent_arrange" => "人才层次",
             "talent_condition" => "认定条件",
             "identifyConditionName" => "认定条件名称",
-            "identifyGetTime" => "认定条件证书取得时间",
+            "identifyGetTime" => "认定条件取得时间",
             "title" => "职称",
             "pro_qua" => "国家职业资格",
             "bank" => "开户银行",

app/enterprise/validate/TalentInfo.php

@@ -81,7 +81,7 @@ class TalentInfo extends Validate {
         "bank_branch_name.regex" => "开户银行网点格式应为[XX银行XX省XX市XX行/处]",
         "bank_account.regex" => "银行账号只能是数字",
         "break_faith.between" => "是否曾被相关主管部门列为失信个人只能在预设列表中选择",
-        "identifyGetTime.dateFormat" => "认定条件证书取得时间必需是有效的日期格式[yyyy-MM-dd]",
+        "identifyGetTime.dateFormat" => "认定条件取得时间必需是有效的日期格式[yyyy-MM-dd]",
     ];
 
     protected function checkUnique($value, $rule, $data = [], $field) {

app/enterprise/view/talent/apply.html

@@ -597,7 +597,7 @@
                                             </tr>
                                             <tr>
                                                 <td colspan="4" style="overflow: inherit">
-                                                    <div class="rowGroup col-sm-12">
+                                                    <div class="rowGroup col-sm-10">
                                                         <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
                                                         <select class="chosen" id="talent_condition" name="talent_condition" onchange="TalentInfoInfoDlg.getIdentifyNeedsFileTypes()" value="{$row.talent_condition}" style="width: 80%"></select>
                                                     </div>
@@ -606,7 +606,7 @@
                                             <tr>
                                                 <td colspan="2">
                                                     <div class="rowGroup col-sm-12">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
+                                                        <label class="control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                         <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime" value="{$row.identifyGetTime}"/>
                                                     </div>
                                                 </td>

app/enterprise/view/talent/ic_apply.html

@@ -179,7 +179,7 @@
                                                             <input type="text" class="form-control" id="identifyConditionName" name="identifyConditionName" value="{$row.identifyConditionName}"/>
                                                         </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>
                                                             <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime" value="{$row.identifyGetTime}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">

app/enterprise/view/talent/ic_view.html

@@ -179,7 +179,7 @@
                                                             <input type="text" class="form-control" id="identifyConditionName" name="identifyConditionName" value="{$row.identifyConditionName}"/>
                                                         </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>
                                                             <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime" value="{$row.identifyGetTime}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">

app/enterprise/view/talent/view.html

@@ -598,7 +598,7 @@
                                             <tr>
                                                 <td colspan="2">
                                                     <div class="rowGroup col-sm-12">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
+                                                        <label class="control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                         <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime" value="{$row.identifyGetTime}"/>
                                                     </div>
                                                 </td>

app/enterprise/view/talent_allowance/add.html

@@ -170,7 +170,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
-                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyGetTime" name="identifyGetTime"/>
                                                     </div>

app/enterprise/view/talent_allowance/edit.html

@@ -176,7 +176,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
-                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyGetTime" name="identifyGetTime" value="${item.identifyGetTime}"/>
                                                     </div>

app/enterprise/view/talent_allowance/patch.html

@@ -177,7 +177,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
-                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyGetTime" name="identifyGetTime" value="${item.identifyGetTime}"/>
                                                     </div>

app/enterprise/view/talent_allowance/view.html

@@ -179,7 +179,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
-                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">
                                                         <input type="text" class="form-control" readonly="readonly" id="identifyGetTime" name="identifyGetTime" value="${item.identifyGetTime}"/>
                                                     </div>

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

@@ -450,7 +450,7 @@ TalentInfoInfoDlg.isSalary = false;
 TalentInfoInfoDlg.getLayerCatdByLayer = function () {
     var source = $("#source").val();
     if (source == "" || typeof source == "undefined") {
-        layer.alert("请先选择申报来源");
+        //layer.alert("请先选择申报来源");
         $("#talent_arrange").val("");
         return;
     }
@@ -534,7 +534,7 @@ TalentInfoInfoDlg.getIdentifyNeedsFileTypes = function () {
     }
     var source = $("#source").val();
     if (source == "" || typeof source == "undefined") {
-        layer.alert("请先选择申报来源");
+        //layer.alert("请先选择申报来源");
         $("#talent_condition").val("");
         $("#talent_condition").trigger('chosen:updated');
         return;
@@ -1349,9 +1349,11 @@ $(function () {
     $("#fujian_highcert_pubtime").val($("#fujian_highcert_pubtime").attr("value"));
     $("#fujian_highcert_exptime").val($("#fujian_highcert_exptime").attr("value"));
     $("#talent_arrange").val($("#talent_arrange").attr("value"));
-    TalentInfoInfoDlg.getLayerCatdByLayer();
-    $("#talent_arrange_category").val($("#talent_arrange_category").attr("value"));
-    TalentInfoInfoDlg.getIdentifyCondition();
+    if ($("#source").val() != "") {
+        TalentInfoInfoDlg.getLayerCatdByLayer();
+        $("#talent_arrange_category").val($("#talent_arrange_category").attr("value"));
+        TalentInfoInfoDlg.getIdentifyCondition();
+    }
     TalentInfoInfoDlg.validId();
     $("#photo").change(function (e) {
         var tag = e.target;