硕博字段修改

app/enterprise/validate/LivingAllowance.php

@@ -40,7 +40,7 @@ class LivingAllowance extends Validate {
         "introductionMethod" => "require|checkInJJTime",
         "industryFieldNew" => "checkIndustryFieldNew",
         "industryField" => "checkIndustryField",
-        "socialSecurity" => "require"
+        //"socialSecurity" => "require"
     ];
     protected $message = [
         "type.require" => "人才类别不能为空",

app/enterprise/view/living_allowance/apply.html

@@ -228,7 +228,7 @@
                                                                         <input type="text" value="{$row.endTime}" class="form-control date" id="endTime" name="endTime"/>
                                                                     </div>
                                                                     <div class="rowGroup col-sm-3">
-                                                                        <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" value="{$row.firstSocialSecurityTime}" class="form-control date" id="firstSocialSecurityTime" name="firstSocialSecurityTime"/>
                                                                     </div>
                                                                     <div class="rowGroup col-sm-3">
@@ -342,13 +342,13 @@
                                                 <div class="bs-callout bs-callout-info" >
                                                     <div class="row"  id="socialSecurityDiv">
                                                         <div class="rowGroup col-sm-12">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>社保缴交情况</label>
+                                                            <label class=" control-label spacing">社保缴交情况</label>
                                                             <div id="socialSecurity" class="xm-select-demo" value="{$row.socialSecurity}"></div>
                                                         </div>
                                                     </div>
                                                     <div class="row"  id="personalTaxDiv">
                                                         <div class="rowGroup col-sm-12">
-                                                            <label class=" control-label spacing">个税缴交情况(首年申报无需提交)</label>
+                                                            <label class=" control-label spacing">个税缴交情况</label>
                                                             <div id="personalTax" class="xm-select-demo" value="{$row.personalTax}"></div>
                                                         </div>
                                                     </div>

public/static/modular/gate/master/livingAllowanceInfo/livingAllowanceInfo_info.js

@@ -58,7 +58,7 @@ var LivingAllowanceInfoInfoDlg = {
         sex: {validators: {notEmpty: {message: '性别不能为空'}}},
         nationality: {validators: {notEmpty: {message: '国籍/地区不能为空'}}},
         birthday: {validators: {notEmpty: {message: '出生日期不能为空'}}},
-        firstSocialSecurityTime: {validators: {notEmpty: {message: '首次社保缴纳时间不能为空'}}},
+        //firstSocialSecurityTime: {validators: {notEmpty: {message: '首次社保缴纳时间不能为空'}}},
         politics: {validators: {notEmpty: {message: '政治面貌不能为空'}}},
         post: {validators: {
                 notEmpty: {message: '职务不能为空'},
@@ -256,10 +256,10 @@ LivingAllowanceInfoInfoDlg.upsertValidate = function () {
     if (!LivingAllowanceInfoInfoDlg.validate()) {
         return;
     }
-    if (Feng.isEmptyStr(LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.socialSecurity)) {
-        Feng.info("社保缴交情况不能为空!");
-        return;
-    }
+    // if (Feng.isEmptyStr(LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.socialSecurity)) {
+    //     Feng.info("社保缴交情况不能为空!");
+    //     return;
+    // }
     if (LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.introductionMethod == 1) {
         if (Feng.isEmptyStr(LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.firstInJJTime)) {
             Feng.info("首次来晋时间不能为空!");