津补贴申报界面增加是否在站博士后，如果选是，社保考勤那些必填的附件就不用判断

app/admin/view/talent_allowance/info.html

@@ -252,6 +252,16 @@
                                                         </select>
                                                     </div>
                                                 </div>
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>是否在站博士后</label>
+                                                    <div class="col-sm-2 spacing">
+                                                        <select type="text" class="form-control" disabled="disabled" id="postdoc" name="postdoc" value="{$row.postdoc|default=2}">
+                                                            <option>请选择</option>
+                                                            <option value="1">是</option>
+                                                            <option value="2">否</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
                                                 {/if}
                                                 <div class="rowGroup" id="wageDiv" style="display:none;">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>

app/admin/view/talent_allowance/public_check.html

@@ -262,6 +262,16 @@
                                                         </select>
                                                     </div>
                                                 </div>
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>是否在站博士后</label>
+                                                    <div class="col-sm-2 spacing">
+                                                        <select type="text" class="form-control" disabled="disabled" id="postdoc" name="postdoc" value="{$row.postdoc|default=2}">
+                                                            <option>请选择</option>
+                                                            <option value="1">是</option>
+                                                            <option value="2">否</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
                                                 {/if}
                                                 <div class="rowGroup" id="wageDiv" style="display:none;">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>

app/enterprise/controller/TalentAllowance.php

@@ -557,7 +557,7 @@ class TalentAllowance extends EnterpriseController {
 
         $totalMonth = \DateUtil::getMonthBetweenDates($year . "-01-01", $year . "-12-31");
         /*         * 获取上一年度有效的人才层次 */
-        usort($typeList, function($a, $b) {
+        usort($typeList, function ($a, $b) {
             return (int) $b["oldTalentArrange"] - (int) $a["oldTalentArrange"];
         });
         $commonMonth = [];
@@ -577,7 +577,7 @@ class TalentAllowance extends EnterpriseController {
             }
             if ($monthList) {
                 $months = implode(",", $monthList);
-                $monthList = array_filter($monthList, function($value) use ($commonMonth) {
+                $monthList = array_filter($monthList, function ($value) use ($commonMonth) {
                     return !in_array($value, $commonMonth);
                 });
                 $commonMonth = array_filter(array_merge($commonMonth, $monthList));
@@ -956,7 +956,7 @@ class TalentAllowance extends EnterpriseController {
                 }
             }
         }
-        if (count($sb) > 1) {
+        if (count($sb) > 1 && $old["postdoc"] != 1) {
             $response->msg = implode("<br>", $sb);
             return $response;
         }
@@ -1709,5 +1709,4 @@ class TalentAllowance extends EnterpriseController {
                 return "未知状态";
         }
     }
-
 }

app/enterprise/view/talent_allowance/apply.html

@@ -30,7 +30,9 @@
         float:left;
         margin:0 3px 0 0;
     }
-    .day-selector input{width:70px;}
+    .day-selector input{
+        width:70px;
+    }
     #jjAttendanceForm ul li{
         width:16%;
         padding-top: 10px;
@@ -267,6 +269,16 @@
                                                         </select>
                                                     </div>
                                                 </div>
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>是否在站博士后</label>
+                                                    <div class="col-sm-2 spacing">
+                                                        <select type="text" class="form-control" id="postdoc" name="postdoc" value="{$row.postdoc}">
+                                                            <option>请选择</option>
+                                                            <option value="1">是</option>
+                                                            <option value="2">否</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
                                                 {/if}
                                                 <div class="rowGroup" id="wageDiv" style="display:none;">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>

app/enterprise/view/talent_allowance/detail.html

@@ -230,6 +230,36 @@
                                                     </div>
                                                 </div>
                                                 {/if}
+                                                {if condition="in_array($row['type'],[6])"}
+                                                <div class="rowGroup">
+                                                    <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="certificateTime" name="certificateTime" value="{$row.certificateGetTime}至{$row.certificateExpireTime}"/>
+                                                    </div>
+                                                </div>
+                                                {/if}
+                                                {if condition="in_array($row['type'],[6])"}
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>退休返聘人员</label>
+                                                    <div class="col-sm-2 spacing">
+                                                        <select type="text" class="form-control" disabled="disabled" id="backWork" name="backWork" value="{$row.backWork}">
+                                                            <option>请选择</option>
+                                                            <option value="1">是</option>
+                                                            <option value="2">否</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>是否在站博士后</label>
+                                                    <div class="col-sm-2 spacing">
+                                                        <select type="text" class="form-control" disabled="disabled" id="postdoc" name="postdoc" value="{$row.postdoc}">
+                                                            <option>请选择</option>
+                                                            <option value="1">是</option>
+                                                            <option value="2">否</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                {/if}
                                                 <div class="rowGroup" id="wageDiv" {neq name="row.active" value="2"}style="display: none"{/neq}>
                                                      <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>
                                                     <div class="col-sm-2 spacing">

public/static/modular/gate/talentAllowance/common/talentAllowance_info.js

@@ -58,6 +58,19 @@ var TalentAllowanceInfoDlg = {
                 }
             }
         },
