|
|
@@ -166,7 +166,7 @@ export default {
|
|
|
params.startDate = this.dateRange[0];
|
|
|
params.endDate = this.dateRange[1];
|
|
|
}
|
|
|
- listCollection(this.queryParams).then(response => {
|
|
|
+ listCollection(params).then(response => {
|
|
|
this.collectionList = response.rows;
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
@@ -261,13 +261,21 @@ export default {
|
|
|
},
|
|
|
// 导出手写信息采集表
|
|
|
handleExport() {
|
|
|
+ // 构建查询参数
|
|
|
const params = { ...this.queryParams };
|
|
|
if (this.dateRange && this.dateRange.length === 2) {
|
|
|
params.startDate = this.dateRange[0];
|
|
|
params.endDate = this.dateRange[1];
|
|
|
}
|
|
|
+ // 删除分页参数
|
|
|
delete params.pageNum;
|
|
|
delete params.pageSize;
|
|
|
+ // 删除空值参数(可选,保留日期参数)
|
|
|
+ Object.keys(params).forEach(key => {
|
|
|
+ if (params[key] === null || params[key] === undefined || params[key] === '') {
|
|
|
+ delete params[key];
|
|
|
+ }
|
|
|
+ });
|
|
|
|
|
|
this.$confirm('是否确认导出当前查询条件下的所有数据?', '导出确认', {
|
|
|
confirmButtonText: '确定',
|