From 680c4f9e4e8b079593c8e57c100b92890e70960d Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 14 三月 2021 14:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/outemployess.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index 369d515..6f93420 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -265,6 +265,7 @@
:formatter="educationFormat"
/>
<el-table-column show-overflow-tooltip="true" prop="nativePlaceName" label="籍贯" width="70" />
+ <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="110" />
<el-table-column
show-overflow-tooltip="true"
prop="empType"
@@ -272,7 +273,6 @@
width="80"
:formatter="empTypeFormat"
/>
- <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="110" />
<el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="80">
--
Gitblit v1.8.0