From e81a2c2a3d3d8209e0dabde1e18fbe64b52d9144 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Mon, 23 Mar 2020 10:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=AE=E9=A1=B6bug=20+=20=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=98=BE=E7=A4=BA=E5=85=A8=E9=83=A8=20+=20?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=B5=8F=E8=A7=88=E9=87=8F=E7=82=B9=E8=B5=9E?= =?UTF-8?q?=E7=82=B9=E8=B8=A9=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/master/masternotice.vue | 13 +++++++------ src/views/modules/master/mastertopic.vue | 13 +++++++------ src/views/modules/master/mastertopiccomment.vue | 12 ++++++------ .../modules/master/mastertopicuserattitude.vue | 12 ++++++------ src/views/modules/master/mastertopicuserbrowse.vue | 12 ++++++------ 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/views/modules/master/masternotice.vue b/src/views/modules/master/masternotice.vue index 450b0aa6..15ce6335 100755 --- a/src/views/modules/master/masternotice.vue +++ b/src/views/modules/master/masternotice.vue @@ -50,7 +50,7 @@ {{scope.$index+1}} - + @@ -222,15 +222,16 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg) } + this.toTopDialog = false + this.cancelToTopDialog = false + this.closeDialog = false + this.toGrey = false + this.getDataList() this.$message({ type: 'success', message: '修改成功!', onClose: () => { - this.toTopDialog = false - this.cancelToTopDialog = false - this.closeDialog = false - this.toGrey = false - this.getDataList() + } }) }) diff --git a/src/views/modules/master/mastertopic.vue b/src/views/modules/master/mastertopic.vue index 0a9425b1..b9a9d95a 100755 --- a/src/views/modules/master/mastertopic.vue +++ b/src/views/modules/master/mastertopic.vue @@ -63,7 +63,7 @@ {{scope.$index+1}} - + @@ -241,15 +241,16 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg) } + this.toTopDialog = false + this.cancelToTopDialog = false + this.closeDialog = false + this.toGrey = false + this.getDataList() this.$message({ type: 'success', message: '修改成功!', onClose: () => { - this.toTopDialog = false - this.cancelToTopDialog = false - this.closeDialog = false - this.toGrey = false - this.getDataList() + } }) }) diff --git a/src/views/modules/master/mastertopiccomment.vue b/src/views/modules/master/mastertopiccomment.vue index 801445fc..d8916197 100755 --- a/src/views/modules/master/mastertopiccomment.vue +++ b/src/views/modules/master/mastertopiccomment.vue @@ -81,18 +81,18 @@ export default { id: '' }, pickerBeginDateBefore: { - disabledDate: time => { - let beginDateVal = this.dataForm.startTime + disabledDate: (time) => { + let beginDateVal = this.dataForm.endTime if (beginDateVal) { - return time.getTime() > new Date(beginDateVal).getTime() + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } } }, pickerBeginDateAfter: { - disabledDate: time => { - let EndDateVal = this.dataForm.endTime + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime if (EndDateVal) { - return time.getTime() < new Date(EndDateVal).getTime() + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } } diff --git a/src/views/modules/master/mastertopicuserattitude.vue b/src/views/modules/master/mastertopicuserattitude.vue index 201ed504..24c68b21 100755 --- a/src/views/modules/master/mastertopicuserattitude.vue +++ b/src/views/modules/master/mastertopicuserattitude.vue @@ -80,18 +80,18 @@ export default { flag: '' }, pickerBeginDateBefore: { - disabledDate: time => { - let beginDateVal = this.dataForm.startTime + disabledDate: (time) => { + let beginDateVal = this.dataForm.endTime if (beginDateVal) { - return time.getTime() > new Date(beginDateVal).getTime() + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } } }, pickerBeginDateAfter: { - disabledDate: time => { - let EndDateVal = this.dataForm.endTime + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime if (EndDateVal) { - return time.getTime() < new Date(EndDateVal).getTime() + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } } diff --git a/src/views/modules/master/mastertopicuserbrowse.vue b/src/views/modules/master/mastertopicuserbrowse.vue index 3ab1430c..ea51e813 100755 --- a/src/views/modules/master/mastertopicuserbrowse.vue +++ b/src/views/modules/master/mastertopicuserbrowse.vue @@ -77,18 +77,18 @@ export default { id: '' }, pickerBeginDateBefore: { - disabledDate: time => { - let beginDateVal = this.dataForm.startTime + disabledDate: (time) => { + let beginDateVal = this.dataForm.endTime if (beginDateVal) { - return time.getTime() > new Date(beginDateVal).getTime() + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } } }, pickerBeginDateAfter: { - disabledDate: time => { - let EndDateVal = this.dataForm.endTime + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime if (EndDateVal) { - return time.getTime() < new Date(EndDateVal).getTime() + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } }