From 81adf03a60f6b4452be4e3ad1f9e3915e0c78bf6 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 17 九月 2025 17:25:00 +0800
Subject: [PATCH] Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-v1.1
---
src/views/EmploymentManage/components/CheckManageDialog.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/views/EmploymentManage/components/CheckManageDialog.vue b/src/views/EmploymentManage/components/CheckManageDialog.vue
index 89d5dfc..e128516 100644
--- a/src/views/EmploymentManage/components/CheckManageDialog.vue
+++ b/src/views/EmploymentManage/components/CheckManageDialog.vue
@@ -47,21 +47,26 @@
const columns = defineColumns([
{
id: '1',
+ enCode: 'date',
+ name: '浠诲姟鏃ユ湡',
+ },
+ {
+ id: '2',
enCode: 'createdTime',
name: '鎻愪氦鏃堕棿',
},
{
- id: '2',
+ id: '3',
enCode: 'files',
name: '楠屾敹鐓х墖',
},
{
- id: '3',
+ id: '4',
enCode: 'checkReceiveStatus',
name: '楠屾敹鐘舵��',
},
{
- id: '4',
+ id: '5',
enCode: 'checkReceiveTime',
name: '楠屾敹鏃堕棿',
},
@@ -150,18 +155,19 @@
},
{
defaultExtraParams: {
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
+ orderInput: [{ property: 'date', order: EnumPagedListOrder.Desc }],
},
queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmits'],
columnsRenderProps: {
createdTime: { type: 'date' },
checkReceiveTime: { type: 'date' },
+ date: { type: 'date', format: 'YYYY-MM-DD' },
checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskUserSubmitCheckReceiveStatusText },
files: {
type: 'url',
//@ts-ignore
formatter: (row: API.GetCheckReceiveTaskUserSubmitsQueryResultItem) =>
- (row.files ?? []).map((x) => setOSSLink(x)),
+ row.files?.length > 0 && (row.files ?? []).map((x) => setOSSLink(x)),
showDownloadBtn: false,
},
},
--
Gitblit v1.9.1