|
@@ -399,6 +399,7 @@ function unique( arr ){
|
|
}
|
|
}
|
|
//携带当前检索跳转数据导出支付页面
|
|
//携带当前检索跳转数据导出支付页面
|
|
function toPaydataExport(){
|
|
function toPaydataExport(){
|
|
|
|
+ var isOpenNewTab = true
|
|
if(!loginflag){
|
|
if(!loginflag){
|
|
unseatflag = true;
|
|
unseatflag = true;
|
|
$(".code-text").html('<span style="font-size:22px;margin-top:10px;display:inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
|
|
$(".code-text").html('<span style="font-size:22px;margin-top:10px;display:inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
|
|
@@ -423,7 +424,9 @@ function toPaydataExport(){
|
|
}
|
|
}
|
|
}
|
|
}
|
|
})
|
|
})
|
|
- window.history.replaceState(null, null, window.location.pathname+"?goback"+new Date().getTime());
|
|
|
|
|
|
+ if (!isOpenNewTab) {
|
|
|
|
+ window.history.replaceState(null, null, window.location.pathname+"?goback"+new Date().getTime());
|
|
|
|
+ }
|
|
//$("#zbSeatchT").attr("action","/front/dataExport/superSearchExport?selectIds=" + selectIds);
|
|
//$("#zbSeatchT").attr("action","/front/dataExport/superSearchExport?selectIds=" + selectIds);
|
|
var tmpInput= $("<input type='hidden' name='selectIds'/>");
|
|
var tmpInput= $("<input type='hidden' name='selectIds'/>");
|
|
// 点击数据导出,先调用分页的函数,让selectDataIds为最新的数据
|
|
// 点击数据导出,先调用分页的函数,让selectDataIds为最新的数据
|
|
@@ -440,19 +443,21 @@ function toPaydataExport(){
|
|
// if(ipt.length != 0) {
|
|
// if(ipt.length != 0) {
|
|
// $('#zbSeatchT input[name="selectIds"]').attr('name', '')
|
|
// $('#zbSeatchT input[name="selectIds"]').attr('name', '')
|
|
// }
|
|
// }
|
|
- var params = $("#zbSeatchT").serialize();
|
|
|
|
- var $form = jsCreateFrom(params)
|
|
|
|
- $form.attr('target', "_parent")
|
|
|
|
|
|
+ var params = $("#zbSeatchT").serialize();
|
|
|
|
+ var $form = jsCreateFrom(params)
|
|
|
|
+ $form.attr('target', "_blank")
|
|
$form.attr("action","/front/dataExport/superSearchExport").append(tmpInput);
|
|
$form.attr("action","/front/dataExport/superSearchExport").append(tmpInput);
|
|
- if (goTemplateData.inIframe) {
|
|
|
|
- window.$BRACE.methods.open({
|
|
|
|
- route: {
|
|
|
|
- link: window.location.pathname+"?goback"+new Date().getTime(),
|
|
|
|
- appType: 'iframe'
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
|
|
+ if (!isOpenNewTab) {
|
|
|
|
+ if (goTemplateData.inIframe) {
|
|
|
|
+ window.$BRACE.methods.open({
|
|
|
|
+ route: {
|
|
|
|
+ link: window.location.pathname+"?goback"+new Date().getTime(),
|
|
|
|
+ appType: 'iframe'
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- $form.submit();
|
|
|
|
|
|
+ $form.submit();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|