+        postdoc: {
+            validators: {
+                callback: {
+                    message: "请选择是否在站博士后",
+                    callback: function (value, validator) {
+                        if ($("#postdoc option").length > 0 && ($("#postdoc").val() == null || $("#postdoc").val() == "")) {
+                            return false;
+                        }
+                        return true;
+                    }
+                }
+            }
+        },
     }
 };
 
@@ -107,7 +120,8 @@ TalentAllowanceInfoDlg.collectData = function () {
             .set('postType')
             .set('institution')
             .set('wage')
-            .set('backWork');
+            .set('backWork')
+            .set('postdoc');
 }
 /**
  * 验证数据

public/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js

@@ -174,12 +174,11 @@ TalentAllowanceInfoDlg.initFileTypeColumn = function () {
         {field: 'selectItem', checkbox: false, visible: false},
         {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
             formatter: function (value, row, index) {
-                if (row.must == 1) {
+                var postdoc = $("#postdoc").val();
+                if (row.must == 1 && postdoc != 1) {
                     return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
                 }
-                if (row.must == 2) {
-                    return '<i class="fa fa-paste"></i>' + value;
-                }
+                return '<i class="fa fa-paste"></i>' + value;
             }
         },
         {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "8%",

public/static/modular/talentAllowance/talentAllowanceInfo.js

@@ -427,6 +427,7 @@ TalentAllowanceInfo.updateFieldsAndFiles = function () {
                             '                           <ul><li style="width: 100%"><input type="checkbox" id="typeChange" class="icheckbox" value="allowanceType"><span>津补贴类型</span></li>\n' +
                             ($("#type").val() == 6 ? '<li style="width: 100%"><input type="checkbox" class="icheckbox" value="postType"><span>岗位类型</span></li>' : "") +
                             ($("#type").val() == 6 ? '<li style="width: 100%"><input type="checkbox" class="icheckbox" value="institution"><span>所属编制</span></li>' : "") +
+                            ($("#type").val() == 6 ? '<li style="width: 100%"><input type="checkbox" class="icheckbox" value="postdoc"><span>是否在站博士后</span></li>' : "") +
                             '                        </ul></div>\n' +
                             '                        <label for="field_project" class="control-label">可修改项目</label>\n' +
                             '                        <div id="field_project">\n' +

public/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js

@@ -567,7 +567,7 @@ TalentAllowanceInfoDlg.createCheckHtml = function () {
             }
             html += '<div class="form-group" id="field" style="display: none;margin: 10px">\n';
 
-            if ($("#type").val() == 6 && ($("#postType option").length > 0 || $("#institution option").length > 0)) {
+            if ($("#type").val() == 6) {
                 html = html +
                         '<label for="field_project" class="control-label">可修改字段</label>\n' +
                         '<div id="field_field">\n' +
@@ -578,6 +578,7 @@ TalentAllowanceInfoDlg.createCheckHtml = function () {
                 if ($("#institution option").length > 0) {
                     html += '<li style="width: 100%"><input type="checkbox" value="institution"><span>所属编制</span></li>';
                 }
+                html += '<li style="width: 100%"><input type="checkbox" value="postdoc"><span>是否在站博士后</span></li>';
                 html += '</ul></div>';
             } else {
                 html = html +