From 5b9b534b7e4d39483dfa740c415b5b1777b064ed Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 23 九月 2025 14:34:02 +0800
Subject: [PATCH] Merge branch 'dev-v1.1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-v1.1.1
---
src/views/EmploymentManage/TaskManageList.vue | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/views/EmploymentManage/TaskManageList.vue b/src/views/EmploymentManage/TaskManageList.vue
index 1c2f458..4f8ffae 100644
--- a/src/views/EmploymentManage/TaskManageList.vue
+++ b/src/views/EmploymentManage/TaskManageList.vue
@@ -95,6 +95,9 @@
emits: {
onClick: (role) => goAddOrEdit(role),
},
+ extraProps: {
+ hide: (row: API.GetTaskInfosQueryResultItem) => row.status === EnumTaskStatus.Complete,
+ },
},
{
data: {
@@ -140,6 +143,10 @@
},
emits: {
onClick: (row: API.GetTaskInfosQueryResultItem) => handleArrange(row),
+ },
+ extraProps: {
+ hide: (row: API.GetTaskInfosQueryResultItem) =>
+ row.releaseStatus === EnumTaskReleaseStatus.Stopped,
},
},
]);
@@ -204,7 +211,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: {
@@ -213,9 +219,15 @@
genderLimit: { type: 'enum', valueEnum: EnumUserGenderText },
status: { type: 'enum', valueEnum: EnumTaskStatusText },
releaseStatus: { type: 'enum', valueEnum: EnumTaskReleaseStatusText },
+ createdTime: { type: 'date', format: 'YYYY-MM-DD' },
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