From 5e8ad521f470ea54a2ad0ab8359eed9c504038c8 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 18:09:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/constants/task.ts | 1 +
src/views/TaskManage/TaskManageList.vue | 4 +++-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/constants/task.ts b/src/constants/task.ts
index 0a2c6c9..e5c1b8e 100644
--- a/src/constants/task.ts
+++ b/src/constants/task.ts
@@ -86,6 +86,7 @@
[EnumBillingMethod.Day]: '鎸夋棩',
[EnumBillingMethod.Hour]: '鎸夋椂',
[EnumBillingMethod.Piece]: '璁′欢',
+ [EnumBillingMethod.Face]: '闈㈣',
};
export const EnumBillingMethodUnitText = {
diff --git a/src/views/TaskManage/TaskManageList.vue b/src/views/TaskManage/TaskManageList.vue
index 59fcc88..07ff8d1 100644
--- a/src/views/TaskManage/TaskManageList.vue
+++ b/src/views/TaskManage/TaskManageList.vue
@@ -154,7 +154,9 @@
serviceFee: {
type: 'money',
formatter: (row) => {
- return `${row.serviceFee}${EnumBillingMethodUnitText[row.billingMethod]}`;
+ return row.billingMethod === EnumBillingMethod.Face
+ ? ''
+ : `${row.serviceFee}${EnumBillingMethodUnitText[row.billingMethod]}`;
},
},
},
--
Gitblit v1.9.1