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/views/TaskManage/TaskManageList.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/TaskManage/TaskManageList.vue b/src/views/TaskManage/TaskManageList.vue
index d3ee575..07ff8d1 100644
--- a/src/views/TaskManage/TaskManageList.vue
+++ b/src/views/TaskManage/TaskManageList.vue
@@ -138,7 +138,7 @@
releaseStatus: '' as any as EnumTaskReleaseStatus,
recommendStatus: '' as any as EnumTaskRecommendStatus,
time: [] as unknown as ModelValueType,
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
+ orderInput: [{ property: 'createdTime', order: EnumPagedListOrder.Desc }],
},
columnsRenderProps: {
billingMethod: { type: 'enum', valueEnum: EnumBillingMethodText },
@@ -149,11 +149,14 @@
checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskCheckReceiveStatusText },
settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
beginTime: { type: 'date', format: 'YYYY-MM-DD' },
+ createdTime: { type: 'date', format: 'YYYY-MM-DD' },
endTime: { type: 'date', format: 'YYYY-MM-DD' },
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