From d772451a3059ae9df174fbed0fc382db934d46d6 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Thu, 30 Mar 2023 14:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BA=8B=E4=BB=B6=E7=A9=BA=E9=97=B4=EF=BC=8C=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B4=E4=B8=8D=E8=83=BD=E5=B0=8F=E4=BA=8E?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=EF=BC=8C=E5=B9=B6=E4=B8=94?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E=E5=BD=93=E5=89=8D=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 35 ++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index d9527c1ac..83ce2f9b2 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -27,7 +27,7 @@
                     class="u-item-width-daterange"
                     value-format="yyyy-MM-dd"
                     placeholder="开始日期"
-                    :picker-options="pickerOptions"
+                    :picker-options="pickerOptionsStart"
                     >
                   </el-date-picker>
                   <span class="u-data-tag">至</span>
@@ -38,7 +38,7 @@
                     value-format="yyyy-MM-dd"
                     class="u-item-width-daterange u-data-tag"
                     placeholder="结束日期"
-                    :picker-options="pickerOptions"
+                    :picker-options="pickerOptionsEnd"
                     >
                   </el-date-picker>
           </el-form-item>
@@ -426,12 +426,31 @@ export default {
         startPickerTime: '',
         endPickerTime: ''
       },
-      changeRecordShow: false,pickerOptions: {
-				disabledDate: time => {
-					//设置选择今天以及今天以前的日期
-					return time.getTime() > Date.now() - 8.64e6;
-				}
-			},
+      pickerOptionsStart: {
+          disabledDate: time => {
+            let dateVal = this.form.birthdayEnd
+            if (dateVal) {
+              return time.getTime() > new Date(dateVal).getTime();
+            }else {
+              return  time.getTime() > Date.now() - 8.64e6;
+            }
+          }
+      },
+      pickerOptionsEnd: {
+        disabledDate: time => {
+          let dateVal = this.form.birthdayStart
+          if (dateVal) {
+            if(time.getTime() < new Date(dateVal).getTime()){
+              return time.getTime();
+            }else {
+              return time.getTime() > Date.now() - 8.64e6;
+            }
+          }else {
+            return time.getTime() > Date.now() - 8.64e6;
+          }
+        }
+      },
+
     }
   },
   computed: {