From 09a3ca7c9a9b7e4e1081980a8c10f10a25fd6ccf Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 12 八月 2025 17:47:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient

---
 src/views/EmploymentManage/TaskManageList.vue |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/EmploymentManage/TaskManageList.vue b/src/views/EmploymentManage/TaskManageList.vue
index 1c2f458..05dc9dd 100644
--- a/src/views/EmploymentManage/TaskManageList.vue
+++ b/src/views/EmploymentManage/TaskManageList.vue
@@ -204,7 +204,6 @@
       releaseStatus: '' as any as EnumTaskReleaseStatus,
       time: [] as unknown as ModelValueType,
       orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
-      flexEnterpriseSettingStatus: '' as any as FlexEnterpriseSettingStatus,
     },
     queryKey: ['taskServices/getTaskInfos'],
     columnsRenderProps: {
@@ -215,7 +214,12 @@
       releaseStatus: { type: 'enum', valueEnum: EnumTaskReleaseStatusText },
       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