津补贴申报中岗位选择在站博士后，社保考勤那些必填的附件就不用判断

app/admin/view/talent_allowance/info.html

@@ -252,16 +252,6 @@
                                                         </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,16 +262,6 @@
                                                         </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

@@ -956,7 +956,7 @@ class TalentAllowance extends EnterpriseController {
                 }
             }
         }
-        if (count($sb) > 1 && $old["postdoc"] != 1) {
+        if (count($sb) > 1 && $old["postType"] != 8) {
             $response->msg = implode("<br>", $sb);
             return $response;
         }

app/enterprise/view/talent_allowance/apply.html

@@ -269,16 +269,6 @@
                                                         </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

@@ -249,16 +249,6 @@
                                                         </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>

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

@@ -302,12 +302,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 postType = $("#postType").val();
+                if (row.must == 1 && (typeof postType == "undefined" || postType != 8)) {
                     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/gate/talentAllowance/common/talentAllowance_info.js

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

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

@@ -174,8 +174,8 @@ 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) {
-                var postdoc = $("#postdoc").val();
-                if (row.must == 1 && postdoc != 1) {
+                var postType = $("#postType").val();
+                if (row.must == 1 && (typeof postType == "undefined" || postType != 8)) {
                     return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
                 }
                 return '<i class="fa fa-paste"></i>' + value;

public/static/modular/talentAllowance/talentAllowanceInfo.js

@@ -427,7 +427,6 @@ 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' +
@@ -513,6 +512,12 @@ TalentAllowanceInfo.updateFieldsAndFiles = function () {
                                 $(this).iCheck(isChecked);
                             })
                         })
+                        $("input[type=checkbox][value=postType]").on("ifChanged", function (e) {
+                            var isChecked = $(this).is(":checked") ? "check" : "uncheck";
+                            $("#field_file input").each(function () {
+                                $(this).iCheck(isChecked);
+                            })
+                        })
                     },
                     yes: function (index, layero) {
                         var projects = '', files = '', concats = '', fields = '';

public/static/modular/talentAllowance/talentAllowanceInfo_info.js

@@ -613,6 +613,12 @@ TalentAllowanceInfoDlg.showCheckModal = function () {
                             $(this).iCheck(isChecked);
                         })
                     })
+                    $("input[type=checkbox][value=postType]").on("ifChanged", function (e) {
+                        var isChecked = $(this).is(":checked") ? "check" : "uncheck";
+                        $("#field_file input").each(function () {
+                            $(this).iCheck(isChecked);
+                        })
+                    })
                     if (calResult) {
                         $("#otherEnjoyedMoney").val(info.otherEnjoyedMoney);
                         $("#otherEnjoyedDescription").val(info.otherEnjoyedDescription);

public/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js

@@ -215,12 +215,11 @@ TalentAllowanceInfoDlg.initFileTypeColumn = function () {
         {field: 'selectItem', checkbox: false, visible: false},
         {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip',
             formatter: function (value, row, index) {
-                if (row.must == 1) {
+                var postType = $("#postType").val();
+                if (row.must == 1 && (typeof postType == "undefined" || postType != 8)) {
                     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%",
@@ -578,7 +577,6 @@ 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 +

public/static/modular/talentAllowance/talentAllowanceInfo_public_check.js

@@ -1048,12 +1048,11 @@ TalentAllowanceInfoDlg.initFileTable = function () {
             {field: 'selectItem', checkbox: false, visible: false},
             {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "20%", 'class': 'uitd_showTip',
                 formatter: function (value, row, index) {
-                    if (row.must == 1) {
+                    var postType = $("#postType").val();
+                    if (row.must == 1 && (typeof postType == "undefined" || postType != 8)) {
                         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: 'description', visible: true, align: 'center', valign: 'middle', width: "68%", 'class': 'uitd_showTip'},

public/static/modular/talentAllowance/talentAllowanceInfo_select.js

@@ -297,12 +297,11 @@ TalentAllowanceInfoDlg.initFileTable = function () {
             {field: 'selectItem', checkbox: false, visible: false},
             {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "80%", 'class': 'uitd_showTip',
                 formatter: function (value, row, index) {
-                    if (row.must == 1) {
+                    var postType = $("#postType").val();
+                    if (row.must == 1 && (typeof postType == "undefined" || postType != 8)) {
                         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: "20%",