yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pre Merge pull request !389 from dhb52/N/A

pull/389/MERGE
dhb52 2024-02-21 15:32:30 +00:00 committed by Gitee
parent f5b8d92d97 1252efa7fe
commit 034ad940a2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/utils/formatTime.ts
View File

@ -1,4 +1,5 @@
import dayjs from 'dayjs' import dayjs from 'dayjs'
import type { TableColumnCtx } from 'element-plus'
/** /**
* 日期快捷选项适用于 el-date-picker * 日期快捷选项适用于 el-date-picker
@ -200,7 +201,7 @@ export function formatPast2(ms) {
* @param cellValue 字段值 * @param cellValue 字段值
*/ */
// @ts-ignore // @ts-ignore
export const dateFormatter = (row, column, cellValue): string => { export const dateFormatter = (row: any, column: TableColumnCtx<any>, cellValue: any): string => {
if (!cellValue) { if (!cellValue) {
return '' return ''
} }
@ -215,9 +216,9 @@ export const dateFormatter = (row, column, cellValue): string => {
* @param cellValue 字段值 * @param cellValue 字段值
*/ */
// @ts-ignore // @ts-ignore
export const dateFormatter2 = (row, column, cellValue) => { export const dateFormatter2 = (row: any, column: TableColumnCtx<any>, cellValue: any): string => {
if (!cellValue) { if (!cellValue) {
return return ''
} }
return formatDate(cellValue, 'YYYY-MM-DD') return formatDate(cellValue, 'YYYY-MM-DD')
} }