From 1c7b0c4e02f351064b9c68ec8f6e85d7665f66ab Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 27 八月 2026 11:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/hrm/employee/modules/detail.vue | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/views/hrm/employee/modules/detail.vue b/src/views/hrm/employee/modules/detail.vue
index ca20c47..ccd7122 100644
--- a/src/views/hrm/employee/modules/detail.vue
+++ b/src/views/hrm/employee/modules/detail.vue
@@ -12,6 +12,7 @@
import WorkHistoryList from './work-history-list.vue';
import EmergencyContactList from './emergency-contact-list.vue';
import SocialSecurityList from './social-security-list.vue';
+import ContractList from './contract-list.vue';
const props = defineProps<{
employee: HrmEmployeeApi.Employee;
@@ -48,12 +49,17 @@
<DescriptionsItem label="鍛樺伐鐘舵��">
<Tag :color="employeeStatusColor">{{ employeeStatusLabel }}</Tag>
</DescriptionsItem>
+ <DescriptionsItem label="姘戞棌">{{ employee.nation || '-' }}</DescriptionsItem>
+ <DescriptionsItem label="濠氬Щ鐘舵��">{{ employee.marriageStatus || '-' }}</DescriptionsItem>
+ <DescriptionsItem label="骞撮緞">{{ employee.age ?? '-' }}</DescriptionsItem>
+ <DescriptionsItem label="瀛﹀巻">{{ employee.education || '-' }}</DescriptionsItem>
+ <DescriptionsItem label="鏀挎不闈㈣矊">{{ employee.politicalStatus || '-' }}</DescriptionsItem>
</Descriptions>
<!-- 宸ヤ綔淇℃伅 -->
<Descriptions title="宸ヤ綔淇℃伅" bordered :column="2" class="mb-4">
<DescriptionsItem label="褰掑睘閮ㄩ棬">{{ employee.deptName || '-' }}</DescriptionsItem>
- <DescriptionsItem label="宀椾綅">{{ employee.postName || '-' }}</DescriptionsItem>
+ <DescriptionsItem label="宀椾綅">{{ employee.postNames || '-' }}</DescriptionsItem>
<DescriptionsItem label="鍏ヨ亴鏃ユ湡">{{ employee.hireDate }}</DescriptionsItem>
<DescriptionsItem label="杞鏃ユ湡">{{ employee.regularDate || '-' }}</DescriptionsItem>
<DescriptionsItem label="绂昏亴鏃ユ湡">{{ employee.leaveDate || '-' }}</DescriptionsItem>
@@ -91,6 +97,9 @@
<Tabs.TabPane key="socialSecurity" tab="绀句繚鍏Н閲戞。妗�">
<SocialSecurityList form-type="detail" :employee-id="employee.id" :user-id="employee.userId" />
</Tabs.TabPane>
+ <Tabs.TabPane key="contract" tab="鍛樺伐鍚堝悓">
+ <ContractList :employee-id="employee.id" />
+ </Tabs.TabPane>
</Tabs>
</div>
</template>
--
Gitblit v1.9.3