|
|
@@ -39,7 +39,7 @@
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<template #footer>
|
|
|
- <el-space>
|
|
|
+ <el-space size="middle">
|
|
|
<el-button @click="handleReset">重置</el-button>
|
|
|
<el-button type="primary" :loading="subLoading" @click="formSubmit">提交</el-button>
|
|
|
</el-space>
|
|
|
@@ -49,7 +49,7 @@
|
|
|
|
|
|
<script lang="ts" setup>
|
|
|
import { ref, onMounted } from 'vue';
|
|
|
- import { ElMessage } from 'element-plus';
|
|
|
+ import { ElMessage, ElSpace } from 'element-plus';
|
|
|
import type { FormRules } from 'element-plus';
|
|
|
import type { formParamsType } from './types';
|
|
|
import { cloneDeep } from 'lodash-es';
|
|
|
@@ -176,13 +176,13 @@
|
|
|
const handleDisabledBeginDate = (currentDate: Date) => {
|
|
|
const endDate = formParams.value.endDate;
|
|
|
if (!endDate) return false;
|
|
|
- return dayjs(currentDate).isAfter(endDate);
|
|
|
+ return !dayjs(currentDate).isBefore(endDate, 'day');
|
|
|
};
|
|
|
|
|
|
const handleDisabledEndDate = (currentDate: Date) => {
|
|
|
const beginDate = formParams.value.beginDate;
|
|
|
if (!beginDate) return false;
|
|
|
- return dayjs(currentDate).isBefore(beginDate);
|
|
|
+ return !dayjs(currentDate).isAfter(beginDate, 'day');
|
|
|
};
|
|
|
|
|
|
defineExpose({
|