From a6c44ba04f4f88acb057ea672c8d1d20e86dcd55 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 12 八月 2025 17:51:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
auto-imports.d.ts | 2 +-
src/views/TaskManage/TaskManageList.vue | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index a6f72f9..3b46332 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -492,4 +492,4 @@
readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']>
readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']>
}
-}
\ No newline at end of file
+}
diff --git a/src/views/TaskManage/TaskManageList.vue b/src/views/TaskManage/TaskManageList.vue
index 717e553..d3ee575 100644
--- a/src/views/TaskManage/TaskManageList.vue
+++ b/src/views/TaskManage/TaskManageList.vue
@@ -150,7 +150,12 @@
settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
beginTime: { type: 'date', format: 'YYYY-MM-DD' },
endTime: { type: 'date', format: 'YYYY-MM-DD' },
- serviceFee: { type: 'money' },
+ serviceFee: {
+ type: 'money',
+ formatter: (row) => {
+ return `${row.serviceFee}${EnumBillingMethodUnitText[row.billingMethod]}`;
+ },
+ },
},
}
);
--
Gitblit v1.9.1