From 52424f39a56cbc1bb1a8fa6de6df8e4e5abfaa02 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 29 May 2020 15:50:07 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=B0=E9=97=BB=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=20=E5=8F=AF?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E3=80=90=E6=89=80=E9=80=89=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E3=80=91=EF=BC=9A=E9=80=BB=E8=BE=91=EF=BC=8C=E5=85=88=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=90=8E=E6=96=B0=E5=A2=9E=20=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/news/news-add-or-update.vue | 41 ++----------------- src/views/modules/news/news-publish.vue | 39 ------------------ src/views/modules/news/news.vue | 2 +- 3 files changed, 5 insertions(+), 77 deletions(-) diff --git a/src/views/modules/news/news-add-or-update.vue b/src/views/modules/news/news-add-or-update.vue index 429552a..911956b 100644 --- a/src/views/modules/news/news-add-or-update.vue +++ b/src/views/modules/news/news-add-or-update.vue @@ -11,43 +11,10 @@ + :props="{ multiple: true }" + clearable + collapse-tags> - { if (res.code !== 0) { return this.$message.error(res.msg) diff --git a/src/views/modules/news/news-publish.vue b/src/views/modules/news/news-publish.vue index efe3c86..c1a9fa2 100644 --- a/src/views/modules/news/news-publish.vue +++ b/src/views/modules/news/news-publish.vue @@ -15,40 +15,6 @@ clearable collapse-tags> - { if (res.code !== 0) { return this.$message.error(res.msg) From 720e4b4bb753181b60cd784add972b7f6b700c0d Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 2 Jun 2020 15:49:00 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85banner=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=A2=9E=E5=8A=A0banner=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/heart/actbanner-add-or-update.vue | 24 +++++++++++++++++++ src/views/modules/heart/actbanner.vue | 24 +++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/src/views/modules/heart/actbanner-add-or-update.vue b/src/views/modules/heart/actbanner-add-or-update.vue index 9679082..42b5293 100644 --- a/src/views/modules/heart/actbanner-add-or-update.vue +++ b/src/views/modules/heart/actbanner-add-or-update.vue @@ -23,6 +23,16 @@ class="el-upload__tip">只能上传jpg/png文件，且不超过500kb + + + + + + @@ -62,6 +72,7 @@ export default { updatedTime: '', sort: 0 }, + optionBannerType: [], // 图片 loading: false, uploadUrl: '' @@ -76,6 +87,9 @@ export default { bannerImg: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ], + bannerType: [ + { required: true, message: this.$t('validate.required'), trigger: 'blur' } + ], sort: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ] @@ -83,6 +97,7 @@ export default { } }, created () { + this.getListBannerTypeByHeartImgType() this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}` this.dataForm.bannerImg = '' }, @@ -96,6 +111,15 @@ export default { } }) }, + // 获取banner下拉类型 + getListBannerTypeByHeartImgType () { + this.$http.get(`/heart/actbanner/getBannerType/volunteerBannerType`).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.optionBannerType = res.data + }).catch(() => {}) + }, // 获取信息 getInfo () { this.$http.get(`/heart/actbanner/${this.dataForm.id}`).then(({ data: res }) => { diff --git a/src/views/modules/heart/actbanner.vue b/src/views/modules/heart/actbanner.vue index 3a59bc0..52e551d 100644 --- a/src/views/modules/heart/actbanner.vue +++ b/src/views/modules/heart/actbanner.vue @@ -18,6 +18,7 @@ + @@ -77,7 +79,7 @@ - + @@ -89,6 +91,7 @@ import ActinfoDetailView from './actinfo-detail-view' import ActUserRelation from './actuserrelation' import ActinfoCancel from './actinfo-cancel' import ActUserClockLog from './actuserclocklog' +import ActinfoPull from './actinfo-pull' export default { mixins: [mixinViewModule], name: 'ActInfoList', @@ -108,6 +111,7 @@ export default { actUserRelationVisible: false, actInfoCancelVisible: false, actUserClockLogVisible: false, + actinfoPullVisible: false, pickerBeginDateBefore: { disabledDate: (time) => { let beginDateVal = this.dataForm.startTime @@ -131,7 +135,8 @@ export default { ActinfoDetailView, ActUserRelation, ActinfoCancel, - ActUserClockLog + ActUserClockLog, + ActinfoPull }, created: function () { this.getDataList() @@ -172,6 +177,13 @@ export default { this.$refs.actinfoCancel.init() }) } + }, + pullHandle (row) { + this.actinfoPullVisible = true + this.$nextTick(() => { + this.$refs.actinfoPull.dataForm.id = row.id + this.$refs.actinfoPull.init() + }) } } } diff --git a/src/views/modules/heart/actinfo-pull.vue b/src/views/modules/heart/actinfo-pull.vue new file mode 100644 index 0000000..8223bd1 --- /dev/null +++ b/src/views/modules/heart/actinfo-pull.vue @@ -0,0 +1,154 @@ + + + From 7f28f66236be1af17b0ee8cc9340f7d3f8a34ef0 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 3 Jun 2020 16:53:14 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E6=89=93=E5=8D=A1=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E3=80=91-=E3=80=90=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E3=80=91=E5=A2=9E=E5=8A=A0=E5=B1=8F=E8=94=BD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=20=E6=89=93=E5=8D=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=20=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/heart/actinfo-add-or-update.vue | 11 +++-- src/views/modules/heart/actinfo-list.vue | 7 +++- .../modules/heart/actuserclock-detail.vue | 41 ++++++++++++++++++- 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue index bda5a07..ea0a22c 100644 --- a/src/views/modules/heart/actinfo-add-or-update.vue +++ b/src/views/modules/heart/actinfo-add-or-update.vue @@ -69,14 +69,14 @@ prop="actQuota">
报名未审核人员： @@ -290,7 +290,7 @@ export default { headPic: '', signupStartTime: '', signupEndTime: '', - actQuotaCategory: '1', + actQuotaCategory: 1, actStartTime: '', actEndTime: '', actAddress: '', @@ -369,6 +369,10 @@ export default { } } }, + mounted () { + this.dataForm.id = this.$route.query.id + this.init() + }, created () { this.$http .get(`/sys/user/deptOptions/getByLoginUser`) @@ -592,6 +596,7 @@ export default { ...this.dataForm, ...res.data } + this.quillEditor.root.innerHTML = this.dataForm.actContent }).catch(() => { }) }, // 表单提交 diff --git a/src/views/modules/heart/actinfo-list.vue b/src/views/modules/heart/actinfo-list.vue index 6831a62..31e76d4 100644 --- a/src/views/modules/heart/actinfo-list.vue +++ b/src/views/modules/heart/actinfo-list.vue @@ -59,7 +59,8 @@ 打卡积分
- 新闻发稿 + 新闻发稿 + 新闻编辑
@@ -184,6 +185,10 @@ export default { this.$refs.actinfoPull.dataForm.id = row.id this.$refs.actinfoPull.init() }) + }, + updateHandle (row) { + this.$parent.selectComponent = 'ActInfoAdd' + this.$router.push({ path: '/heart-actinfo', query: { id: row.id } }) } } } diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue index ff333d5..616e917 100644 --- a/src/views/modules/heart/actuserclock-detail.vue +++ b/src/views/modules/heart/actuserclock-detail.vue @@ -104,6 +104,12 @@ > + + + { + this.dataForm.shieldFlag = 1 + this.dataForm.id = id + this.$http['post']('/heart/actuserclocklog/updateShieldFlag', this.dataForm).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.$emit('refreshDataList') + this.$parent.selectComponent = 'ActUserClockLog' + this.$router.push({ + path: '/heart-actinfo', + query: { id: this.dataForm.actId } + }) + } + }) + }).catch(() => {}) + }).catch(() => { + }) + } } } From 5c926028011998df9f619a0f9813f76110d97a02 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 3 Jun 2020 17:11:59 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/heart/actinfo-list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/heart/actinfo-list.vue b/src/views/modules/heart/actinfo-list.vue index 31e76d4..e3621a0 100644 --- a/src/views/modules/heart/actinfo-list.vue +++ b/src/views/modules/heart/actinfo-list.vue @@ -60,7 +60,7 @@
新闻发稿 - 新闻编辑 + 活动编辑
From ef05d56b964050504f2cdc6d750962d25b2f8342 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 3 Jun 2020 18:23:25 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/heart/actinfo-add-or-update.vue | 31 ------------------- src/views/modules/heart/actinfo-list.vue | 4 +-- .../modules/heart/actuserclock-detail.vue | 18 +++++------ 3 files changed, 10 insertions(+), 43 deletions(-) diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue index ea0a22c..1271f0d 100644 --- a/src/views/modules/heart/actinfo-add-or-update.vue +++ b/src/views/modules/heart/actinfo-add-or-update.vue @@ -59,7 +59,6 @@ type="datetime" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" - :picker-options="isSignupEndTime" placeholder="选择日期时间"> @@ -315,11 +314,6 @@ export default { reward: '', actUserDefaultState: '1' }, - isSignupEndTime: { - disabledDate (time) { - return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天 - } - }, isImgRequired: true, mapSelectVisible: false, signInIsAble: true, @@ -601,18 +595,6 @@ export default { }, // 表单提交 dataFormSubmitHandle: debounce(function () { - if (new Date() >= new Date(this.dataForm.signupEndTime)) { - return this.$message.error('报名截止时间必须大于当前时间') - } - if (this.dataForm.actStartTime >= this.dataForm.actEndTime) { - return this.$message.error('活动结束时间必须大于活动开始时间') - } - if (this.dataForm.actStartTime <= this.dataForm.signupEndTime) { - return this.$message.error('活动开始时间必须大于报名截止时间') - } - if (this.dataForm.actEndTime > this.dataForm.signinEndTime) { - return this.$message.error('打卡结束时间必须大于或等于活动结束时间') - } if ((this.dataForm.actContent).length > 10000) { return this.$message.error('您输入的的内容已超过字数') } @@ -623,19 +605,6 @@ export default { if (!valid) { return false } - var signUpEndTime = new Date(Date.parse(this.dataForm.signupEndTime)) - var actStarTime = new Date(Date.parse(this.dataForm.actStartTime)) - var actEndTime = new Date(Date.parse(this.dataForm.actEndTime)) - var signinEndTime = new Date(Date.parse(this.dataForm.signinEndTime)) - if (signUpEndTime > actStarTime) { - return this.$message.error('活动开始时间必须大于报名截止时间.') - } - if (actEndTime < actStarTime) { - return this.$message.error('活动结束时间必须大于活动开始时间.') - } - if (signinEndTime < actEndTime) { - return this.$message.error('签到结束时间必须大于活动结束时间.') - } this.isAble = true this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actinfo/', this.dataForm).then(({ data: res }) => { this.isAble = false diff --git a/src/views/modules/heart/actinfo-list.vue b/src/views/modules/heart/actinfo-list.vue index e3621a0..6c64cc9 100644 --- a/src/views/modules/heart/actinfo-list.vue +++ b/src/views/modules/heart/actinfo-list.vue @@ -59,8 +59,8 @@ 打卡积分
- 新闻发稿 - 活动编辑 + 编辑活动 + 新闻发稿
diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue index 616e917..8396340 100644 --- a/src/views/modules/heart/actuserclock-detail.vue +++ b/src/views/modules/heart/actuserclock-detail.vue @@ -106,8 +106,7 @@ @@ -155,11 +154,14 @@ export default { shieldFlag: '' }, previewImgList: [], - isAble: false + isAble: false, + isEdit: false, + actUseId: '' } }, mounted () { this.dataForm.id = this.$route.query.id + this.dataForm.actUseId = this.$route.query.id this.dataForm.actId = this.$route.query.actId this.init() }, @@ -289,12 +291,6 @@ export default { ...this.dataForm, ...res.data } - // if (res.data.status != '5' && res.data.status != '6') { - // this.dataForm.status = '5'; - // this.dataForm.failureReason = ''; - // } else { - // this.isAble = true; - // } this.setMap(res.data) this.getDataList() @@ -367,7 +363,7 @@ export default { ), // 屏蔽打卡记录 upShieldFlag (id) { - this.$confirm('此操作将永久屏蔽该文件, 是否继续?', '提示', { + this.$confirm('确定屏蔽打卡记录?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' @@ -383,6 +379,8 @@ export default { type: 'success', duration: 500, onClose: () => { + // this.dataForm.id = this.actUseId + // this.getDataList() this.$emit('refreshDataList') this.$parent.selectComponent = 'ActUserClockLog' this.$router.push({ From 96c03ba127635a9de26f0958e0ab6b9e4f5e41cd Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 3 Jun 2020 18:30:48 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/heart/actuserclock-detail.vue | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue index 8396340..d03b3a2 100644 --- a/src/views/modules/heart/actuserclock-detail.vue +++ b/src/views/modules/heart/actuserclock-detail.vue @@ -161,7 +161,7 @@ export default { }, mounted () { this.dataForm.id = this.$route.query.id - this.dataForm.actUseId = this.$route.query.id + this.actUseId = this.$route.query.id this.dataForm.actId = this.$route.query.actId this.init() }, @@ -379,14 +379,8 @@ export default { type: 'success', duration: 500, onClose: () => { - // this.dataForm.id = this.actUseId - // this.getDataList() - this.$emit('refreshDataList') - this.$parent.selectComponent = 'ActUserClockLog' - this.$router.push({ - path: '/heart-actinfo', - query: { id: this.dataForm.actId } - }) + this.dataForm.id = this.actUseId + this.getDataList() } }) }).catch(() => {})