From 338c1fc6a3de638d84b60a5da064dceef6f0d775 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 23 九月 2025 21:49:11 +0800
Subject: [PATCH] 员工管理界面(在职、离职和智搜的列表、档案、导出)增加了年假天数显示
---
src/views/user/inemployees.vue | 104 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 82 insertions(+), 22 deletions(-)
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 2b5514d..406a068 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -255,28 +255,84 @@
>编辑</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门（护卫点）" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column
+ show-overflow-tooltip
+ prop="empNumb"
+ label="编号"
+ width="80"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ />
+ <el-table-column
+ show-overflow-tooltip
+ prop="allDeptName"
+ label="部门（护卫点）"
+ width="300"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column
+ show-overflow-tooltip
+ prop="empName"
+ label="姓名"
+ width="100"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" />
<el-table-column show-overflow-tooltip prop="sex" label="性别" width="60" :formatter="sexFormat" />
- <el-table-column show-overflow-tooltip prop="age" label="年龄" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip prop="education" label="学历" width="80" :formatter="educationFormat" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip prop="nativePlace" label="籍贯" width="70" :formatter="nativePlaceFormat" />
+ <el-table-column
+ show-overflow-tooltip
+ prop="age"
+ label="年龄"
+ width="80"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ />
+ <el-table-column
+ show-overflow-tooltip
+ prop="education"
+ label="学历"
+ width="80"
+ :formatter="educationFormat"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ />
+ <el-table-column
+ show-overflow-tooltip
+ prop="nativePlace"
+ label="籍贯"
+ width="70"
+ :formatter="nativePlaceFormat"
+ />
<el-table-column show-overflow-tooltip prop="telePhone" label="联系电话" width="110" />
<el-table-column show-overflow-tooltip prop="empTypeName" label="员工类型" width="80" />
- <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column
+ show-overflow-tooltip
+ prop="entryDate"
+ label="入职日期"
+ width="110"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ />
<el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="80">
<template slot-scope="{row}">
{{ transEmpStatus(row.empStatus) }}
</template>
</el-table-column>
- <el-table-column prop="entryType" label="入职类型" width="120" sortable="custom" :sort-orders="['ascending', 'descending']">
+ <el-table-column
+ prop="entryType"
+ label="入职类型"
+ width="120"
+ sortable="custom"
+ :sort-orders="['ascending', 'descending']"
+ >
<template slot-scope="{row}">
{{ transEntryType(row.entryType) }}
</template>
</el-table-column>
+ <el-table-column show-overflow-tooltip prop="annualLeave" label="年假天数" width="110" />
</el-table>
<pagination
v-show="total>0"
@@ -690,7 +746,9 @@
</div>
</el-dialog>
<el-dialog title="导出员工" :visible.sync="dialogShowDcyg" width="40%">
- <div style="font-size: 16px;font-weight: 400;height: 35px;margin-top: -30px;color: #409EFF;">请勾选需要导出的字段</div>
+ <div style="font-size: 16px;font-weight: 400;height: 35px;margin-top: -30px;color: #409EFF;">
+ 请勾选需要导出的字段
+ </div>
<table id="dcygTable" width="100%">
<tr>
<td colspan="6" style="text-align: left;">
@@ -881,16 +939,16 @@
<el-checkbox label="empNumb"><span /></el-checkbox>
</td>
</tr>
- <!-- <tr>-->
- <!-- <td>家庭成员及关系</td>-->
- <!-- <td>-->
- <!-- <el-checkbox label="family"><span /></el-checkbox>-->
- <!-- </td>-->
- <!-- <td />-->
- <!-- <td />-->
- <!-- <td />-->
- <!-- <td />-->
- <!-- </tr>-->
+ <tr>
+ <td>年假天数</td>
+ <td>
+ <el-checkbox label="annualLeave"><span /></el-checkbox>
+ </td>
+ <td />
+ <td />
+ <td />
+ <td />
+ </tr>
</el-checkbox-group>
</table>
<div slot="footer" class="dialog-footer">
@@ -1196,7 +1254,7 @@
exportUrl: '',
checkAll: false,
isIndeterminate: false,
- cityOptions: ['archivesNumb', 'allDeptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'insuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateListName', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName', 'empNumb'],
+ cityOptions: ['archivesNumb', 'allDeptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'insuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateListName', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName', 'empNumb', 'annualLeave'],
checkedCities: [],
tableData: [],
selectDimissionType: 1,
@@ -1226,7 +1284,7 @@
dimissionTypeOptions: [],
ageStrOptions: [],
sexOptions: [],
- openArchivesForm: { }
+ openArchivesForm: {}
}
},
mounted() {
@@ -2337,10 +2395,12 @@
#dcygTable {
border-collapse: collapse;
+
tr {
width: 100%;
border-bottom: 1px dashed #ccc;
- >td:nth-child(even) {
+
+ > td:nth-child(even) {
width: 100px;
text-align: left;
}
--
Gitblit v1.8.0