From 7778cbbc0dc3f72b9973701d08858566309fe329 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 03:24:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/search.vue | 24 ++++++++++--
src/views/user/inemployees.vue | 49 +++++++++++++++++-------
src/layout/components/Navbar.vue | 4 +
src/views/user/outemployess.vue | 30 ++++++++++-----
4 files changed, 77 insertions(+), 30 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 43a4550..a850e20 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -104,7 +104,9 @@
}).then(() => {
db.remove('USER_ROUTER')
db.remove('PERMISSIONS')
- location.reload()
+ this.$get('system/dic/deleteCache').then((r) => {
+ location.reload()
+ })
}).catch(() => {
// do nothing
})
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index f8c8d6a..b546192 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -188,9 +188,9 @@
<td class="td-group">
<el-checkbox-group v-model="queryParams.entryType" class="fj-checkbox">
<el-checkbox label="" @change="selectAllEntryType">全部</el-checkbox>
- <el-checkbox :label="4">新入职</el-checkbox>
- <el-checkbox :label="5">最新入职</el-checkbox>
- <el-checkbox :label="6">返聘入职</el-checkbox>
+ <el-checkbox :label="20">新入职</el-checkbox>
+ <el-checkbox :label="21">最新入职</el-checkbox>
+ <el-checkbox :label="22">返聘入职</el-checkbox>
<!-- <el-checkbox-->
<!-- v-for="data in dimissionTypeOptions"-->
<!-- :key="data.dicItemName"-->
@@ -630,12 +630,12 @@
<el-col span="24">
<el-form-item label="离职类型" prop="dimissionType">
<el-radio-group v-model="gbdaForm.dimissionType" @change="changeDimissionType">
- <el-radio :label="1">正常离职</el-radio>
- <el-radio :label="2">自动离职</el-radio>
+ <el-radio :label="1">合同期满</el-radio>
+ <el-radio :label="2">公司劝退</el-radio>
<el-radio :label="3">公司辞退</el-radio>
- <el-radio :label="7">合同期满</el-radio>
- <el-radio :label="8">公司劝退</el-radio>
- <el-radio :label="9">试用期内</el-radio>
+ <el-radio :label="4">自动离职</el-radio>
+ <el-radio :label="5">试用期内</el-radio>
+ <el-radio :label="6">正常离职</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -855,6 +855,16 @@
<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>
+ </tr>
<!-- <tr>-->
<!-- <td>家庭成员及关系</td>-->
<!-- <td>-->
@@ -891,8 +901,8 @@
<el-col span="24">
<el-form-item label="打开类型" prop="region">
<el-radio-group v-model="openArchivesForm.openType">
- <el-radio :label="5">重新入职</el-radio>
- <el-radio :label="6">返聘</el-radio>
+ <el-radio :label="20">重新入职</el-radio>
+ <el-radio :label="21">返聘</el-radio>
</el-radio-group>
（主要对已退休员工返聘）
</el-form-item>
@@ -1167,7 +1177,7 @@
exportUrl: '',
checkAll: false,
isIndeterminate: false,
- 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', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName'],
checkedCities: [],
tableData: [],
selectDimissionType: 1,
@@ -2004,7 +2014,7 @@
},
selectAllEntryType(val) {
if (val) {
- this.queryParams.entryType = [4, 5, 6]
+ this.queryParams.entryType = [20, 21, 22]
} else {
this.queryParams.entryType = []
}
@@ -2038,13 +2048,22 @@
let tempName
switch (r.data.data.dimissionType) {
case '1':
- tempName = '正常离职'
+ tempName = '合同期满'
break
case '2':
- tempName = '自动离职'
+ tempName = '公司劝退'
break
case '3':
tempName = '公司辞退'
+ break
+ case '4':
+ tempName = '自动离职'
+ break
+ case '5':
+ tempName = '试用期内'
+ break
+ case '6':
+ tempName = '正常离职'
break
}
var msg = '该员工已存在，' + tempName + '状态!\n\r'
@@ -2059,7 +2078,7 @@
empId: r.data.data.empId,
empName: r.data.data.empName,
certificateNumb: r.data.data.certificateNumb,
- openType: 5,
+ openType: 20,
openDate: this.getDateString(),
remark: ''
}
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index 5ac92c5..65881ab 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -177,12 +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="3">公司辞退</el-checkbox>
- <el-checkbox :label="7">合同期满</el-checkbox>
- <el-checkbox :label="8">公司劝退</el-checkbox>
- <el-checkbox :label="9">试用期内</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"-->
@@ -985,8 +985,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>
@@ -1193,6 +1193,16 @@
<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>
+ </tr>
</el-checkbox-group>
</table>
<div slot="footer" class="dialog-footer">
@@ -1268,7 +1278,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', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName'],
checkedCities: []
}
},
@@ -1595,7 +1605,7 @@
},
selectAllDimissionType(val) {
if (val) {
- this.queryParams.dimissionType = [1, 2, 3]
+ this.queryParams.dimissionType = [1, 2, 3, 4, 5, 6]
} else {
this.queryParams.dimissionType = []
}
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index f22c194..b232469 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -287,8 +287,7 @@
{{ transEmpStatus(row.empStatus) }}
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="dimissionTypeName" label="离职类型" width="100" />
- <el-table-column show-overflow-tooltip prop="entryTypeName" label="入职日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="dimissionTypeName" label="入离职类型" width="100" :formatter="dimissionTypFormat" />
<el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
</el-table>
@@ -468,6 +467,16 @@
<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>
</tr>
</el-checkbox-group>
@@ -1467,7 +1476,6 @@
<el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
<el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="80" />
<el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
- <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="120" />
<el-table-column show-overflow-tooltip prop="hrDoDate" label="人事处理时间" width="120" />
<el-table-column show-overflow-tooltip prop="settleStatus" label="状态" width="80" :formatter="settleStatusFormat" />
<el-table-column show-overflow-tooltip prop="settleDate" label="结案时间" width="100" />
@@ -1955,7 +1963,7 @@
},
data() {
return {
- 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', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName'],
dialogShowDcyg: false,
isIndeterminate: false,
checkedCities: [],
@@ -2421,6 +2429,14 @@
arbitrationStatusFormat(row, column) {
return this.selectDictLabel(this.settleStatusOptions, row.arbitrationStatus)
},
+ dimissionTypFormat(row, column) {
+ switch (row.empStatus) {
+ case '0':
+ return row.entryTypeName
+ case '1':
+ return row.dimissionTypeName
+ }
+ },
handleCheckedCitiesChange(value) {
const checkedCount = value.length
this.checkAll = checkedCount === this.cityOptions.length
--
Gitblit v1.8.0