From 49c2eb264f63f04cc3e8e86dc77899a8d4b4f005 Mon Sep 17 00:00:00 2001
From: Bunny <1319900154@qq.com>
Date: Sat, 16 Nov 2024 19:10:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/financial-user/bill-user/bill-dialog.vue |  5 ++++-
 .../financial-user/bill-user/utils/columns.tsx     | 14 +++++++++++++-
 src/views/financial-user/bill-user/utils/hooks.ts  |  2 +-
 .../financial-user/category-user/utils/hooks.ts    |  4 ++--
 src/views/financial/bill/bill-dialog.vue           |  5 ++++-
 5 files changed, 24 insertions(+), 6 deletions(-)

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 });
 		<!-- 类别id -->
 		<el-form-item :label="$t('category')" prop="categoryId">
 			<el-select v-model="form.categoryId" :placeholder="$t('select') + $t('category')" clearable filterable>
-				<el-option v-for="item in categoryUserStore.allCategoryList" :key="item.id" :label="item.categoryName" :navigationBar="false" :value="item.id" />
+				<el-option v-for="item in categoryUserStore.allCategoryList" :key="item.id" :label="item.categoryName" :navigationBar="false" :value="item.id">
+					<el-text v-if="item.isBuiltin" effect="plain" size="large" type="info">{{ item.categoryName }}</el-text>
+					<el-text v-else effect="plain" size="large" type="success">{{ item.categoryName }}</el-text>
+				</el-option>
 			</el-select>
 		</el-form-item>
 
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 (
+				<ElText type={'success'} style={{ fontWeight: 800 }}>
+					{transactionDate}
+				</ElText>
+			);
+		},
+	},
 	{ 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 });
 		<!-- 类别id -->
 		<el-form-item :label="$t('category')" prop="categoryId">
 			<el-select v-model="form.categoryId" :placeholder="$t('select') + $t('category')" clearable filterable>
-				<el-option v-for="item in categoryUserStore.allCategoryList" :key="item.id" :label="item.categoryName" :navigationBar="false" :value="item.id" />
+				<el-option v-for="item in categoryUserStore.allCategoryList" :key="item.id" :label="item.categoryName" :navigationBar="false" :value="item.id">
+					<el-text v-if="item.isBuiltin" effect="plain" size="large" type="info">{{ item.categoryName }}</el-text>
+					<el-text v-else effect="plain" size="large" type="success">{{ item.categoryName }}</el-text>
+				</el-option>
 			</el-select>
 		</el-form-item>