diff --git a/src/assets/css/common/right-box-common.scss b/src/assets/css/common/right-box-common.scss index b0759e89..1a9c970a 100644 --- a/src/assets/css/common/right-box-common.scss +++ b/src/assets/css/common/right-box-common.scss @@ -16,7 +16,7 @@ $border-radius-small: 2px; .el-date-editor { .el-input__inner { - padding-left: 32px; + //padding-left: 32px; } } } diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue index 090e07b0..f3b7e2a4 100644 --- a/src/components/rightBox/report/ReportBox.vue +++ b/src/components/rightBox/report/ReportBox.vue @@ -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) {