From 0692f4289ee0046a50602adc065f1ececa90dfea Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 16:54:29 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-1.2.0.1
---
src/views/EmploymentManage/TaskManageList.vue | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/views/EmploymentManage/TaskManageList.vue b/src/views/EmploymentManage/TaskManageList.vue
index 1c2f458..a19bbc4 100644
--- a/src/views/EmploymentManage/TaskManageList.vue
+++ b/src/views/EmploymentManage/TaskManageList.vue
@@ -81,6 +81,7 @@
import { format } from '@/utils';
import { ModelValueType } from 'element-plus';
import { Message } from '@bole-core/core';
+import dayjs from 'dayjs';
defineOptions({
name: 'TaskManageList',
@@ -94,6 +95,9 @@
},
emits: {
onClick: (role) => goAddOrEdit(role),
+ },
+ extraProps: {
+ hide: (row: API.GetTaskInfosQueryResultItem) => row.status === EnumTaskStatus.Complete,
},
},
{
@@ -140,6 +144,10 @@
},
emits: {
onClick: (row: API.GetTaskInfosQueryResultItem) => handleArrange(row),
+ },
+ extraProps: {
+ hide: (row: API.GetTaskInfosQueryResultItem) =>
+ row.releaseStatus === EnumTaskReleaseStatus.Stopped,
},
},
]);
@@ -204,7 +212,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 +220,32 @@
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]}`;
+ },
+ },
+ applyBeginTime: { type: 'date', format: 'YYYY-MM-DD' },
+ applyEndTime: { type: 'date', format: 'YYYY-MM-DD' },
+ //@ts-ignore
+ applyStatus: {
+ formatter: (row: API.GetTaskInfosQueryResultItem) => {
+ const applyBeginTime = dayjs(row.applyBeginTime);
+ const applyEndTime = dayjs(row.applyEndTime);
+ const now = dayjs();
+ if (applyEndTime.isBefore(now)) {
+ return '宸茬粨鏉�';
+ } else if (applyBeginTime.isAfter(now)) {
+ return '寰呭紑濮�';
+ } else {
+ return '杩涜涓�';
+ }
+ },
+ },
},
}
);
--
Gitblit v1.9.1