|
|
@@ -752,24 +752,24 @@ export default {
|
|
|
|
|
|
var isSimpleQuery = _self.$refs.queryCondition.isSimpleQuery();
|
|
|
if(isSimpleQuery){
|
|
|
- var condition = _self.$refs.queryCondition.getQueryCondition();
|
|
|
- var downloadUrl = Common.getApiURL('exportResource/exportInfoDataSimple') + '?infoWindowNo=' + _self.infoWindowDto.no
|
|
|
+ let condition = _self.$refs.queryCondition.getQueryCondition();
|
|
|
+ let downloadUrl = Common.getApiURL('exportResource/exportInfoDataSimple') + '?infoWindowNo=' + _self.infoWindowDto.no
|
|
|
+ '&recordIds=' + _self.getSelectedRecordIds().join(',')
|
|
|
+ '&infoFilterFieldValues=' + _self.uuid
|
|
|
+ '&condition=' + condition;
|
|
|
- var timeStr = moment().format('_YYYYMMDD_hhmmss');
|
|
|
- var fileName = (_self.infoWindowDto == null ? '导出数据' + timeStr + '.xls' : _self.infoWindowDto.name + timeStr + '.xls');
|
|
|
+ let timeStr = moment().format('_YYYYMMDD_hhmmss');
|
|
|
+ let fileName = (_self.infoWindowDto == null ? '导出数据' + timeStr + '.xls' : _self.infoWindowDto.name + timeStr + '.xls');
|
|
|
DownloadService.downloadFile(downloadUrl, fileName);
|
|
|
}else{
|
|
|
- var infoFilterFieldValues = _self.$refs.queryCondition.getQueryCondition();
|
|
|
- var infoFilterFieldValueStrs = JSON.stringify(infoFilterFieldValues);
|
|
|
- var downloadUrl = Common.getApiURL('exportResource/exportInfoDataComplex') + '?infoWindowNo=' + _self.infoWindowDto.no
|
|
|
+ let infoFilterFieldValues = _self.$refs.queryCondition.getQueryCondition();
|
|
|
+ let infoFilterFieldValueStrs = JSON.stringify(infoFilterFieldValues);
|
|
|
+ let downloadUrl = Common.getApiURL('exportResource/exportInfoDataComplex') + '?infoWindowNo=' + _self.infoWindowDto.no
|
|
|
+ '&recordIds=' + _self.getSelectedRecordIds().join(',')
|
|
|
+ '&infoFilterFieldValues=' + _self.uuid;
|
|
|
|
|
|
|
|
|
- var timeStr = moment().format('_YYYYMMDD_hhmmss');
|
|
|
- var fileName = (_self.infoWindowDto == null ? '导出数据' + timeStr + '.xls' : _self.infoWindowDto.name + timeStr + '.xls');
|
|
|
+ let timeStr = moment().format('_YYYYMMDD_hhmmss');
|
|
|
+ let fileName = (_self.infoWindowDto == null ? '导出数据' + timeStr + '.xls' : _self.infoWindowDto.name + timeStr + '.xls');
|
|
|
let userStorageDtos = [
|
|
|
{
|
|
|
key: _self.uuid,
|
|
|
@@ -782,9 +782,7 @@ export default {
|
|
|
}, errorData => {
|
|
|
Common.processException(errorData);
|
|
|
});
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
|