From 19b9276c6110b2d2da3715e78454fb7fb22da30a Mon Sep 17 00:00:00 2001
From: zhaohengkun <zhaohengkun>
Date: Fri, 18 Oct 2024 18:05:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/views/userGrade/index.vue | 27 +++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue
index 1da454f0d..c65751135 100644
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@@ -690,6 +690,7 @@
             </el-radio-group>
 
             <el-date-picker
+              value-format="yyyy-MM-dd HH:mm:ss"
               v-model="form2.suitDateFront"
               style="width: 160px;margin-left: 10px;"
               type="date"
@@ -697,6 +698,7 @@
             </el-date-picker>
             <div style="margin: 0 10px;">至</div>
             <el-date-picker
+              value-format="yyyy-MM-dd HH:mm:ss"
               v-model="form2.suitDateAfter"
               style="width: 160px"
               type="date"
@@ -1242,16 +1244,21 @@ export default {
         holidayIsUse: [
           {required: true, message: "请选择节假日是否通用", trigger: "blur"},
         ],
-        // suitDateType: [
-        //   {validator: (rule, value, callback) => {
-        //        if (this.form2.suitDateType == '1'){
-        //            if (this.form2.suitDateFront == undefined){
-        //              callback(new Error("请选择开始日期"))
-        //            }else if (this.form2.suitDateAfter == undefined){
-        //              callback(new Error("请选择结束日期"))
-        //            }
-        //        }
-        //   }},],
+        suitDateType: [
+          {validator: (rule, value, callback) => {
+            console.log('走了',this.form2.suitDateType)
+               if (this.form2.suitDateType == '1'){
+                   if (this.form2.suitDateFront == undefined){
+                     callback(new Error("请选择开始日期"))
+                   }else if (this.form2.suitDateAfter == undefined){
+                     callback(new Error("请选择结束日期"))
+                   }else {
+                     callback();
+                   }
+               }else {
+                 callback();
+               }
+          }},],
         suitTimeSlotType: [
           {required: true, message: "请选择适用时间段", trigger: "blur"},
         ],