From 80ba51970ec9e45eab279b86f47a0c5752c06d79 Mon Sep 17 00:00:00 2001 From: xuesinan <1404152492@qq.com> Date: Fri, 21 Jan 2022 10:19:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E5=88=9D=E6=AC=A1?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E4=B8=8D=E9=80=89=E6=8B=A9=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=BA=BA=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E5=91=A8=E6=80=BB?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/List/List.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/List/List.vue b/src/components/List/List.vue index fb67eb4..7cd7cc2 100644 --- a/src/components/List/List.vue +++ b/src/components/List/List.vue @@ -377,6 +377,7 @@ export default { checkTime(listIndex, index, clockType, id, memberId, checkerId, clockTime) { this.auditOptions = { id, clockType }; + this.checkerId = checkerId; this.showModal(); const time = Date.now(); const selectTime = this.$moment(time).format('HH:mm'); From 838cab15a681319766d688b2d8b1770d5df4e3d0 Mon Sep 17 00:00:00 2001 From: xuesinan <1404152492@qq.com> Date: Fri, 21 Jan 2022 10:59:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=AD=89=E4=BA=8E=E7=BB=93=E6=9D=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=9F=A5=E4=B8=8D=E5=88=B0=E5=80=BC=E5=BE=97=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/List/List.vue | 1 + src/components/TimePicker/TimePicker.vue | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/List/List.vue b/src/components/List/List.vue index 7cd7cc2..5a962b2 100644 --- a/src/components/List/List.vue +++ b/src/components/List/List.vue @@ -321,6 +321,7 @@ export default { async setParams() { const { projectId, startTime, endTime, memberIdList, roleId } = this; + console.log('111111111', startTime, endTime); const params = { param: { projectId, memberIdList, startTime, endTime, roleId } }; await this.getClockQuery(params); }, diff --git a/src/components/TimePicker/TimePicker.vue b/src/components/TimePicker/TimePicker.vue index e2bbfb4..421ea4c 100644 --- a/src/components/TimePicker/TimePicker.vue +++ b/src/components/TimePicker/TimePicker.vue @@ -97,16 +97,20 @@ export default { // 昨天 setYesterday(open) { const day = this.$moment(new Date().getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD'); - this.startValue = day; - this.endValue = day; + // this.startValue = day; + // this.endValue = day; + this.setStartTime(this.$moment(`${day} 00:00`).format('x') - 0); + this.setEndTime(this.$moment(`${day} 23:59`).format('x') - 0); this[open] = false; }, // 今天 setToday(open) { const today = this.$moment(new Date()).format('YYYY-MM-DD'); - this.startValue = today; - this.endValue = today; + // this.startValue = today; + // this.endValue = today; + this.setStartTime(this.$moment(`${today} 00:00`).format('x') - 0); + this.setEndTime(this.$moment(`${today} 23:59`).format('x') - 0); this[open] = false; }, From 49457b1c5c335aad97ab1f6ed41af7f1235dd6bf Mon Sep 17 00:00:00 2001 From: xuesinan <1404152492@qq.com> Date: Fri, 21 Jan 2022 11:02:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/List/List.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/List/List.vue b/src/components/List/List.vue index 5a962b2..7cd7cc2 100644 --- a/src/components/List/List.vue +++ b/src/components/List/List.vue @@ -321,7 +321,6 @@ export default { async setParams() { const { projectId, startTime, endTime, memberIdList, roleId } = this; - console.log('111111111', startTime, endTime); const params = { param: { projectId, memberIdList, startTime, endTime, roleId } }; await this.getClockQuery(params); },