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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/CPersonManage/components/CPersonDetailDialog.vue b/src/views/CPersonManage/components/CPersonDetailDialog.vue
index 45a2fe2..ddc2e74 100644
--- a/src/views/CPersonManage/components/CPersonDetailDialog.vue
+++ b/src/views/CPersonManage/components/CPersonDetailDialog.vue
@@ -56,8 +56,8 @@
ProFormImageUpload,
ProFormRadio,
ProFormInputNumber,
+ defineColumns,
} from '@bole-core/components';
-import { OrderInputType } from '@bole-core/core';
import _ from 'lodash';
import { setOSSLink } from '@/utils';
import {
@@ -90,7 +90,7 @@
(e: 'onCancel'): void;
}>();
-const column: API.CustomModuleColumnDto[] = [
+const column = defineColumns([
{
id: '1',
enCode: 'enterpirseName',
@@ -131,7 +131,7 @@
enCode: 'contractUrl',
name: '鐢靛瓙鍚堝悓',
},
-];
+]);
watch(
() => visible.value,
@@ -164,7 +164,7 @@
},
{
defaultExtraParams: {
- orderInput: [{ property: 'applyTime', order: OrderInputType.Desc }],
+ orderInput: [{ property: 'applyTime', order: EnumPagedListOrder.Desc }],
},
columnsRenderProps: {
applyTime: { type: 'date' },
--
Gitblit v1.9.1