From e764ce41ed27fbcc2e39160201a0dae2d05f48cb Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 17 三月 2021 14:34:10 +0800
Subject: [PATCH] fix(bug修复): 【在职员工】增加按年龄、学历、入职类型排序
---
src/views/user/inemployees.vue | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index fee4274..e10544e 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -254,8 +254,8 @@
<el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" 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="sex" label="性别" width="60" :formatter="sexFormat" />
- <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="education" label="学历" width="60" :formatter="educationFormat" />
+ <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="80" :formatter="educationFormat" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip="true" prop="nativePlace" label="籍贯" width="70" :formatter="nativePlaceFormat" />
<el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="110" />
<el-table-column show-overflow-tooltip="true" prop="empTypeName" label="员工类型" width="80" />
@@ -265,7 +265,11 @@
{{ transEmpStatus(row.empStatus) }}
</template>
</el-table-column>
- <el-table-column prop="entryTypeName" label="入职类型" width="80" />
+ <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>
<pagination
v-show="total>0"
@@ -1373,6 +1377,16 @@
return '退休'
}
},
+ transEntryType(entryType) {
+ switch (entryType) {
+ case '20':
+ return '新入职'
+ case '21':
+ return '重新入职'
+ case '22':
+ return '返聘入职'
+ }
+ },
typeFormat(row, column) {
return this.selectDictLabel(this.physicalExamTypeOptions, row.physicalExamType)
},
--
Gitblit v1.8.0