From c762da1052cc336399ffb77e2de5dc18585653a8 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 18 六月 2021 15:01:46 +0800
Subject: [PATCH] fix(bug修复): 打开档案默认为重新入职
---
src/views/user/outemployess.vue | 119 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 92 insertions(+), 27 deletions(-)
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index 6f93420..f7840fd 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -143,7 +143,7 @@
</td>
</tr>
<tr>
- <td class="td">保险类型：</td>
+ <td class="td">社保档位：</td>
<td class="td-group">
<el-checkbox-group v-model="queryParams.insuranceType" class="fj-checkbox">
<el-checkbox label="" @change="selectAllInsuranceType">全部</el-checkbox>
@@ -177,9 +177,12 @@
<td class="td-group">
<el-checkbox-group v-model="queryParams.dimissionType" class="fj-checkbox">
<el-checkbox label="" @change="selectAllDimissionType">全部</el-checkbox>
- <el-checkbox :label="1">正常离职</el-checkbox>
- <el-checkbox :label="2">自动离职</el-checkbox>
+ <el-checkbox :label="6">正常离职</el-checkbox>
+ <el-checkbox :label="4">自动离职</el-checkbox>
+ <el-checkbox :label="2">公司劝退</el-checkbox>
+ <el-checkbox :label="1">合同期满</el-checkbox>
<el-checkbox :label="3">公司辞退</el-checkbox>
+ <el-checkbox :label="5">试用期内</el-checkbox>
<!-- <el-checkbox-->
<!-- v-for="data in dimissionTypeOptions"-->
<!-- :key="data.dicItemName"-->
@@ -187,6 +190,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>
@@ -250,37 +268,43 @@
>编辑</span> -->
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip="true" prop="allDeptName" label="部门（护卫点）" width="280" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="160" />
- <el-table-column show-overflow-tooltip="true" prop="sex" label="性别" width="50" :formatter="sexFormat" />
- <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="50" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门（护卫点）" width="280" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
+ <el-table-column show-overflow-tooltip prop="age" label="年龄" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column
- show-overflow-tooltip="true"
+ show-overflow-tooltip
prop="education"
label="学历"
width="60"
:formatter="educationFormat"
+ ortable="custom"
+ :sort-orders="['ascending', 'descending']"
/>
- <el-table-column show-overflow-tooltip="true" prop="nativePlaceName" label="籍贯" width="70" />
- <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="110" />
+ <el-table-column show-overflow-tooltip prop="nativePlaceName" label="籍贯" width="70" />
+ <el-table-column show-overflow-tooltip prop="telePhone" label="联系电话" width="110" />
<el-table-column
- show-overflow-tooltip="true"
+ show-overflow-tooltip
prop="empType"
label="员工类型"
width="80"
:formatter="empTypeFormat"
/>
- <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="80">
+ <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="80">
<template slot-scope="{row}">
{{ transEmpStatus(row.empStatus) }}
</template>
</el-table-column>
- <el-table-column prop="dimissionTypeName" label="离职类型" width="80" />
+ <el-table-column prop="dimissionType" label="离职类型" width="120" sortable="custom" :sort-orders="['ascending', 'descending']">
+ <template slot-scope="{row}">
+ {{ transEntryType(row.dimissionType) }}
+ </template>
+ </el-table-column>
</el-table>
<pagination
v-show="total>0"
@@ -407,7 +431,7 @@
<tr>
<td>入职日期</td>
<td>2020-01-02</td>
- <td>保险类型</td>
+ <td>社保档位</td>
<td>深户（五险一档）</td>
<td>社保电脑号</td>
<td />
@@ -982,8 +1006,8 @@
<el-col span="24">
<el-form-item label="打开类型" prop="region">
<el-radio-group v-model="baseicInformationForm.openType">
- <el-radio :label="5">重新入职</el-radio>
- <el-radio :label="6">返聘</el-radio>
+ <el-radio :label="21">重新入职</el-radio>
+ <el-radio :label="22">返聘</el-radio>
</el-radio-group>
（主要对已退休员工返聘）
</el-form-item>
@@ -1153,7 +1177,7 @@
<td>
<el-checkbox label="entryDate"><span /></el-checkbox>
</td>
- <td>保险类型</td>
+ <td>社保档位</td>
<td>
<el-checkbox label="insuranceTypeName"><span /></el-checkbox>
</td>
@@ -1179,7 +1203,7 @@
<tr>
<td>相关证件</td>
<td>
- <el-checkbox label="certificateList"><span /></el-checkbox>
+ <el-checkbox label="certificateListName"><span /></el-checkbox>
</td>
<td>紧急联系电话</td>
<td>
@@ -1188,6 +1212,20 @@
<td>员工手册</td>
<td>
<el-checkbox label="handbookStatusName"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>入职类型</td>
+ <td>
+ <el-checkbox label="entryTypeName"><span /></el-checkbox>
+ </td>
+ <td>离职类型</td>
+ <td>
+ <el-checkbox label="dimissionTypeName"><span /></el-checkbox>
+ </td>
+ <td>编号</td>
+ <td>
+ <el-checkbox label="empNumb"><span /></el-checkbox>
</td>
</tr>
</el-checkbox-group>
@@ -1235,7 +1273,8 @@
insuranceType: [],
empStatus: [],
dimissionType: [],
- empType: []
+ empType: [],
+ certificateList: []
}, // 查询参数
sort: {}, // 排序
pagination: { // 分页参数
@@ -1265,7 +1304,7 @@
archivesStatusOptions: [],
sexOptions: [],
empTypeOptions: [],
- cityOptions: ['archivesNumb', 'allDeptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'insuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate'],
+ cityOptions: ['archivesNumb', 'allDeptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'insuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateListName', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName', 'empNumb'],
checkedCities: []
}
},
@@ -1291,6 +1330,9 @@
})
this.getDicts('EMPTYPE').then(response => {
this.empTypeOptions = response.data
+ })
+ this.getDicts('certificateList').then(response => {
+ this.certificateListOptions = response.data
})
},
methods: {
@@ -1393,6 +1435,22 @@
return '退休'
}
},
+ transEntryType(entryType) {
+ switch (entryType) {
+ case '1':
+ return '合同期满'
+ case '2':
+ return '公司劝退'
+ case '3':
+ return '公司辞退'
+ case '4':
+ return '自动离职'
+ case '5':
+ return '试用期内'
+ case '6':
+ return '正常离职'
+ }
+ },
transDimissionType(dimissionType) {
switch (dimissionType) {
case '1':
@@ -1468,7 +1526,7 @@
empId: id,
empName: name,
certificateNumb: number,
- openType: 2,
+ openType: 21,
openDate: year + '-' + month + '-' + day,
remark: ''
}
@@ -1592,7 +1650,7 @@
},
selectAllDimissionType(val) {
if (val) {
- this.queryParams.dimissionType = [1, 2, 3]
+ this.queryParams.dimissionType = [1, 2, 3, 4, 5, 6]
} else {
this.queryParams.dimissionType = []
}
@@ -1606,6 +1664,13 @@
this.checkedCities = val ? this.cityOptions : []
this.isIndeterminate = false
},
+ selectAllCertificateList(val) {
+ if (val) {
+ this.queryParams.certificateList = this.dicListToArr(this.certificateListOptions)
+ } else {
+ this.queryParams.certificateList = []
+ }
+ },
showDcyg(operate) {
switch (operate) {
case 0:
--
Gitblit v1.8.0