|
|
@@ -17,6 +17,10 @@
|
|
|
<el-option :key="item.dictValue" v-for="item in staffStatusList" :label="item.dictLabel" :value="item.dictValue">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
+ <el-select v-model="listQuery.lockStatus" clearable placeholder="初始积分领取状态" class="filter-item" style="width: 200px;">
|
|
|
+ <el-option :key="item.dictValue" v-for="item in lockStatusList" :label="item.dictLabel" :value="item.dictValue">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
<el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
|
|
|
<el-button class="filter-item" type="primary" :loading="downloadLoading" v-waves icon="el-icon-download" @click="handleDownload">导出</el-button>
|
|
|
|
|
|
@@ -28,7 +32,7 @@
|
|
|
<el-table-column type="index" label="序号" header-align="center" align="center">
|
|
|
</el-table-column>
|
|
|
|
|
|
- <el-table-column align="center" min-width="80px" label="员工姓名" prop="userName">
|
|
|
+ <el-table-column align="center" min-width="70px" label="员工姓名" prop="userName">
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column align="center" min-width="200px" label="公司主体" prop="companyName">
|
|
|
@@ -37,11 +41,13 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" min-width="120px" label="入职时间" prop="realEntryDate">
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" min-width="120px" label="出生日期" prop="staffbirthday">
|
|
|
+ <el-table-column align="center" min-width="100px" label="出生日期" prop="staffbirthday">
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" min-width="80px" label="积分" prop="integral">
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" min-width="80px" label="员工状态" prop="staffStatusName">
|
|
|
+ <el-table-column align="center" min-width="70px" label="员工状态" prop="staffStatusName">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="center" min-width="120px" label="初始积分领取状态" prop="lockStatusName">
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" label="操作" min-width="100px" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -125,6 +131,7 @@ export default {
|
|
|
directives: { waves },
|
|
|
data() {
|
|
|
return {
|
|
|
+ lockStatusList:[],
|
|
|
staffStatusList: [],
|
|
|
companyTypeList: [
|
|
|
|
|
|
@@ -152,6 +159,7 @@ export default {
|
|
|
deptId: '',
|
|
|
userName: '',
|
|
|
staffStatus: '',
|
|
|
+ lockStatus:'',
|
|
|
},
|
|
|
itemListQuery: {
|
|
|
page: 1,
|
|
|
@@ -166,9 +174,15 @@ export default {
|
|
|
this.getCompanyTypeList();
|
|
|
this.getDepTypeList();
|
|
|
this.getStaffStatusList();
|
|
|
+ this.getLockStatusListList();
|
|
|
this.getList();
|
|
|
},
|
|
|
methods: {
|
|
|
+ getLockStatusListList(){
|
|
|
+ dataTypeList({dictType:'lock_status'}).then(response => {
|
|
|
+ this.lockStatusList = response.data.data;
|
|
|
+ })
|
|
|
+ },
|
|
|
getStaffStatusList(){
|
|
|
dataTypeList({dictType:'staff_status'}).then(response => {
|
|
|
this.staffStatusList = response.data.data;
|
