From 9d8df3f4cfdf8fab10f8dd5057ee4cb58a9c2f84 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期三, 10 三月 2021 02:56:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/search.vue | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 12e5e8d..7605127 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -235,13 +235,24 @@
</tr>
<tr>
<td class="td">入离职类型：</td>
- <td class="td-group" />
+ <td class="td-group">
+ <el-checkbox-group v-model="queryParams.inOutType" class="fj-checkbox">
+ <el-checkbox label="" @change="selectAllDimissionType">全部</el-checkbox>
+ <el-checkbox
+ v-for="data in dimissionTypeOptions"
+ :key="data.dicItemName"
+ :label="data.dicItemCode"
+ >
+ {{ data.dicItemName }}
+ </el-checkbox>
+ </el-checkbox-group>
+ </td>
</tr>
</table>
</div>
<el-row>
<el-col :span="21" style="line-height: 50px;">
- 已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
+ 已为您搜索出<span style="color:#ff0000">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3" style="text-align: right;padding-right: 10px">
<el-button class="hr-but-all" type="success" @click.native="showDcyg(0)">
@@ -263,7 +274,7 @@
<el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="140" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" />
<el-table-column show-overflow-tooltip prop="sex" label="性别" width="60" :formatter="sexFormat" />
<el-table-column show-overflow-tooltip prop="age" label="年龄" width="60" />
<el-table-column show-overflow-tooltip prop="education" label="学历" width="80" :formatter="educationFormat" />
@@ -275,6 +286,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="entryDate" label="入职日期" width="120" />
<el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="120" />
</el-table>
@@ -1946,7 +1958,8 @@
empNumb: '',
empName: '',
certificateNumb: '',
- jobContent: ''
+ jobContent: '',
+ inOutType: []
}, // 查询参数
sort: {}, // 排序
pagination: { // 分页参数
@@ -2642,6 +2655,13 @@
this.queryParams.empStatus = []
}
},
+ selectAllDimissionType(val) {
+ if (val) {
+ this.queryParams.inOutType = ['1', '2', '3', '4', '5', '6']
+ } else {
+ this.queryParams.inOutType = []
+ }
+ },
exportExcel(params = {}) {
params.pageSize = this.pagination.size
params.pageNum = this.pagination.num
@@ -2759,11 +2779,7 @@
case '0':
return '在职'
case '1':
- return '正常离职'
- case '2':
- return '自动离职'
- case '3':
- return '公司辞退'
+ return '离职'
}
},
transLeaveType(leaveType) {
--
Gitblit v1.8.0