From 40e166510c7d665d2d1335305d71cbb40652a681 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Tue, 23 Apr 2019 19:00:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=AF=BC=E5=87=BA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E9=80=BB=E8=BE=91=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/tags/sys/delRow.tag | 24 +++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index cebd58702..c45ed8429 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -448,7 +448,7 @@ function doAll(checkboxes,url){
 					// 无来函选项的取消审核操作
 					top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
 						
-						if(v=="ok"){
+						if(v=="ok"){						
 							if(url.indexOf("?")>0){
 								window.location = url+"&ids="+ids+"&compileIds="+compileIds;
 							}else{
@@ -471,12 +471,14 @@ function doAll(checkboxes,url){
 			
 			if(v=="ok"){					
 				if(url.indexOf("?")>0){
-					//window.location = url+"&ids="+ids+"&compileIds="+compileIds;
-					url = url+"&ids="+ids+"&compileIds="+compileIds;
-					exportXmlRequest(url);					
+					if(url.indexOf("isValid") < 0){
+						url = url+"&ids="+ids+"&compileIds="+compileIds;
+						exportXmlRequest(url);
+					}else{
+						window.location = url+"&ids="+ids+"&compileIds="+compileIds;
+					}										
 				}else{
-					window.location = url+"?ids="+ids+"&compileIds="+compileIds;
-					exportXmlRequest(url);
+					window.location = url+"?ids="+ids+"&compileIds="+compileIds;		
 				}
 				if(url.indexOf("?isAudit") > 1){
 					loading('<spring:message code="onloading"/>');
@@ -588,7 +590,7 @@ function exportData(url,maxRow,searchUrl,exType){
 						if(v=="ok"){
 							if($("#intype").val() != null && $("#intype").val() != ""){
 					    		$("#intype").attr("name",$("#seltype").val());
-					    	}
+					    	}							
 							exportXmlRequest(url);
 						}
 					},{buttonsFocus:1});
@@ -596,7 +598,7 @@ function exportData(url,maxRow,searchUrl,exType){
 				}else{						
 		            if($("#intype").val() != null && $("#intype").val() != ""){
 		        		$("#intype").attr("name",$("#seltype").val());
-		        	}
+		        	}		
 		            exportXmlRequest(url);
 		    }
 		}else{
@@ -612,9 +614,9 @@ function exportXmlRequest(url){
     xmlResquest.responseType = "blob";
     xmlResquest.onload = function (oEvent) {
     	var contDisp = xmlResquest.getResponseHeader("content-disposition");		    
-    	var fileName = contDisp.substring(contDisp.indexOf("=")+1,contDisp.length).replace(/\"/g,"");	    		    	
-        var content = xmlResquest.response;	        
-        var elink = document.createElement('a');
+    	var fileName = contDisp.substring(contDisp.indexOf("=")+1,contDisp.length).replace(/\"/g,"");    	
+        var content = xmlResquest.response;
+        var elink = document.createElement('a');       
         elink.download = fileName;
         elink.style.display = 'none';
         var blob = new Blob([content]);