From 7363d75c132c3366e79143990feb2a486c7f715c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 17 May 2024 14:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A2=84=E7=BA=A6=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preregistration/preregistrationAdd.vue     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
index 25ad9fa311..da6b73d1c7 100644
--- a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
+++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
@@ -218,16 +218,24 @@ export default {
     }
   },
   methods: {
-    // 限制日期不可选择截止日期之后的
+    // 限制开始日期只可选择今天之后的
     pickerStartData(newtime) {
       return {
-        disabledDate(time) { return time.getTime() > new Date(newtime) - 1000 * 60 * 60 * 24 }
+        disabledDate(time) {
+          if (newtime !== '') {
+            return time.getTime() < Date.now() - 8.64e7 || time.getTime() > new Date(newtime)
+          } else {
+            return time.getTime() < Date.now() - 8.64e7
+          }
+        }
       }
     },
-    // 限制日期不可选择开始日期之前的
+    // 限制截止日期只可选择开始日期之后的
     pickerEndData(newtime) {
       return {
-        disabledDate(time) { return time.getTime() < new Date(newtime) - 1000 * 60 * 60 * 24 }
+        disabledDate(time) {
+          return time.getTime() < new Date(newtime) || time.getTime() < Date.now() - 8.64e7
+        }
       }
     },
     init() {
@@ -376,7 +384,7 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '预约服务顾问不能为空' })
         return
       }
-      if (this.formobj.reserveStart === '' || this.formobj.reserveEnd === '') {
+      if (this.formobj.reserveStart === '' || this.formobj.reserveEnd === '' || this.formobj.reserveStart === null || this.formobj.reserveEnd === null) {
         this.$message({ showClose: true, type: 'error', message: '预约时间不能为空' })
         return
       }