From 76420099f03ac6b2aa14c3323dcea971b6c83f1a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 17 三月 2021 03:12:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/search.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 82144ef..b232469 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -287,8 +287,7 @@
{{ transEmpStatus(row.empStatus) }}
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="dimissionTypeName" label="离职类型" width="100" />
- <el-table-column show-overflow-tooltip prop="entryTypeName" label="入职类型" width="120" />
+ <el-table-column show-overflow-tooltip prop="dimissionTypeName" label="入离职类型" width="100" :formatter="dimissionTypFormat" />
<el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
</el-table>
@@ -2430,6 +2429,14 @@
arbitrationStatusFormat(row, column) {
return this.selectDictLabel(this.settleStatusOptions, row.arbitrationStatus)
},
+ dimissionTypFormat(row, column) {
+ switch (row.empStatus) {
+ case '0':
+ return row.entryTypeName
+ case '1':
+ return row.dimissionTypeName
+ }
+ },
handleCheckedCitiesChange(value) {
const checkedCount = value.length
this.checkAll = checkedCount === this.cityOptions.length
--
Gitblit v1.8.0