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 +80,7 @@ - + @@ -89,6 +92,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 +112,7 @@ export default { actUserRelationVisible: false, actInfoCancelVisible: false, actUserClockLogVisible: false, + actinfoPullVisible: false, pickerBeginDateBefore: { disabledDate: (time) => { let beginDateVal = this.dataForm.startTime @@ -131,7 +136,8 @@ export default { ActinfoDetailView, ActUserRelation, ActinfoCancel, - ActUserClockLog + ActUserClockLog, + ActinfoPull }, created: function () { this.getDataList() @@ -172,6 +178,17 @@ export default { this.$refs.actinfoCancel.init() }) } + }, + pullHandle (row) { + this.actinfoPullVisible = true + this.$nextTick(() => { + 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/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 @@ + + + diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue index ff333d5..d03b3a2 100644 --- a/src/views/modules/heart/actuserclock-detail.vue +++ b/src/views/modules/heart/actuserclock-detail.vue @@ -104,6 +104,11 @@ > + + + { + 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.dataForm.id = this.actUseId + this.getDataList() + } + }) + }).catch(() => {}) + }).catch(() => { + }) + } } } 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)