sugangqiang 10 сар өмнө
parent
commit
9b014b9614

+ 3 - 3
public/static/modular/gate/talentAllowance/common/talentAllowance_info.js

@@ -671,7 +671,7 @@ TalentAllowanceInfoDlg.initFileTable = function () {
                 var type = $("#type").val();
                 for (var key in data) {
                     var btn = "";
-                    if (checkState == 1 || (type != 5 && checkState == 10 && files.indexOf(row.id) != -1) || (type == 5 && checkState == 8 && files.indexOf(row.id) != -1)) {
+                    if (checkState == 1 || (checkState == 10 && files.indexOf(row.id) != -1) || (type == 5 && checkState == 8 && files.indexOf(row.id) != -1)) {
                         btn = "<button type=\'button\' onclick=\"TalentAllowanceInfoDlg.checkFile(this,'" + row.id + "','" + data[key].id + "')\" style=\'margin-left: 5px\' class=\"btn btn-xs btn-success\">" +
                                 "<i class=\"fa fa-paste\"></i>修改" +
                                 "</button>" +
@@ -898,7 +898,7 @@ TalentAllowanceInfoDlg.validateIsEdit = function () {
     }
     var checkState = $("#checkState").val();
     var type = $("#type").val();
-    if (checkState != 1 && !(type != 5 && checkState == 10) && !(type == 5 && checkState == 8)) {
+    if (checkState != 1 && !(checkState == 10) && !(type == 5 && checkState == 8)) {
         if (checkState == -1) {
             Feng.error("您的申报审核不通过,无法再修改");
             return false;
@@ -961,7 +961,7 @@ $(function () {
         $("#allowanceType").attr("style", "pointer-events: none;background-color: #eee;");
         $("#wage").prop("readonly", true);
     }
-    if ((type != 5 && checkState == 10) || (type == 5 && checkState == 8)) {
+    if ((checkState == 10) || (type == 5 && checkState == 8)) {
         var fields = $("#fields").val().split(",");
         if (fields.indexOf("wage") > -1) {
             $("#wage").removeAttr("readonly");

+ 1 - 1
public/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js

@@ -198,7 +198,7 @@ TalentAllowanceInfoDlg.initFileTypeColumn = function () {
                 var files = $("#files").val();
                 var checkState = $("#checkState").val();
                 var type = $("#type").val();
-                if (checkState == 1 || (type != 5 && checkState == 10 && files.indexOf(row.id) != -1) || (type == 5 && checkState == 8 && files.indexOf(row.id) != -1)) {
+                if (checkState == 1 || (checkState == 10 && files.indexOf(row.id) != -1) || (type == 5 && checkState == 8 && files.indexOf(row.id) != -1)) {
                     return "<button type='button' onclick=\"TalentAllowanceInfoDlg.checkFile(this,'" + value + "','" + null + "')\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
                             "<i class=\"fa fa-upload\"></i>添加" +
                             "</button>";