From 33c45ab67c74c387596a3a2fae26b314bebe1a4f Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期四, 07 八月 2025 18:05:59 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin --- src/views/CPersonManage/components/CPersonDetailDialog.vue | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/CPersonManage/components/CPersonDetailDialog.vue b/src/views/CPersonManage/components/CPersonDetailDialog.vue index 63b7079..ddc2e74 100644 --- a/src/views/CPersonManage/components/CPersonDetailDialog.vue +++ b/src/views/CPersonManage/components/CPersonDetailDialog.vue @@ -56,10 +56,9 @@ ProFormImageUpload, ProFormRadio, ProFormInputNumber, + defineColumns, } from '@bole-core/components'; -import { OrderInputType } from '@bole-core/core'; import _ from 'lodash'; -import * as flexEnterpriseWokerServices from '@/services/api/FlexEnterpriseWoker'; import { setOSSLink } from '@/utils'; import { FlexTaskWorkerHireEnumText, @@ -91,7 +90,7 @@ (e: 'onCancel'): void; }>(); -const column: API.CustomModuleColumnDto[] = [ +const column = defineColumns([ { id: '1', enCode: 'enterpirseName', @@ -132,7 +131,7 @@ enCode: 'contractUrl', name: '鐢靛瓙鍚堝悓', }, -]; +]); watch( () => visible.value, @@ -165,7 +164,7 @@ }, { defaultExtraParams: { - orderInput: [{ property: 'applyTime', order: OrderInputType.Desc }], + orderInput: [{ property: 'applyTime', order: EnumPagedListOrder.Desc }], }, columnsRenderProps: { applyTime: { type: 'date' }, -- Gitblit v1.9.1