修正导出条件逻辑判断

This commit is contained in:
wangwei
2019-04-23 19:00:07 +08:00
parent 47771e57e7
commit 40e166510c

View File

@@ -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]);