From 5367b3b4d92588c4e76728e6bd4ad6aae0cbb967 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 七月 2026 13:05:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/hrm/leave/data.ts | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/views/hrm/leave/data.ts b/src/views/hrm/leave/data.ts
index 75786f4..79fc8a1 100644
--- a/src/views/hrm/leave/data.ts
+++ b/src/views/hrm/leave/data.ts
@@ -138,9 +138,8 @@
field: 'leaveType',
title: '璇峰亣绫诲瀷',
width: 100,
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.HRM_LEAVE_TYPE },
+ slots: {
+ default: 'leaveType',
},
},
{ field: 'startTime', title: '寮�濮嬫椂闂�', width: 160 },
--
Gitblit v1.9.3