From d5e1c0a1f42b1c67e437d99ee2df3d4073ecd00f Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 17 三月 2021 15:03:39 +0800
Subject: [PATCH] fix(bug修复): 【离职员工】增加按年龄、学历、离职类型排序
---
src/views/user/outemployess.vue | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index 65881ab..d6900cf 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -179,9 +179,9 @@
<el-checkbox label="" @change="selectAllDimissionType">全部</el-checkbox>
<el-checkbox :label="6">正常离职</el-checkbox>
<el-checkbox :label="4">自动离职</el-checkbox>
- <el-checkbox :label="2">公司辞退</el-checkbox>
+ <el-checkbox :label="2">公司劝退</el-checkbox>
<el-checkbox :label="1">合同期满</el-checkbox>
- <el-checkbox :label="3">公司劝退</el-checkbox>
+ <el-checkbox :label="3">公司辞退</el-checkbox>
<el-checkbox :label="5">试用期内</el-checkbox>
<!-- <el-checkbox-->
<!-- v-for="data in dimissionTypeOptions"-->
@@ -257,15 +257,17 @@
<el-table-column show-overflow-tooltip="true" prop="allDeptName" label="部门（护卫点）" width="280" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="80" />
<el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="160" />
+ <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip="true" prop="sex" label="性别" width="50" :formatter="sexFormat" />
- <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="50" />
+ <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column
show-overflow-tooltip="true"
prop="education"
label="学历"
width="60"
:formatter="educationFormat"
+ ortable="custom"
+ :sort-orders="['ascending', 'descending']"
/>
<el-table-column show-overflow-tooltip="true" prop="nativePlaceName" label="籍贯" width="70" />
<el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="110" />
@@ -283,7 +285,11 @@
{{ transEmpStatus(row.empStatus) }}
</template>
</el-table-column>
- <el-table-column prop="dimissionTypeName" label="离职类型" width="80" />
+ <el-table-column prop="dimissionType" label="离职类型" width="120" sortable="custom" :sort-orders="['ascending', 'descending']">
+ <template slot-scope="{row}">
+ {{ transEntryType(row.dimissionType) }}
+ </template>
+ </el-table-column>
</el-table>
<pagination
v-show="total>0"
@@ -1406,6 +1412,22 @@
return '退休'
}
},
+ transEntryType(entryType) {
+ switch (entryType) {
+ case '1':
+ return '合同期满'
+ case '2':
+ return '公司劝退'
+ case '3':
+ return '公司辞退'
+ case '4':
+ return '自动离职'
+ case '5':
+ return '试用期内'
+ case '6':
+ return '正常离职'
+ }
+ },
transDimissionType(dimissionType) {
switch (dimissionType) {
case '1':
--
Gitblit v1.8.0