From 1cffdab95c6c11c6117ed25a51696bd40cdaa6eb Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 23 八月 2021 21:22:54 +0800
Subject: [PATCH] fix(bug修复): 打开档案时的入职类型不正确
---
src/views/user/inemployees.vue | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 3eda1c4..3f2174d 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -189,7 +189,7 @@
<el-checkbox-group v-model="queryParams.entryType" class="fj-checkbox">
<el-checkbox label="" @change="selectAllEntryType">全部</el-checkbox>
<el-checkbox :label="20">新入职</el-checkbox>
- <el-checkbox :label="21">重新新入职</el-checkbox>
+ <el-checkbox :label="21">重新入职</el-checkbox>
<el-checkbox :label="22">返聘入职</el-checkbox>
<!-- <el-checkbox-->
<!-- v-for="data in dimissionTypeOptions"-->
@@ -198,6 +198,21 @@
<!-- >-->
<!-- {{ data.dicItemName }}-->
<!-- </el-checkbox>-->
+ </el-checkbox-group>
+ </td>
+ </tr>
+ <tr>
+ <td class="td">相关证件：</td>
+ <td class="td-group">
+ <el-checkbox-group v-model="queryParams.certificateList" class="fj-checkbox">
+ <el-checkbox label="" @change="selectAllCertificateList">全部</el-checkbox>
+ <el-checkbox
+ v-for="data in certificateListOptions"
+ :key="data.dicItemName"
+ :label="data.dicItemCode"
+ >
+ {{ data.dicItemName }}
+ </el-checkbox>
</el-checkbox-group>
</td>
</tr>
@@ -611,7 +626,7 @@
<el-upload
ref="upload"
class="upload-demo"
- action="http://120.24.23.155:8301/hr/empBaseInfo/importEmp"
+ action="http://127.0.0.1:8301/hr/empBaseInfo/importEmp"
accept=".xls, .xlsx, .excel"
:headers="headers()"
:file-list="fileList"
@@ -910,8 +925,8 @@
<el-col span="24">
<el-form-item label="打开类型" prop="region">
<el-radio-group v-model="openArchivesForm.openType">
- <el-radio :label="20">重新入职</el-radio>
- <el-radio :label="21">返聘</el-radio>
+ <el-radio :label="21">重新入职</el-radio>
+ <el-radio :label="22">返聘</el-radio>
</el-radio-group>
（主要对已退休员工返聘）
</el-form-item>
@@ -973,7 +988,8 @@
empCardStatus: [],
handbookStatus: [],
entryType: [],
- empType: []
+ empType: [],
+ certificateList: []
}, // 查询参数
sort: {}, // 排序
pagination: { // 分页参数
@@ -1336,7 +1352,8 @@
handbookStatus: [],
baseKey: '',
empType: [],
- entryType: []
+ entryType: [],
+ certificateList: []
}
this.search()
},
@@ -2051,6 +2068,13 @@
this.queryParams.entryType = []
}
},
+ selectAllCertificateList(val) {
+ if (val) {
+ this.queryParams.certificateList = this.dicListToArr(this.certificateListOptions)
+ } else {
+ this.queryParams.certificateList = []
+ }
+ },
headers() {
const token = getToken()
if (token) {
@@ -2110,7 +2134,7 @@
empId: r.data.data.empId,
empName: r.data.data.empName,
certificateNumb: r.data.data.certificateNumb,
- openType: 20,
+ openType: 21,
openDate: this.getDateString(),
remark: ''
}
--
Gitblit v1.8.0