Commit b57c0cf7d7cc19bb761d8bab64abbec3ebd930a8
1 parent
9ca70c2c
update
Showing
2 changed files
with
6 additions
and
1 deletions
src/main/resources/static/pages/forms/statement/waybill.html
| @@ -332,9 +332,11 @@ | @@ -332,9 +332,11 @@ | ||
| 332 | if(params.length < 1){ | 332 | if(params.length < 1){ |
| 333 | return; | 333 | return; |
| 334 | } | 334 | } |
| 335 | + var i = layer.load(2); | ||
| 335 | $get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){ | 336 | $get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){ |
| 336 | var fileName=date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单"; | 337 | var fileName=date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单"; |
| 337 | window.open("/downloadFile/download?fileName="+encodeURIComponent(fileName)); | 338 | window.open("/downloadFile/download?fileName="+encodeURIComponent(fileName)); |
| 339 | + layer.close(i); | ||
| 338 | }); | 340 | }); |
| 339 | }); | 341 | }); |
| 340 | 342 | ||
| @@ -345,6 +347,7 @@ | @@ -345,6 +347,7 @@ | ||
| 345 | $("#exportMore").on("click",function(){ | 347 | $("#exportMore").on("click",function(){ |
| 346 | if($("#info tbody tr td").length <= 1) | 348 | if($("#info tbody tr td").length <= 1) |
| 347 | return; | 349 | return; |
| 350 | + var i = layer.load(2); | ||
| 348 | var param = new Array(); | 351 | var param = new Array(); |
| 349 | $("#info tbody tr").each(function(index){ | 352 | $("#info tbody tr").each(function(index){ |
| 350 | param[index] = new Array(); | 353 | param[index] = new Array(); |
| @@ -361,6 +364,7 @@ | @@ -361,6 +364,7 @@ | ||
| 361 | $get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){ | 364 | $get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){ |
| 362 | // window.open("/downloadFile/downloadList?fileName="+result.fileName); //下载压缩包 | 365 | // window.open("/downloadFile/downloadList?fileName="+result.fileName); //下载压缩包 |
| 363 | window.open("/downloadFile/download?fileName="+result.fileName); | 366 | window.open("/downloadFile/download?fileName="+result.fileName); |
| 367 | + layer.close(i); | ||
| 364 | }); | 368 | }); |
| 365 | }); | 369 | }); |
| 366 | 370 |
src/main/resources/static/pages/forms/statement/waybillBf.html
| @@ -328,7 +328,8 @@ | @@ -328,7 +328,8 @@ | ||
| 328 | }); | 328 | }); |
| 329 | }); | 329 | }); |
| 330 | $post('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){ | 330 | $post('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){ |
| 331 | - window.open("/downloadFile/downloadList?fileName="+result.fileName); | 331 | +// window.open("/downloadFile/downloadList?fileName="+result.fileName); //下载压缩包 |
| 332 | + window.open("/downloadFile/download?fileName="+result.fileName); | ||
| 332 | }); | 333 | }); |
| 333 | }); | 334 | }); |
| 334 | 335 |