diff --git a/mes/qd/src/views/wms/pa/workloadstat/index.vue b/mes/qd/src/views/wms/pa/workloadstat/index.vue index ddb889fb..23b92aca 100644 --- a/mes/qd/src/views/wms/pa/workloadstat/index.vue +++ b/mes/qd/src/views/wms/pa/workloadstat/index.vue @@ -97,7 +97,7 @@ export default { add: false, edit: false, del: false, - download: true, + download: false, reset: true } }) @@ -121,12 +121,21 @@ export default { return true }, downdtl() { + debugger if (this.currentRow !== null) { crud.downloadLoading = true - const data = { - 'begin_time': this.crud.query.createTime[0], - 'end_time': this.crud.query.createTime[1], - 'assessor_id': this.crud.query.assessor_id + debugger + var data = {} + if (this.crud.query.createTime !== undefined) { + data = { + 'begin_time': this.crud.query.createTime[0], + 'end_time': this.crud.query.createTime[1], + 'assessor_id': this.crud.query.assessor_id + } + } else { + data = { + 'assessor_id': this.crud.query.assessor_id + } } download('/api/performancemst/download', data).then(result => { downloadFile(result, '工作量统计', 'xlsx') diff --git a/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue b/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue index 26e02660..6e77e153 100644 --- a/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue @@ -131,7 +131,7 @@ export default { add: false, edit: false, del: false, - download: true, + download: false, reset: true } }) @@ -158,12 +158,21 @@ export default { downdtl() { if (this.currentRow !== null) { crud.downloadLoading = true - const data = { - 'begin_time': this.crud.query.createTime[0], - 'end_time': this.crud.query.createTime[1], - 'status': this.crud.query.status, - 'pcsn': this.crud.query.pcsn, - 'material_code': this.crud.query.material_code + var data = {} + if (this.crud.query.createTime !== undefined) { + data = { + 'begin_time': this.crud.query.createTime[0], + 'end_time': this.crud.query.createTime[1], + 'status': this.crud.query.status, + 'pcsn': this.crud.query.pcsn, + 'material_code': this.crud.query.material_code + } + } else { + data = { + 'status': this.crud.query.status, + 'pcsn': this.crud.query.pcsn, + 'material_code': this.crud.query.material_code + } } download('/api/powderOrderQuery/download', data).then(result => { downloadFile(result, '粉料开单记录', 'xlsx')