From c5068f7ea1c99cc7caacc45188050b333ff9d46a Mon Sep 17 00:00:00 2001
From: zhaohengkun <zhaohengkun>
Date: Wed, 25 Sep 2024 14:56:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventMarketing/openCardGift/popUp.vue     | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue
index 063010237..2cac3c6b7 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue
@@ -56,7 +56,7 @@
             </div>
           </div>
           <div style="margin-top: 20px">
-            <el-form-item label="时间段" prop="suitTimeSlotFront" label-width="70px" >
+            <el-form-item label="时间段" prop="suitTimeSlot" label-width="70px" >
               <el-time-picker
                 v-model="ruleForm.suitTimeSlotFront"
                 format="HH:mm"
@@ -269,8 +269,9 @@ export default {
         activeTimeType: [
           {required: true, message: '活动时间不能为空', trigger: 'blur'},
         ],
-        suitTimeSlotFront: [
-          {required: true, message: '时间段不能为空', trigger: 'blur'},
+        //自定义验证逻辑
+        suitTimeSlot: [
+          { required:true, validator: this.validateTimeRange, trigger: 'change' }
         ],
         userGradeIds: [
           {required: true, message: '适用会员等级不能为空', trigger: 'blur'},
@@ -298,6 +299,23 @@ export default {
     this.listUserGrade()
   },
   methods: {
+    //自定义表单验证逻辑
+    validateTimeRange(rule, value, callback) {
+      const { suitTimeSlotFront, suitTimeSlotAfter } = this.ruleForm;
+
+      if (!suitTimeSlotFront && !suitTimeSlotAfter) {
+        callback(new Error('请选择开始时间和结束时间'));
+      } else if (!suitTimeSlotFront) {
+        callback(new Error('请选择开始时间'));
+      } else if (!suitTimeSlotAfter) {
+        callback(new Error('请选择结束时间'));
+      } else if (suitTimeSlotFront >= suitTimeSlotAfter) {
+        callback(new Error('结束时间必须晚于开始时间'));
+      } else {
+        callback();
+      }
+    },
+
     Typeindex3(index) {
       this.tindex3 = index
       this.ruleForm.suitTimeSlotType = index