From 1d6afb05a91e37ec3873ffcf9285853d294862f1 Mon Sep 17 00:00:00 2001
From: Foe <548842+foe@user.noreply.gitee.com>
Date: Wed, 20 Dec 2023 07:52:53 +0000
Subject: [PATCH] =?UTF-8?q?update=20ruoyi-admin/src/main/resources/static/?=
 =?UTF-8?q?ruoyi/js/common.js.=20=E5=A6=82=E6=9E=9C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=EF=BC=8Cid?=
 =?UTF-8?q?=E7=94=A8=E7=94=A8=E5=85=B6=E4=BB=96=E5=91=BD=E5=90=8D=EF=BC=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD=E4=BC=9A=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Foe <548842+foe@user.noreply.gitee.com>
---
 .../main/resources/static/ruoyi/js/common.js   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
index 23af98b8d..b74e3d9dd 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -415,12 +415,18 @@ function endOfTime(date) {
 /** 重置日期/年月日 */
 function resetDate() {
 	if ($.common.isNotEmpty(startLayDate) && $.common.isNotEmpty(endLayDate)) {
-	    endLayDate.config.min.year = '';
-	    endLayDate.config.min.month = '';
-	    endLayDate.config.min.date = '';
-	    startLayDate.config.max.year = '2099';
-	    startLayDate.config.max.month = '12';
-	    startLayDate.config.max.date = '31';
+	    
+        if($.common.isNotEmpty(endLayDate.config.min)) {
+			endLayDate.config.min.year = '';
+	    	endLayDate.config.min.month = '';
+	    	endLayDate.config.min.date = '';
+		}
+		
+		if($.common.isNotEmpty(startLayDate.config.max)) {
+			startLayDate.config.max.year = '2099';
+	    	startLayDate.config.max.month = '12';
+	    	startLayDate.config.max.date = '31';
+		}
 	}
 }