From c82b7a4583f57d7bbb2f0eb4a6c5846ce0308075 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 12 三月 2021 02:37:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dashboard/onTheJobUser.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/dashboard/onTheJobUser.vue b/src/views/dashboard/onTheJobUser.vue
index 7d87890..93eeec7 100644
--- a/src/views/dashboard/onTheJobUser.vue
+++ b/src/views/dashboard/onTheJobUser.vue
@@ -28,20 +28,20 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <el-table-column type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<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">
+ <el-table-column show-overflow-tooltip prop="sex" :formatter="sexFormat" label="性别" width="60" />
+ <el-table-column show-overflow-tooltip prop="age" label="年龄" width="60" />
+ <el-table-column show-overflow-tooltip prop="education" :formatter="educationFormat" label="最高学历" width="80" />
+ <el-table-column show-overflow-tooltip prop="empType" :formatter="empTypeFormat" label="员工类别" width="80" />
+ <el-table-column show-overflow-tooltip prop="nativePlace" :formatter="nativePlaceFormat" label="籍贯" width="80" />
+ <el-table-column show-overflow-tooltip prop="telePhone" label="联系电话" width="110" />
+ <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="110" />
+ <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="80">
<template slot-scope="scope">
<span>{{ gzdStateList[scope.row.empStatus] }} </span>
</template>
--
Gitblit v1.8.0