From 38d864d572c8e08d40dbfa1fdfbd926c95edbb46 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Thu, 30 Mar 2023 13:47:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=97=B6=E9=97=B4=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E9=80=89=E6=8B=A9=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=8F=AA?=
 =?UTF-8?q?=E8=83=BD=E9=80=89=E6=8B=A9=E5=8C=85=E5=90=AB=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=9C=A8=E5=86=85=E7=9A=84=E8=BF=87=E5=8E=BB?=
 =?UTF-8?q?=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 18 ++++++++++++++----
 src/views/modules/base/collect.vue  | 11 +++++++++--
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 9353ce535..d9527c1ac 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -10,7 +10,7 @@
           <el-form-item label="联系电话" >
               <el-input v-model="form.mobile" size="small" placeholder="请输入" class="u-item-width-normal" clearable ></el-input>
           </el-form-item>
-          <el-form-item label="证件号" >
+          <el-form-item label="证件号1" >
               <el-input v-model="form.idNum" size="small" placeholder="请输入" class="u-item-width-normal" clearable ></el-input>
           </el-form-item>
           <el-form-item label="居民性别" >
@@ -26,7 +26,9 @@
                     size="small"
                     class="u-item-width-daterange"
                     value-format="yyyy-MM-dd"
-                    placeholder="开始日期">
+                    placeholder="开始日期"
+                    :picker-options="pickerOptions"
+                    >
                   </el-date-picker>
                   <span class="u-data-tag">至</span>
                   <el-date-picker
@@ -35,7 +37,9 @@
                     size="small"
                     value-format="yyyy-MM-dd"
                     class="u-item-width-daterange u-data-tag"
-                    placeholder="结束日期">
+                    placeholder="结束日期"
+                    :picker-options="pickerOptions"
+                    >
                   </el-date-picker>
           </el-form-item>
           <el-form-item label="居民年龄" >
@@ -421,7 +425,13 @@ export default {
       timer: {
         startPickerTime: '',
         endPickerTime: ''
-      }
+      },
+      changeRecordShow: false,pickerOptions: {
+				disabledDate: time => {
+					//设置选择今天以及今天以前的日期
+					return time.getTime() > Date.now() - 8.64e6;
+				}
+			},
     }
   },
   computed: {
diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index d5f80200e..1c72cc8e6 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -55,7 +55,8 @@
                             range-separator="至"
                             start-placeholder="开始日期"
                             end-placeholder="结束日期"
-                            value-format="yyyy-MM-dd">
+                            value-format="yyyy-MM-dd"
+                            :picker-options="pickerOptions">
             </el-date-picker>
           </el-form-item>
 
@@ -412,7 +413,13 @@ export default {
       importLoading: false,
       addHouseShow: false,
       dialogType: 'look', // 对话框是check审核还是look查看
-      relationshipOptions: []
+      relationshipOptions: [],
+      changeRecordShow: false,pickerOptions: {
+				disabledDate: time => {
+					//设置选择今天以及今天以前的日期
+					return time.getTime() > Date.now() - 8.64e6;
+				}
+			}
     }
   },
   components: {