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 @@ - @@ -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 @@ 查询 - 重置 @@ -54,6 +54,7 @@ interface Props { showSearch?: boolean nextFlag?: boolean //控制时间是否可以往后推 theCurrentTime?: boolean //控制时间前3天展示上个月时间 + showReset?: boolean //控制时间前3天展示上个月时间 } const props = withDefaults(defineProps(), { @@ -61,7 +62,8 @@ const props = withDefaults(defineProps(), { area: false, showSearch: true, nextFlag: false, - theCurrentTime: false + theCurrentTime: false, + showReset: true }) // 动态计算table高度 const resizeObserver = new ResizeObserver(entries => {