diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index 942ceff..6f01423 100644 --- a/lms/nladmin-system/src/main/resources/config/application.yml +++ b/lms/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index 4806ebf..8e6610a 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -537,6 +537,10 @@ export default { }) }, downloadExcel() { + if (this.crud.query.createTime) { + this.crud.query.begin_time = this.crud.query.createTime[0] + this.crud.query.end_time = this.crud.query.createTime[1] + } download('/api/workorder/downloadExcel', this.crud.query).then(res => { downloadFile(res, '生产统计', 'xlsx') crud.downloadLoading = false