From b5610241bf38760ef678d9d813b23e858c76aa43 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 06 八月 2026 17:59:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/hrm/employee/data.ts | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/views/hrm/employee/data.ts b/src/views/hrm/employee/data.ts
index 532286b..b9e0233 100644
--- a/src/views/hrm/employee/data.ts
+++ b/src/views/hrm/employee/data.ts
@@ -304,9 +304,8 @@
field: 'gender',
title: '鎬у埆',
width: 80,
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.HRM_GENDER },
+ slots: {
+ default: 'gender',
},
},
{ field: 'phone', title: '鎵嬫満鍙风爜', minWidth: 120 },
@@ -316,9 +315,8 @@
field: 'employeeStatus',
title: '鍛樺伐鐘舵��',
width: 100,
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.HRM_EMPLOYEE_STATUS },
+ slots: {
+ default: 'employeeStatus',
},
},
{ field: 'hireDate', title: '鍏ヨ亴鏃ユ湡', width: 110 },
--
Gitblit v1.9.3