|
@@ -55,7 +55,7 @@
|
|
|
import { formatToDate } from '/@/utils/dateUtil';
|
|
|
import dayjs from 'dayjs';
|
|
|
import 'dayjs/locale/zh-cn';
|
|
|
- import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
|
|
|
+ dayjs.locale('zh-cn');
|
|
|
|
|
|
const today = formatToDate(dayjs(new Date()));
|
|
|
const priorDate = formatToDate(dayjs(new Date().setDate(new Date().getDate() - 30)));
|
|
@@ -129,7 +129,6 @@
|
|
|
},
|
|
|
componentProps: {
|
|
|
// mode: 'date',
|
|
|
- locale: locale,
|
|
|
disabledDate(current) {
|
|
|
// console.log('current', current, date);
|
|
|
return current && current > dayjs().endOf('day');
|