CN-1637 fix: 【Report】新建Report,当生效时间大于失效时间时,Report仍能保存成功
This commit is contained in:
@@ -335,9 +335,6 @@ export default {
|
||||
categoryId: [
|
||||
{ required: true, message: i18n.global.t('validate.required'), trigger: 'change' }
|
||||
],
|
||||
schedulerStart: [
|
||||
{ required: true, message: i18n.global.t('validate.required'), trigger: 'change' }
|
||||
],
|
||||
'config.startTime': [
|
||||
{ required: true, message: i18n.global.t('validate.required'), trigger: 'change' },
|
||||
{ validator: startTimeValidator, trigger: 'change' }
|
||||
@@ -360,6 +357,31 @@ export default {
|
||||
}
|
||||
},
|
||||
data () {
|
||||
const schedulerStartTimeValidator = (rule, value, callback) => {
|
||||
if (this.editObject.schedulerEnd) {
|
||||
if (this.$refs.reportForm) {
|
||||
this.$refs.reportForm.validateField('schedulerEnd')
|
||||
}
|
||||
callback()
|
||||
}
|
||||
}
|
||||
|
||||
const schedulerEndTimeValidator = (rule, value, callback) => {
|
||||
if (this.editObject.schedulerStart && (getMillisecond(this.editObject.schedulerStart) >= getMillisecond(value))) {
|
||||
callback(new Error(this.$t('config.user.timeVerification')))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
|
||||
this.rules.schedulerStart = [
|
||||
{ required: true, message: i18n.global.t('validate.required'), trigger: 'change' },
|
||||
{ validator: schedulerStartTimeValidator, trigger: 'change' }
|
||||
]
|
||||
this.rules.schedulerEnd = [
|
||||
{ required: true, message: i18n.global.t('validate.required'), trigger: 'change' },
|
||||
{ validator: schedulerEndTimeValidator, trigger: 'change' }
|
||||
]
|
||||
return {
|
||||
url: api.reportTemp,
|
||||
|
||||
@@ -505,11 +527,11 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
mounted () {
|
||||
this.initDateCalendarPreIcon()
|
||||
},
|
||||
methods: {
|
||||
initDateCalendarPreIcon() {
|
||||
initDateCalendarPreIcon () {
|
||||
this.$nextTick(() => {
|
||||
const datePrefixIcon = document.getElementsByClassName('el-input__prefix-inner')
|
||||
if (datePrefixIcon && datePrefixIcon.length > 0) {
|
||||
|
||||
Reference in New Issue
Block a user