diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue index 028626bd..e662e229 100644 --- a/klp-ui/src/views/wms/report/receive.vue +++ b/klp-ui/src/views/wms/report/receive.vue @@ -243,15 +243,11 @@ export default { coilIds() { return this.list.map(item => item.coilId).join(',') }, - actionIds() { - const ids = this.list.map(item => item.actionId).filter(id => id) - return ids.length ? ids.join(',') : '' - }, exportIdParams() { - return this.actionIds ? { actionIds: this.actionIds } : { coilIds: this.coilIds } + return { coilIds: this.coilIds } }, hasExportData() { - return !!(this.coilIds || this.actionIds) + return !!this.coilIds }, exportQueryParams() { const { pageNum, pageSize, ...filters } = this.queryParams diff --git a/klp-ui/src/views/wms/report/template/action.vue b/klp-ui/src/views/wms/report/template/action.vue index ae699b49..f5a091b3 100644 --- a/klp-ui/src/views/wms/report/template/action.vue +++ b/klp-ui/src/views/wms/report/template/action.vue @@ -970,12 +970,10 @@ export default { handleCustomExport(orderedColumns) { const { pageNum, pageSize, startTime, endTime, ...filters } = this.queryParams const type = this.customExportType - const ids = type === 'loss' - ? { actionIds: this.actionIds } - : { coilIds: this.outList.map(item => item.coilId).join(',') } + const list = type === 'loss' ? this.lossList : this.outList this.download('wms/materialCoil/exportCustomOrdered', { ...filters, - ...ids, + coilIds: list.map(item => item.coilId).join(','), columnsOrdered: orderedColumns.join(','), }, `materialCoil_${new Date().getTime()}.xlsx`) },