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/dashboard/blUser.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/dashboard/blUser.vue b/src/views/dashboard/blUser.vue
index 2c862d9..f4ac181 100644
--- a/src/views/dashboard/blUser.vue
+++ b/src/views/dashboard/blUser.vue
@@ -28,14 +28,14 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip 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="deptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<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="badDate" label="不良记录日期" />
- <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="100" />
+ <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" min-width="120" />
+ <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" min-width="120" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
--
Gitblit v1.8.0