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 @@
+
{
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.optionBannerType = res.data
+ }).catch(() => {})
+ },
+ bannerTypeFormat (row, column) {
+ for (var property in this.optionBannerType) {
+ if (row.bannerType === this.optionBannerType[property].dictValue) {
+ return this.optionBannerType[property].dictName
+ }
+ }
+ },
changeGroundingHandle: debounce(function (row) {
this.$confirm(this.$t('prompt.info', { 'handle': this.changeGroundingText(row.status) }), this.$t('prompt.title'), {
confirmButtonText: this.$t('confirm'),
diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index bda5a07..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="选择日期时间">
@@ -69,14 +68,14 @@
prop="actQuota">
固定名额
+ :label="1">固定名额
人
不限名额
+ :label="0">不限名额
报名未审核人员:
@@ -290,7 +289,7 @@ export default {
headPic: '',
signupStartTime: '',
signupEndTime: '',
- actQuotaCategory: '1',
+ actQuotaCategory: 1,
actStartTime: '',
actEndTime: '',
actAddress: '',
@@ -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,
@@ -369,6 +363,10 @@ export default {
}
}
},
+ mounted () {
+ this.dataForm.id = this.$route.query.id
+ this.init()
+ },
created () {
this.$http
.get(`/sys/user/deptOptions/getByLoginUser`)
@@ -592,22 +590,11 @@ export default {
...this.dataForm,
...res.data
}
+ this.quillEditor.root.innerHTML = this.dataForm.actContent
}).catch(() => { })
},
// 表单提交
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('您输入的的内容已超过字数')
}
@@ -618,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 b37284a..6c64cc9 100644
--- a/src/views/modules/heart/actinfo-list.vue
+++ b/src/views/modules/heart/actinfo-list.vue
@@ -58,7 +58,10 @@
报名管理
打卡积分
-
+
+ 编辑活动
+ 新闻发稿
+
@@ -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 @@
+
+
+
+
+
+
+
+
+ {{ $t('upload.button') }}
+
+
+
+
+ {{ $t('cancel') }}
+ {{ $t('confirm') }}
+
+
+
+
+
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)