From 881151e50b6316dbfb2d6fbb72c8caaf94125f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Fri, 10 May 2024 17:05:27 +0800
Subject: [PATCH] =?UTF-8?q?CN-1659=20fix:=20=E4=BF=AE=E5=A4=8D=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E/=E4=BF=AE=E6=94=B9report=EF=BC=8C=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=90=8E=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/rightBox/report/ReportBox.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue
index 6fe3e229..d0f26399 100644
--- a/src/components/rightBox/report/ReportBox.vue
+++ b/src/components/rightBox/report/ReportBox.vue
@@ -366,12 +366,12 @@ export default {
         if (this.$refs.reportForm) {
           this.$refs.reportForm.validateField('schedulerEnd')
         }
-        callback()
       }
+      callback()
     }
 
     const schedulerEndTimeValidator = (rule, value, callback) => {
-      if (this.editObject.schedulerStart && (getMillisecond(this.editObject.schedulerStart) >= getMillisecond(value))) {
+      if (value && this.editObject.schedulerStart && (getMillisecond(this.editObject.schedulerStart) >= getMillisecond(value))) {
         callback(new Error(this.$t('config.user.timeVerification')))
       } else {
         callback()
@@ -383,7 +383,6 @@ export default {
       { validator: schedulerStartTimeValidator, trigger: 'change' }
     ]
     this.rules.schedulerEnd = [
-      { required: false, message: i18n.global.t('validate.required'), trigger: 'change' },
       { validator: schedulerEndTimeValidator, trigger: 'change' }
     ]
     return {