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 |   79 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/src/views/hrm/employee/data.ts b/src/views/hrm/employee/data.ts
index 532286b..7474ca7 100644
--- a/src/views/hrm/employee/data.ts
+++ b/src/views/hrm/employee/data.ts
@@ -10,6 +10,7 @@
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
+import { getSalaryStructureList } from '#/api/hrm/salary/structure';
 import { getDeptList } from '#/api/system/dept';
 import { getSimplePostList } from '#/api/system/post';
 import { getSimpleRoleList } from '#/api/system/role';
@@ -94,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',
     },
@@ -177,6 +179,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',
@@ -197,6 +242,19 @@
         precision: 1,
         style: { width: '100%' },
       },
+    },
+    {
+      fieldName: 'salaryStructureId',
+      label: '钖叕缁撴瀯',
+      component: 'ApiSelect',
+      componentProps: {
+        api: () => getSalaryStructureList({ status: 0 }),
+        labelField: 'name',
+        valueField: 'id',
+        allowClear: true,
+        placeholder: '璇烽�夋嫨钖叕缁撴瀯',
+      },
+      help: '鍐冲畾宸ヤ綔鏃ュ姞鐝�嶇巼锛涙湭閫夋嫨鏃朵娇鐢ㄧ郴缁熼粯璁� 1.5 鍊�',
     },
     {
       fieldName: 'baseSalary',
@@ -304,21 +362,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: 'postNames', 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 },
@@ -373,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