From c78edb4d5092dabbfdff7c1111049a8fffa0756d Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Tue, 15 Jan 2019 10:33:38 +0600
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=AF=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=AE=A1=E6=A0=B8=E7=9A=84=E9=85=8D=E7=BD=AE=E5=8F=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=8E=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=A1=E6=A0=B8=EF=BC=88is=5Fvalid=3D0,is=5Faudit?=
 =?UTF-8?q?=3D0)=E2=80=9D=202.=E5=8F=96=E6=B6=88=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E5=8F=AF=E5=88=A0=E9=99=A4=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=E9=85=8D=E7=BD=AE=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=EF=BC=8Cis=5Fvalid=3D-1,is=5Faudit=3D3(=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E9=85=8D=E7=BD=AE=E6=9B=BE=E7=BB=8F=E7=94=9F=E6=95=88?=
 =?UTF-8?q?-=E3=80=8B=E5=8F=96=E6=B6=88=E5=AE=A1=E6=A0=B8-=E3=80=8B?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/tags/sys/delRow.tag | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index 6fc9eff80..3f753d8cf 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -67,7 +67,7 @@ function del(url){
 	var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 	
 	if($(checkboxes).filter(":checked").length>0){
-		if(validateAllNoAudit(checkboxes)){
+		if(validateIsDelete(checkboxes)){
 			top.$.jBox.tip("<spring:message code='has_prohibit_delete'/>", "<spring:message code='info'/>");
 			return;
 		}else{
@@ -114,8 +114,8 @@ function update(url){
 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
 			return;
 		}else if(cked.val()==3){
-			top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
-			return;
+			/* top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
+			return; */
 		}
 		//处理asnIp,asn组下发过的ip配置不允许修改
 		if(cked.attr("asnGroup")&&cked.attr("isValid")){
@@ -370,6 +370,7 @@ function cancelPassOpt(url){
 	function validateAllNoAudit(checkboxes){
 		var flag = false;
 		$(checkboxes).filter(":checked").each(function(){
+			alert($(this).val());
 			if($(this).val()!=0){
 				flag = true;
 				return;
@@ -377,6 +378,18 @@ function cancelPassOpt(url){
 		});
 		return flag;
 	}
+	//验证是否可删除
+	function validateIsDelete(checkboxes){
+		var flag = false;
+		$(checkboxes).filter(":checked").each(function(){
+			alert($(this).val());
+			if($(this).val()!=0 && $(this).val()!=3){//状态为3的配置为取消审核的配置，可删除
+				flag = true;
+				return;
+			}		 	
+		});
+		return flag;
+	}
 	//验证选择的配置，是否有审核通过的
 	function validatePass(checkboxes){
 		var flag = false;