From 4abe2b7bf5052ff29c097bc281559653ae1b8ef4 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 28 Jul 2022 11:10:10 +0800 Subject: [PATCH 01/20] 30657 --- project/sass/apps/Announce/AppAnnounce/components/Add.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/project/sass/apps/Announce/AppAnnounce/components/Add.vue b/project/sass/apps/Announce/AppAnnounce/components/Add.vue index fbf7e11d..000eced2 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/Add.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/Add.vue @@ -81,6 +81,7 @@ :limit="9" action="/app/wxcp/upload/uploadFile" accept=".jpg,.png,.jpeg" + :on-exceed="onExceed" :http-request="v => submitUpload(v, '1')">
@@ -96,6 +97,7 @@ :limit="9" action="/app/wxcp/upload/uploadFile" accept=".mp4" + :on-exceed="onExceed" :http-request="v => submitUpload(v, '2')">
@@ -109,6 +111,7 @@ :show-file-list="false" :before-upload="v => handleChange(v, 20, '.zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt')" :limit="9" + :on-exceed="onExceed" action="/app/wxcp/upload/uploadFile" accept=".zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt" :http-request="v => submitUpload(v, '3')"> @@ -523,6 +526,10 @@ return true }, + onExceed () { + this.$message.error(`最多上传9个附件`) + }, + submitUpload (file, type) { const fileType = { '1': 'image', From 3bd3fb4950669fbb8808a48e2e1843b707108a30 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 28 Jul 2022 12:00:15 +0800 Subject: [PATCH 02/20] type --- .../Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue b/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue index fb5267ca..694139d6 100644 --- a/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue +++ b/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue @@ -262,6 +262,7 @@ this.isEffectTimeSelect = true this.dialogDate = true }else { + this.effectType = type this.getEffect() } }, @@ -327,6 +328,7 @@ this.isEffectTimeSelect = false this.dialogDate = true }else { + this.departType = type this.getDepart() } }, From b6cab0818c8a7def2a0870a84d9f1eb7e1db0b69 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 28 Jul 2022 13:43:43 +0800 Subject: [PATCH 03/20] 30643 --- .../apps/Announce/AppAnnounce/components/Add.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/project/sass/apps/Announce/AppAnnounce/components/Add.vue b/project/sass/apps/Announce/AppAnnounce/components/Add.vue index 000eced2..b82bb285 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/Add.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/Add.vue @@ -248,6 +248,7 @@ v-model="dateForm.choiceTime" type="datetime" size="small" + :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择定时发送时间"> @@ -322,7 +323,12 @@ }, girdNames: '', id: '', - tagsList: [] + tagsList: [], + pickerOptions: { + disabledDate: e => { + return e.getTime() < (Date.now() - 60 * 1000 * 60 * 24) + } + } } }, @@ -560,7 +566,11 @@ onDateForm () { this.$refs.dateForm.validate((valid) => { if (valid) { - this.confirm(1) + if (new Date(this.dateForm.choiceTime).getTime() < Date.now()) { + return this.$message.error('定时发送时间不得早于当前时间') + } else { + this.confirm(1) + } } }) }, From 471d00b47ce7a7bd178fe693966ebe6011cfdb30 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 28 Jul 2022 13:46:02 +0800 Subject: [PATCH 04/20] 30663 --- .../sass/apps/Announce/AppAnnounce/components/Detail.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue index a9211a3d..da32ef14 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue @@ -180,9 +180,9 @@