From 7a5c5250b66cc6faffbcac9e192073473c50f79f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 八月 2026 17:02:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/hrm/employee/data.ts | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/hrm/employee/data.ts b/src/views/hrm/employee/data.ts
index 5e9404f..7474ca7 100644
--- a/src/views/hrm/employee/data.ts
+++ b/src/views/hrm/employee/data.ts
@@ -95,14 +95,15 @@
rules: 'selectRequired',
},
{
- fieldName: 'postId',
+ fieldName: 'postIds',
label: '宀椾綅',
component: 'ApiSelect',
componentProps: {
api: getSimplePostList,
labelField: 'name',
valueField: 'id',
- placeholder: '璇烽�夋嫨宀椾綅',
+ mode: 'multiple',
+ placeholder: '璇烽�夋嫨宀椾綅锛堝彲澶氶�夛級',
},
rules: 'selectRequired',
},
@@ -367,7 +368,7 @@
},
{ field: 'phone', title: '鎵嬫満鍙风爜', minWidth: 120 },
{ field: 'deptName', title: '閮ㄩ棬', minWidth: 120 },
- { field: 'postName', title: '宀椾綅', minWidth: 120 },
+ { field: 'postNames', title: '宀椾綅', minWidth: 120 },
{ field: 'nation', title: '姘戞棌', width: 90 },
{ field: 'age', title: '骞撮緞', width: 70 },
{ field: 'education', title: '瀛﹀巻', width: 90 },
@@ -431,7 +432,7 @@
{ field: 'employeeNo', title: '鍛樺伐缂栧彿', minWidth: 120 },
{ field: 'name', title: '鍛樺伐濮撳悕', minWidth: 100 },
{ field: 'deptName', title: '閮ㄩ棬', minWidth: 120 },
- { field: 'postName', title: '宀椾綅', minWidth: 120 },
+ { field: 'postNames', title: '宀椾綅', minWidth: 120 },
{ field: 'phone', title: '鎵嬫満鍙风爜', minWidth: 120 },
];
}
--
Gitblit v1.9.3