From 02177e655c5133e1b811a261ba75d38879713415 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Tue, 5 Jun 2018 17:55:38 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=AA=E6=9C=89=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=85=A8=E9=83=A8=E4=B8=BA=E6=9C=AA=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=9A=84=E9=85=8D=E7=BD=AE=E5=8F=AF=E4=BB=A5=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E3=80=81=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=9C=AA=E9=80=9A=E8=BF=87=E3=80=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2、只有选中配置全部为未审核的配置，才可批量审核通过 Signed-off-by: zhangwei --- .../messages/message_zh_CN.properties | 5 ++- src/main/webapp/WEB-INF/tags/sys/delRow.tag | 36 +++++++++++++++---- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 0236c2dbc..5f4827eac 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -581,7 +581,7 @@ ingress=\u51FA\u53E3\u65B9\u5411 degress=\u5165\u53E3\u65B9\u5411 fileTransfer_control=\u6587\u4EF6\u4F20\u8F93\u914D\u7F6E mail_hdr=\u90AE\u4EF6\u5934\u57DF\u914D\u7F6E -mail_body=\u6587\u4EF6\u5185\u5BB9\u914D\u7F6E +mail_body=\u90AE\u4EF6\u5185\u5BB9\u914D\u7F6E mail_file_digest=\u90AE\u4EF6\u6587\u4EF6\u6458\u8981\u914D\u7F6E ftp_url=ftp\u5730\u5740\u914D\u7F6E ftp_content=ftp\u5185\u5BB9\u914D\u7F6E @@ -589,3 +589,6 @@ mail_ip=\u90AE\u4EF6IP\u914D\u7F6E ftp_ip=FTP IP\u914D\u7F6E dns_ip=DNS IP\u914D\u7F6E dns_domain=DNS\u57DF\u540D\u914D\u7F6E +has_prohibit_delete=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u5220\u9664 +has_prohibit_nopass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u672A\u901A\u8FC7\u5BA1\u6838 +has_prohibit_pass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u4EE5\u5BA1\u6838\u901A\u8FC7 diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index 545824f2f..00b7c64e3 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -40,8 +40,8 @@ function del(url){ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox"); if($(checkboxes).filter(":checked").length>0){ - if(validatePass(checkboxes)){ - top.$.jBox.tip("", ""); + if(validateAllNoAudit(checkboxes)){ + top.$.jBox.tip("", ""); return; }else{ doAll(checkboxes,url); @@ -74,8 +74,8 @@ function passOpt(url){ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox"); if($(checkboxes).filter(":checked").length>0){ - if(validatePass(checkboxes)){ - top.$.jBox.tip("", ""); + if(validateAllNoAudit(checkboxes)){ + top.$.jBox.tip("", ""); return; }else{ doAll(checkboxes,url); @@ -90,8 +90,8 @@ function noPassOpt(url){ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox"); if($(checkboxes).filter(":checked").length>0){ - if(validatePass(checkboxes)){ - top.$.jBox.tip("", ""); + if(validateAllNoAudit(checkboxes)){ + top.$.jBox.tip("", ""); return; }else{ doAll(checkboxes,url); @@ -106,7 +106,7 @@ function cancelPassOpt(url){ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox"); if($(checkboxes).filter(":checked").length>0){ - if(validatePass(checkboxes)){ + if(validateAllPass(checkboxes)){ doAll(checkboxes,url); }else{ top.$.jBox.tip("", ""); @@ -157,6 +157,17 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox"); top.$('.jbox-body .jbox-icon').css('top','55px'); } + //验证选择的配置，是否可删除或者审核未通过或者审核通过,只有未审核的配置可删除或审核未通过或审核通过 + function validateAllNoAudit(checkboxes){ + var flag = false; + $(checkboxes).filter(":checked").each(function(){ + if($(this).val()!=0){ + flag = true; + return; + } + }); + return flag; + } //验证选择的配置，是否有审核通过的 function validatePass(checkboxes){ var flag = false; @@ -168,4 +179,15 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox"); }); return flag; } + //验证选择的配置，是否全部为审核通过的 + function validateAllPass(checkboxes){ + var flag = true; + $(checkboxes).filter(":checked").each(function(){ + if($(this).val()!=1){ + flag = false; + return; + } + }); + return flag; + } \ No newline at end of file