From 0a2bfc15af5a729c1d001b3320a1c4cc70786664 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期一, 17 五月 2021 22:40:27 +0800
Subject: [PATCH] 智搜-工作经历性别不显示修复，离职记录修改为部门全称，合同增加显示备注字段
---
src/views/user/search.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 095e185..1b03cdd 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -565,7 +565,7 @@
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="220" />
- <el-table-column show-overflow-tooltip prop="sex" label="性别" width="80" :formatter="sexFormat" />
+ <el-table-column show-overflow-tooltip prop="sex" label="性别" width="80" />
<el-table-column show-overflow-tooltip prop="workUnit" label="工作单位" width="220" />
<el-table-column show-overflow-tooltip prop="beginDate" label="开始日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="endDate" label="结束日期" width="150" />
@@ -784,6 +784,7 @@
<el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
<el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" width="120" :formatter="contractStatusFormat" />
<el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" width="180" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" width="180" />
</el-table>
</div>
@@ -1956,7 +1957,7 @@
>
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip prop="newDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="newJobName" label="岗位" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
--
Gitblit v1.8.0