From 2035f0f6bcfe739c509dfb5cbd7b84b4dcd1bfe1 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 23 二月 2021 02:21:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/search.vue | 85 +++++++++++++++++++++++++++++++++++-------
1 files changed, 70 insertions(+), 15 deletions(-)
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 66239d3..8dc6c06 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -235,10 +235,15 @@
<el-table-column prop="empName" label="姓名" />
<el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="sexName" label="性别" width="50" />
+ <el-table-column prop="age" label="年龄" width="50" />
<el-table-column prop="educationName" label="学历" />
- <el-table-column prop="nativePlace" label="籍贯" />
+ <el-table-column prop="nativePlaceName" label="籍贯" />
<el-table-column prop="telePhone" label="电话" />
- <el-table-column prop="empStatus" label="员工状态" />
+ <el-table-column prop="empStatus" label="员工状态">
+ <template slot-scope="{row}">
+ {{ transEmpStatus(row.empStatus) }}
+ </template>
+ </el-table-column>
<el-table-column prop="entryDate" label="入职日期" />
<el-table-column prop="dimissionDate" label="离职日期" />
</el-table>
@@ -255,7 +260,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="5">主要工作类容：
+ <el-col :span="5">主要工作内容：
<el-input v-model="queryParams.jobContent" size="small" maxlength="18" style="width:140px" />
</el-col>
<el-col :span="3">
@@ -275,14 +280,14 @@
</el-row>
<el-table ref="workExperienceTable" :data="workExperienceData" style="width: 100%;height: 70%;">
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="empNumb" label="员工编号" />
- <el-table-column prop="empName" label="员工姓名" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column prop="empNumb" label="员工编号" width="100" />
+ <el-table-column prop="empName" label="员工姓名" width="100" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="170" />
<el-table-column prop="sex" label="性别" width="50" />
- <el-table-column prop="workUnit" label="工作单位" />
- <el-table-column prop="beginDate" label="开始日期" />
- <el-table-column prop="endDate" label="结束日期" />
- <el-table-column prop="jobContent" label="主要工作内容" width="180" />
+ <el-table-column prop="workUnit" label="工作单位" width="220" />
+ <el-table-column prop="beginDate" label="开始日期" width="100" />
+ <el-table-column prop="endDate" label="结束日期" width="100" />
+ <el-table-column prop="jobContent" label="主要工作内容" />
</el-table>
</div>
@@ -354,10 +359,18 @@
<el-table-column prop="sex" label="性别" width="50" />
<el-table-column prop="hospital" label="体检医院" />
<el-table-column prop="physicalExamDate" label="体检日期" />
- <el-table-column prop="physicalExamType" label="体检类型" />
+ <el-table-column prop="physicalExamType" label="体检类型">
+ <template slot-scope="{row}">
+ {{ transPhysicalExamType(row.physicalExamType) }}
+ </template>
+ </el-table-column>
<el-table-column prop="bloodPressure" label="血压" />
<el-table-column prop="transaminase" label="转氨酶" />
- <el-table-column prop="ecg" label="心电图" />
+ <el-table-column prop="ecg" label="心电图">
+ <template slot-scope="{row}">
+ {{ transEcg(row.ecg) }}
+ </template>
+ </el-table-column>
<el-table-column prop="conclusion" label="体检结论" />
<el-table-column prop="reviewRecord" label="复查记录" />
<el-table-column prop="remark" label="备注" />
@@ -583,11 +596,14 @@
<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="beginTime" label="开始时间" width="180" />
<el-table-column prop="endTime" label="结束时间" width="180" />
<el-table-column prop="leaveDay" label="请假天数" width="180" />
- <el-table-column prop="leaveType" label="请假类型" width="180" />
+ <el-table-column prop="leaveType" label="请假类型" width="180">
+ <template slot-scope="{row}">
+ {{ transLeaveType(row.leaveType) }}
+ </template>
+ </el-table-column>
<el-table-column prop="returnDate" label="到岗时间" width="180" />
<el-table-column prop="reporter" label="报备人" width="180" />
<el-table-column prop="remark" label="备注" width="180" />
@@ -1664,7 +1680,8 @@
this.fetch({
empNumb: this.queryParams.vague,
empName: this.queryParams.vague,
- deptName: this.queryParams.vague
+ deptName: this.queryParams.vague,
+ delFlag: 0
})
},
dialogIsShow() {
@@ -1949,6 +1966,44 @@
this.$download('hr/empDimissionlog/export', {
...params, ...this.queryParams
}, `入离职_${new Date().getTime()}.xlsx`)
+ },
+ transEmpStatus(empStatus) {
+ switch (empStatus) {
+ case '0':
+ return '在职'
+ case '1':
+ return '正常离职'
+ case '2':
+ return '自动离职'
+ case '3':
+ return '公司辞退'
+ }
+ },
+ transLeaveType(leaveType) {
+ switch (leaveType) {
+ case '1':
+ return '事假'
+ case '2':
+ return '病假'
+ case '3':
+ return '调休假'
+ }
+ },
+ transPhysicalExamType(physicalExamType) {
+ switch (physicalExamType) {
+ case '1':
+ return '入职体检'
+ case '2':
+ return '员工体检'
+ }
+ },
+ transEcg(ecg) {
+ switch (ecg) {
+ case '1':
+ return '正常'
+ case '2':
+ return '异常'
+ }
}
}
}
--
Gitblit v1.8.0