From 2402f7902663a20fe1b66f4305abb5ba05d7016f Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 18 三月 2021 16:02:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/inemployees.vue | 86 +++++++++++++++++++++++++++++++------------
1 files changed, 62 insertions(+), 24 deletions(-)
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index d60901b..89cb548 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"-->
@@ -254,8 +254,8 @@
<el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" 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="60" :formatter="sexFormat" />
- <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="education" label="学历" width="60" :formatter="educationFormat" />
+ <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip="true" prop="education" label="学历" width="80" :formatter="educationFormat" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip="true" prop="nativePlace" label="籍贯" width="70" :formatter="nativePlaceFormat" />
<el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="110" />
<el-table-column show-overflow-tooltip="true" prop="empTypeName" label="员工类型" width="80" />
@@ -265,7 +265,11 @@
{{ transEmpStatus(row.empStatus) }}
</template>
</el-table-column>
- <el-table-column prop="entryTypeName" label="入职类型" width="80" />
+ <el-table-column prop="entryType" label="入职类型" width="120" sortable="custom" :sort-orders="['ascending', 'descending']">
+ <template slot-scope="{row}">
+ {{ transEntryType(row.entryType) }}
+ </template>
+ </el-table-column>
</el-table>
<pagination
v-show="total>0"
@@ -630,21 +634,21 @@
<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>
- <el-col v-if="selectDimissionType === 2" span="12">
+ <el-col v-if="selectDimissionType === 4" span="12">
<el-form-item label="自离天数" prop="selfLeaveDay">
<el-input v-model="gbdaForm.selfLeaveDay" onkeyup="value=value.replace(/[^0-9.]/g,'')" />
</el-form-item>
</el-col>
- <el-col v-if="selectDimissionType === 2" span="12">
+ <el-col v-if="selectDimissionType === 4" span="12">
<el-form-item label="报告人" prop="reporter">
<el-input v-model="gbdaForm.reporter" />
</el-form-item>
@@ -855,6 +859,20 @@
<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>
<!-- <tr>-->
<!-- <td>家庭成员及关系</td>-->
<!-- <td>-->
@@ -891,8 +909,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>
@@ -1013,7 +1031,8 @@
modifier: '',
delFlag: '0',
empStatus: 0,
- version: ''
+ version: '',
+ entryType: '20'
},
ygdgForm: {
empIds: [],
@@ -1167,7 +1186,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', 'empNumb'],
checkedCities: [],
tableData: [],
selectDimissionType: 1,
@@ -1197,7 +1216,7 @@
dimissionTypeOptions: [],
ageStrOptions: [],
sexOptions: [],
- openArchivesForm: {}
+ openArchivesForm: { }
}
},
mounted() {
@@ -1360,6 +1379,16 @@
return '离职'
case '2':
return '退休'
+ }
+ },
+ transEntryType(entryType) {
+ switch (entryType) {
+ case '20':
+ return '新入职'
+ case '21':
+ return '重新入职'
+ case '22':
+ return '返聘入职'
}
},
typeFormat(row, column) {
@@ -1597,7 +1626,8 @@
this.empBaseInfoForm.modifier = row.modifier
this.empBaseInfoForm.delFlag = row.delFlag
this.empBaseInfoForm.version = row.version
- this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + row.empId
+ // this.empBaseInfoImageUrl = ''
+ this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + row.empId + '?t=' + parseInt(100 * Math.random())
this.showXzyg(1)
},
putEmpBase(formName) {
@@ -1816,7 +1846,6 @@
},
changeDimissionType(value) {
this.selectDimissionType = value
- console.log('值:' + value)
},
validSelfLeaveDay(rule, value, callback) {
const type = this.gbdaForm.dimissionType
@@ -2004,7 +2033,7 @@
},
selectAllEntryType(val) {
if (val) {
- this.queryParams.entryType = [4, 5, 6]
+ this.queryParams.entryType = [20, 21, 22]
} else {
this.queryParams.entryType = []
}
@@ -2038,13 +2067,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 +2097,7 @@
empId: r.data.data.empId,
empName: r.data.data.empName,
certificateNumb: r.data.data.certificateNumb,
- openType: 2,
+ openType: 20,
openDate: this.getDateString(),
remark: ''
}
--
Gitblit v1.8.0