From 8b9372d6e78c68689aa8e027d1d765ad7569371a Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 18 八月 2026 09:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0
---
src/views/hrm/employee/data.ts | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/src/views/hrm/employee/data.ts b/src/views/hrm/employee/data.ts
index 532286b..9affcfa 100644
--- a/src/views/hrm/employee/data.ts
+++ b/src/views/hrm/employee/data.ts
@@ -177,6 +177,49 @@
},
},
{
+ fieldName: 'nation',
+ label: '姘戞棌',
+ component: 'Input',
+ componentProps: {
+ placeholder: '璇疯緭鍏ユ皯鏃�',
+ },
+ },
+ {
+ fieldName: 'marriageStatus',
+ label: '濠氬Щ鐘舵��',
+ component: 'Input',
+ componentProps: {
+ placeholder: '璇疯緭鍏ュ濮荤姸鎬�',
+ },
+ },
+ {
+ fieldName: 'age',
+ label: '骞撮緞',
+ component: 'InputNumber',
+ componentProps: {
+ placeholder: '璇疯緭鍏ュ勾榫�',
+ min: 0,
+ max: 150,
+ style: { width: '100%' },
+ },
+ },
+ {
+ fieldName: 'education',
+ label: '瀛﹀巻',
+ component: 'Input',
+ componentProps: {
+ placeholder: '璇疯緭鍏ュ鍘�',
+ },
+ },
+ {
+ fieldName: 'politicalStatus',
+ label: '鏀挎不闈㈣矊',
+ component: 'Input',
+ componentProps: {
+ placeholder: '璇疯緭鍏ユ斂娌婚潰璨�',
+ },
+ },
+ {
fieldName: 'annualLeaveBalance',
label: '骞村亣浣欓',
component: 'InputNumber',
@@ -304,21 +347,22 @@
field: 'gender',
title: '鎬у埆',
width: 80,
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.HRM_GENDER },
+ slots: {
+ default: 'gender',
},
},
{ field: 'phone', title: '鎵嬫満鍙风爜', minWidth: 120 },
{ field: 'deptName', title: '閮ㄩ棬', minWidth: 120 },
{ field: 'postName', title: '宀椾綅', minWidth: 120 },
+ { field: 'nation', title: '姘戞棌', width: 90 },
+ { field: 'age', title: '骞撮緞', width: 70 },
+ { field: 'education', title: '瀛﹀巻', width: 90 },
{
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