From 4347f4b15bd664036ff19f1a7e1b4812aedd0a05 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Mon, 2 Dec 2024 15:11:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8D=E7=BD=AE=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/form/datePicker/index.vue | 5 ++++-
 src/components/table/header/index.vue    | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue
index dc67c330..749f6408 100644
--- a/src/components/form/datePicker/index.vue
+++ b/src/components/form/datePicker/index.vue
@@ -4,7 +4,7 @@
             <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
 
-        <el-date-picker v-model="timeValue" type="daterange" :disabled="disabledPicker"
+        <el-date-picker v-model="timeValue" type="daterange" :disabled="disabledPicker" :disabled-date="isFutureDate"
             style="width: 220px; margin-right: 10px" unlink-panels :clearable="false" range-separator="至"
             start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" :shortcuts="shortcuts" />
         <el-button :disabled="backDisabled" type="primary" :icon="DArrowLeft" @click="preClick"></el-button>
@@ -70,6 +70,9 @@ const shortcuts = [
         }
     }
 ]
+const isFutureDate = (time) => {
+    return time && time > Date.now();
+};
 onMounted(() => {
     timeChange(3)
 })
diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index 629f03bd..3765494f 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -19,7 +19,7 @@
                 </el-button>
                 <el-button @click="onComSearch" v-if="showSearch" :loading="tableStore.table.loading" type="primary"
                     :icon="Search">查询</el-button>
-                <el-button @click="onResetForm" v-if="showSearch" :loading="tableStore.table.loading"
+                <el-button @click="onResetForm" v-if="showSearch  && showReset" :loading="tableStore.table.loading"
                     :icon="RefreshLeft">重置</el-button>
             </template>
             <slot name="operation"></slot>
@@ -54,6 +54,7 @@ interface Props {
     showSearch?: boolean
     nextFlag?: boolean //控制时间是否可以往后推
     theCurrentTime?: boolean //控制时间前3天展示上个月时间
+    showReset?: boolean //控制时间前3天展示上个月时间
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -61,7 +62,8 @@ const props = withDefaults(defineProps<Props>(), {
     area: false,
     showSearch: true,
     nextFlag: false,
-    theCurrentTime: false
+    theCurrentTime: false,
+    showReset: true
 })
 // 动态计算table高度
 const resizeObserver = new ResizeObserver(entries => {