From 0edebba8b4cb84e1bfc0cdf244fdee43b909ed9d Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期五, 26 二月 2021 00:25:49 +0800
Subject: [PATCH] 修改BUG
---
src/views/user/search.vue | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 7aa65de..9108a06 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -219,6 +219,11 @@
</tr>
</table>
</div>
+ <el-row>
+ <el-col :span="21" style="line-height: 50px;">
+ 已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
+ </el-col>
+ </el-row>
<el-table ref="empBaseInfoTable" :data="basicInformationData" style="width: 100%;height: 70%;">
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="empNumb" label="员工编号" />
@@ -445,7 +450,7 @@
<el-table-column prop="deptName" label="护卫点" width="180" />
<el-table-column prop="jobName" label="岗位" width="180" />
<el-table-column prop="empName" label="员工姓名" width="180" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="signingDate" label="合同签订日期" width="180" />
<el-table-column prop="endDate" label="合同结束日期" width="180" />
<el-table-column prop="contractPeriod" label="合同期限(年)" width="180" />
@@ -520,7 +525,7 @@
<el-table-column prop="deptName" label="护卫点" width="180" />
<el-table-column prop="jobName" label="岗位名称" width="180" />
<el-table-column prop="empName" label="员工姓名" width="180" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="attendMonth" label="离职考勤月份" width="180" />
<el-table-column prop="attendDays" label="出勤天数" width="180" />
<el-table-column prop="overtimeDay" label="加班（天）" width="180" />
@@ -657,7 +662,7 @@
<el-table-column prop="jobName" label="岗位名" width="180" />
<el-table-column prop="empNumb" label="员工编号" width="180" />
<el-table-column prop="empName" label="员工姓名" width="180" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="applayDate" label="辞职申请日期" width="180" />
<el-table-column prop="reason" label="辞职事由" width="180" />
<el-table-column prop="reporter" label="汇报人" width="180" />
@@ -856,8 +861,8 @@
<el-col :span="4">是否住院：
<el-select v-model="queryParams.hospitalizatioFlag" style="width:100px">
<el-option value="" label="全部" />
- <el-option value="1" label="是" />
- <el-option value="2" label="否" />
+ <el-option label="未住院" value="0" />
+ <el-option label="已住院" value="1" />
</el-select>
</el-col>
<el-col :span="4">案结状态：
@@ -962,8 +967,8 @@
<el-col :span="4">是否住院：
<el-select v-model="queryParams.hospitalizatioFlag" style="width:100px">
<el-option value="" label="全部" />
- <el-option value="1" label="是" />
- <el-option value="2" label="否" />
+ <el-option label="未住院" value="0" />
+ <el-option label="已住院" value="1" />
</el-select>
</el-col>
<el-col :span="4">案结状态：
@@ -1018,7 +1023,6 @@
{{ transArbitrationStatus(row.settleStatus) }}
</template>
</el-table-column>
- <el-table-column prop="settleDate" label="案结日期" width="180" />
</el-table>
</div>
@@ -1285,7 +1289,11 @@
<el-table-column prop="oldDeptName" label="原部门" />
<el-table-column prop="oldJobName" label="原岗位" />
<el-table-column prop="changeDate" label="调岗日期" />
- <el-table-column prop="changeType" label="调岗类型" />
+ <el-table-column prop="changeType" label="调岗类型">
+ <template slot-scope="{row}">
+ {{ transChangeType(row.changeType) }}
+ </template>
+ </el-table-column>
</el-table>
</div>
<div v-show="showArr[15].show">
@@ -2110,9 +2118,17 @@
transHospitalizatioFlag(hospitalizatioFlag) {
switch (hospitalizatioFlag) {
case 1:
- return '是'
+ return '已住院'
+ case 0:
+ return '未住院'
+ }
+ },
+ transChangeType(changeType) {
+ switch (changeType) {
case 2:
- return '否'
+ return '升职'
+ case 3:
+ return '调动'
}
}
}
--
Gitblit v1.8.0