diff --git a/src/views/financial-user/bill-user/bill-dialog.vue b/src/views/financial-user/bill-user/bill-dialog.vue index b86b84e..260c12c 100644 --- a/src/views/financial-user/bill-user/bill-dialog.vue +++ b/src/views/financial-user/bill-user/bill-dialog.vue @@ -72,7 +72,10 @@ defineExpose({ formRef }); - + + {{ item.categoryName }} + {{ item.categoryName }} + diff --git a/src/views/financial-user/bill-user/utils/columns.tsx b/src/views/financial-user/bill-user/utils/columns.tsx index 61afba7..07b1a82 100644 --- a/src/views/financial-user/bill-user/utils/columns.tsx +++ b/src/views/financial-user/bill-user/utils/columns.tsx @@ -36,7 +36,19 @@ export const columns: TableColumnList = [ // 描述 { label: $t('description'), prop: 'description' }, // 交易日期 - { label: $t('transactionDate'), prop: 'transactionDate', width: 160 }, + { + label: $t('transactionDate'), + prop: 'transactionDate', + width: 190, + sortable: true, + formatter({ transactionDate }) { + return ( + + {transactionDate} + + ); + }, + }, { label: $t('table.updateTime'), prop: 'updateTime', sortable: true, width: 160 }, { label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 }, { label: $t('table.operation'), fixed: 'right', width: 160, slot: 'operation' }, diff --git a/src/views/financial-user/bill-user/utils/hooks.ts b/src/views/financial-user/bill-user/utils/hooks.ts index 5db8d28..bb242b9 100644 --- a/src/views/financial-user/bill-user/utils/hooks.ts +++ b/src/views/financial-user/bill-user/utils/hooks.ts @@ -27,7 +27,7 @@ export function onAdd() { width: '30%', props: { formInline: { - type: 1, + type: -1, amount: undefined, description: undefined, transactionDate: dayjs(Date.now()).format('YYYY-MM-DD HH:mm:ss'), diff --git a/src/views/financial-user/category-user/utils/hooks.ts b/src/views/financial-user/category-user/utils/hooks.ts index b17531e..4ab7285 100644 --- a/src/views/financial-user/category-user/utils/hooks.ts +++ b/src/views/financial-user/category-user/utils/hooks.ts @@ -22,7 +22,7 @@ export async function onSearch() { /** 添加分类信息 */ export function onAdd() { addDialog({ - title: `${$t('addNew')}${$t('category-user')}`, + title: `${$t('addNew')}${$t('categoryUser')}`, width: '30%', props: { formInline: { @@ -50,7 +50,7 @@ export function onAdd() { /** 更新分类信息 */ export function onUpdate(row: any) { addDialog({ - title: `${$t('modify')}${$t('category-user')}`, + title: `${$t('modify')}${$t('categoryUser')}`, width: '30%', props: { formInline: { diff --git a/src/views/financial/bill/bill-dialog.vue b/src/views/financial/bill/bill-dialog.vue index 89431c6..72d2061 100644 --- a/src/views/financial/bill/bill-dialog.vue +++ b/src/views/financial/bill/bill-dialog.vue @@ -112,7 +112,10 @@ defineExpose({ formRef }); - + + {{ item.categoryName }} + {{ item.categoryName }} +