From e6ebbf238038daa3e2dc8511e0a3e5308b7be4af Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 07 三月 2021 14:02:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dashboard/onTheJobUser.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/views/dashboard/onTheJobUser.vue b/src/views/dashboard/onTheJobUser.vue
index 748dbfd..2081972 100644
--- a/src/views/dashboard/onTheJobUser.vue
+++ b/src/views/dashboard/onTheJobUser.vue
@@ -27,19 +27,19 @@
style="width: 100%;"
>
<el-table-column type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="sex" :formatter="sexFormat" label="性别" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="education" :formatter="educationFormat" label="最高学历" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="empType" :formatter="empTypeFormat" label="员工类别" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="nativePlace" :formatter="nativePlaceFormat" label="籍贯" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" />
- <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" />
- <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="100">
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="sex" :formatter="sexFormat" label="性别" width="100" />
+ <el-table-column show-overflow-tooltip prop="age" label="年龄" width="100" />
+ <el-table-column show-overflow-tooltip prop="education" :formatter="educationFormat" label="最高学历" width="100" />
+ <el-table-column show-overflow-tooltip prop="empType" :formatter="empTypeFormat" label="员工类别" width="100" />
+ <el-table-column show-overflow-tooltip prop="nativePlace" :formatter="nativePlaceFormat" label="籍贯" width="100" />
+ <el-table-column show-overflow-tooltip prop="telePhone" label="联系电话" />
+ <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" />
+ <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="100">
<template slot-scope="scope">
<span>{{ gzdStateList[scope.row.empStatus] }} </span>
</template>
--
Gitblit v1.8.0