From e93bce47310415c2e6eff1b5dd5bed377409a7ba Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Mon, 29 Mar 2021 18:40:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E7=B2=89=E7=BB=9F=E8=AE=A1=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/domain/SysWxFanStatistics.java | 8 ++++++ .../custom/SysWxFanStatisticsMapper.xml | 8 ++++-- .../src/views/custom/fanStatistics/index.vue | 28 +++++++++++++------ 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java index 47df2784e..d17e4589f 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java @@ -63,4 +63,12 @@ public class SysWxFanStatistics extends BaseEntity //排序参数,null或者0:按照id倒序 1:按照组别ID、id顺序正序 private Integer sortFlag; + + //进粉开始时间 + @JsonFormat(pattern = "yyyy-MM-dd") + private Date fanStartTime; + + //进粉结束时间 + @JsonFormat(pattern = "yyyy-MM-dd") + private Date fanEndTime; } \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml index ad26d163d..9da13cc5c 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml @@ -42,7 +42,9 @@ diff --git a/stdiet-ui/src/views/custom/fanStatistics/index.vue b/stdiet-ui/src/views/custom/fanStatistics/index.vue index ac8804594..74f1a9497 100644 --- a/stdiet-ui/src/views/custom/fanStatistics/index.vue +++ b/stdiet-ui/src/views/custom/fanStatistics/index.vue @@ -8,14 +8,17 @@ label-width="68px" > + + v-model="fanTimeScope" + type="daterange" + range-separator="至" + start-placeholder="进粉开始日期" + end-placeholder="进粉结束日期" + format="yyyy-MM-dd" + value-format="yyyy-MM-dd" + :picker-options="fanTimePickerOptions" + > @@ -188,6 +191,7 @@ type="date" value-format="yyyy-MM-dd" placeholder="选择日期" + :picker-options="fanTimePickerOptions" > @@ -318,7 +322,6 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - fanTime: nowDate, userId: null, accountId: null, }, @@ -343,6 +346,12 @@ export default { { required: true, trigger: "blur", message: "请输入进粉数量" }, ], }, + fanTimeScope: [nowDate, nowDate], + fanTimePickerOptions: { + disabledDate(time) { + return time.getTime() > dayjs() + }, + } }; }, created() { @@ -361,6 +370,8 @@ export default { /** 查询进粉统计列表 */ getList() { this.loading = true; + this.queryParams.fanStartTime = this.fanTimeScope && this.fanTimeScope.length > 0 ? this.fanTimeScope[0] : null; + this.queryParams.fanEndTime = this.fanTimeScope && this.fanTimeScope.length > 0 ? this.fanTimeScope[1] : null; listFanStatistics(this.queryParams).then((response) => { this.fanStatisticsList = response.rows; this.totalFanNum = 0; @@ -394,6 +405,7 @@ export default { }; this.wxList = []; this.showWxFlag = false; + this.fanTimeScope = [nowDate,nowDate]; this.resetForm("form"); }, editFormReset() {