Browse Source

解决: 新增活动banner图片未校验; 取消活动弹框去掉文字;

master
zhangyongzhangyong 6 years ago
parent
commit
2207056cc3
  1. 25
      src/views/modules/heart/actinfo-add-or-update.vue
  2. 6
      src/views/modules/heart/actinfo-cancel.vue

25
src/views/modules/heart/actinfo-add-or-update.vue

@ -55,6 +55,7 @@
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm"
:picker-options="isSignupEndTime"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -240,9 +241,9 @@
prop="isBanner"> prop="isBanner">
<template> <template>
<el-radio v-model="dataForm.isBanner" <el-radio v-model="dataForm.isBanner"
label="1"></el-radio> label="1" @change="changeHandler"></el-radio>
<el-radio v-model="dataForm.isBanner" <el-radio v-model="dataForm.isBanner"
label="0"></el-radio> label="0" @change="changeHandler"></el-radio>
</template> </template>
</el-form-item> </el-form-item>
</el-row> </el-row>
@ -320,6 +321,12 @@ export default {
actUserDefaultState: '1', actUserDefaultState: '1',
bannerUrl:"" bannerUrl:""
}, },
isSignupEndTime: {
disabledDate(time) {
return time < Date.now() - 8.64e7;//8.64e7=1000*60*60*24
}
},
isImgRequired: true,
mapSelectVisible:false, mapSelectVisible:false,
signInIsAble: true, signInIsAble: true,
isAble: false, isAble: false,
@ -499,6 +506,9 @@ export default {
], ],
updatedTime: [ updatedTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
isBanner: [
{ required: this.isImgRequired, message: this.$t('validate.required'), trigger: 'blur' }
] ]
} }
} }
@ -507,6 +517,13 @@ export default {
dateChangeTime(){ dateChangeTime(){
this.dataForm.signinStartTime = this.dataForm.actStartTime this.dataForm.signinStartTime = this.dataForm.actStartTime
}, },
changeHandler(value) {
if(value == 1){
this.isImgRequired = true
} else{
this.isImgRequired = false
}
},
backToActList () { backToActList () {
this.$emit('refreshDataList') this.$emit('refreshDataList')
this.$parent.selectComponent = 'ActInfoList' this.$parent.selectComponent = 'ActInfoList'
@ -609,9 +626,9 @@ export default {
return this.$message.error('活动结束时间必须大于活动开始时间。'); return this.$message.error('活动结束时间必须大于活动开始时间。');
} }
if (signinEndTime < actStarTime) { if (signinEndTime < actEndTime) {
return this.$message.error('签到结束时间必须大于签到开始时间。'); return this.$message.error('签到结束时间必须大于活动结束时间。');
} }
this.isAble = true this.isAble = true

6
src/views/modules/heart/actinfo-cancel.vue

@ -1,12 +1,6 @@
<template> <template>
<el-dialog :visible.sync="visible" :title="$t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible" :title="$t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
<el-form-item label=" " >
<p>
活动取消并发送通知给已报名的志愿者是否确定取消
</p>
</el-form-item>
<el-form-item label="取消原因 :" prop="cancelReason"> <el-form-item label="取消原因 :" prop="cancelReason">
<el-input v-model="dataForm.cancelReason" placeholder="请输入原因,50字以内" <el-input v-model="dataForm.cancelReason" placeholder="请输入原因,50字以内"
type="textarea" type="textarea"

Loading…
Cancel
Save