From 8550c7090368487be0a9f13ff5ff955b1ae9d028 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 11 十一月 2025 16:45:11 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.2' of http://120.26.58.240:8888/r/flexJobUndertake into dev-1.3.0.2
---
src/views/EmploymentManage/TaskManageList.vue | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/src/views/EmploymentManage/TaskManageList.vue b/src/views/EmploymentManage/TaskManageList.vue
index f6f6850..929134e 100644
--- a/src/views/EmploymentManage/TaskManageList.vue
+++ b/src/views/EmploymentManage/TaskManageList.vue
@@ -36,7 +36,7 @@
<SearchInput
v-model="extraParamState.keywords"
style="width: 260px"
- placeholder="浠诲姟鍚嶇О"
+ placeholder="浠诲姟鍚嶇О/瀹㈡埛"
@on-click-search="getList"
>
</SearchInput>
@@ -78,7 +78,7 @@
import { EnumTaskStatusText, EnumTaskReleaseStatusText } from '@/constants';
import { useGlobalEventContext } from '@/hooks';
import * as taskServices from '@/services/api/task';
-import { format } from '@/utils';
+import { format, OrderUtils } from '@/utils';
import { ModelValueType } from 'element-plus';
import { Message } from '@bole-core/core';
import dayjs from 'dayjs';
@@ -86,6 +86,42 @@
defineOptions({
name: 'TaskManageList',
});
+
+const operationBtnMap: Record<string, OperationBtnType> = {
+ // editBtn: {
+ // emits: {
+ // onClick: (role) => goAddOrEdit(role),
+ // },
+ // extraProps: {
+ // hide: (row: API.GetTaskInfosQueryResultItem) => row.status === EnumTaskStatus.Complete,
+ // },
+ // },
+ detailBtn: {
+ emits: {
+ onClick: (row: API.GetTaskInfosQueryResultItem) => goDetail(row),
+ },
+ },
+ // publishBtn: {
+ // emits: {
+ // onClick: (row: API.GetTaskInfosQueryResultItem) =>
+ // setTaskInfoReleaseStatus(row, EnumTaskReleaseStatus.InProcess),
+ // },
+ // extraProps: {
+ // hide: (row: API.GetTaskInfosQueryResultItem) =>
+ // row.releaseStatus === EnumTaskReleaseStatus.InProcess,
+ // },
+ // },
+ // unPublishBtn: {
+ // emits: {
+ // onClick: (row: API.GetTaskInfosQueryResultItem) =>
+ // setTaskInfoReleaseStatus(row, EnumTaskReleaseStatus.Stopped),
+ // },
+ // extraProps: {
+ // hide: (row: API.GetTaskInfosQueryResultItem) =>
+ // row.releaseStatus === EnumTaskReleaseStatus.Stopped,
+ // },
+ // },
+};
const operationBtns = defineOperationBtns([
{
@@ -225,10 +261,8 @@
endTime: { type: 'date', format: 'YYYY-MM-DD' },
serviceFee: {
type: 'money',
- formatter: (row) => {
- return row.billingMethod === EnumBillingMethod.Face
- ? ''
- : `${row.serviceFee}${EnumBillingMethodUnitText[row.billingMethod]}`;
+ formatter: (row: API.GetTaskInfosQueryResultItem) => {
+ return OrderUtils.getServiceFeeText(row.serviceFee, row.billingMethod);
},
},
applyBeginTime: { type: 'date', format: 'YYYY-MM-DD' },
@@ -284,6 +318,9 @@
params: {
id: row?.id ?? '',
},
+ query: {
+ supplierEnterpriseId: row?.supplierEnterpriseId,
+ },
});
}
function goDetail(row: API.GetTaskInfosQueryResultItem) {
--
Gitblit v1.9.1