|
|
@@ -34,15 +34,15 @@
|
|
|
|
|
|
<el-table-column align="center" min-width="70px" label="员工姓名" prop="userName">
|
|
|
</el-table-column>
|
|
|
-
|
|
|
+ <el-table-column align="center" min-width="100px" label="员工账号" prop="loginId">
|
|
|
+ </el-table-column>
|
|
|
<el-table-column align="center" min-width="200px" label="公司主体" prop="companyName">
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" min-width="200px" label="部门" prop="deptName">
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" min-width="120px" label="入职时间" prop="realEntryDate">
|
|
|
</el-table-column>
|
|
|
- <!-- <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="70px" label="员工状态" prop="staffStatusName">
|
|
|
@@ -164,7 +164,6 @@ export default {
|
|
|
itemListQuery: {
|
|
|
page: 1,
|
|
|
limit: 10,
|
|
|
- userId: '',
|
|
|
type: '',
|
|
|
},
|
|
|
dialogFormVisible: false,
|
|
|
@@ -189,10 +188,10 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
handleDownload() {
|
|
|
- window.location.href = process.env.BASE_API + '/mall-integral/export/user/page?companyId=' + this.listQuery.companyId + '&deptId=' + this.listQuery.deptId + '&userName=' + this.listQuery.userName + '&createTime=' + this.listQuery.createTime;
|
|
|
+ window.location.href = process.env.BASE_API + '/mall-integral/export/user/page?companyId=' + this.listQuery.companyId + '&deptId=' + this.listQuery.deptId + '&userName=' + this.listQuery.userName + '&lockStatus=' + this.listQuery.lockStatus+ '&staffStatus=' + this.listQuery.staffStatus;
|
|
|
},
|
|
|
handleItemDownload() {
|
|
|
- window.location.href = process.env.BASE_API + '/mall-integral/export/user/log?userId=' + this.itemListQuery.userId + '&type=' + this.itemListQuery.type;
|
|
|
+ window.location.href = process.env.BASE_API + '/mall-integral/export/user/log?type=' + this.itemListQuery.type;
|
|
|
},
|
|
|
getCompanyTypeList() {
|
|
|
companyTypeList().then(response => {
|
