From 5253c8bd5ecd2fecd8fefe6b7c7728e3058db5d3 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 15 三月 2021 15:36:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/user/selectuser.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/user/selectuser.vue b/src/views/user/selectuser.vue
index 8c4dec3..6871d56 100644
--- a/src/views/user/selectuser.vue
+++ b/src/views/user/selectuser.vue
@@ -46,9 +46,9 @@
         <el-table-column v-if="show" show-overflow-tooltip prop="empId" label="员工Id" />
         <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
         <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="110" />
-        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
         <el-table-column v-if="show" show-overflow-tooltip prop="deptId" label="部门Id" width="60" />
-        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="400" sortable="custom" :sort-orders="['ascending', 'descending']" />
+        <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="400" sortable="custom" :sort-orders="['ascending', 'descending']" />
         <el-table-column v-if="show" show-overflow-tooltip prop="jobId" label="岗位Id" width="80" />
         <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
         <el-table-column show-overflow-tooltip prop="empTypeName" label="员工类别" width="80" />

--
Gitblit v1.8.0