From 95b4537e0d17d465a0e13fcf28cd18bcbe638eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Fri, 16 Jun 2023 17:33:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=AF=BC=E5=87=BA=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-system/src/main/resources/config/application.yml | 2 +- lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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