|
@@ -610,12 +610,17 @@ export default {
|
|
|
name:this.pageData.name,
|
|
name:this.pageData.name,
|
|
|
userId:this.pageData.userId,
|
|
userId:this.pageData.userId,
|
|
|
status:this.pageData.status,
|
|
status:this.pageData.status,
|
|
|
|
|
+ agentFlag:0,
|
|
|
roleId:'22',
|
|
roleId:'22',
|
|
|
}
|
|
}
|
|
|
|
|
+ // .findUserList({
|
|
|
|
|
+ // ...this.pageData,
|
|
|
|
|
+ // dto: { ...data, roleId: "20", deptId: this.deptId,agentFlag: "2", },
|
|
|
|
|
+ // })
|
|
|
this.$api.user
|
|
this.$api.user
|
|
|
- .findPage({dto,pageNum:this.pageData.pageNum,pageSize:this.pageData.pageSize})
|
|
|
|
|
|
|
+ .findUserList({dto,pageNum:this.pageData.pageNum,pageSize:this.pageData.pageSize})
|
|
|
.then((res) => {
|
|
.then((res) => {
|
|
|
- res.data.content.forEach(val=>{
|
|
|
|
|
|
|
+ res.data.records.forEach(val=>{
|
|
|
if(val.sex&& val.sex!==''&& val.sex!==null){
|
|
if(val.sex&& val.sex!==''&& val.sex!==null){
|
|
|
val.sex=this.sexoptions.find(ele=>ele.value==val.sex).label
|
|
val.sex=this.sexoptions.find(ele=>ele.value==val.sex).label
|
|
|
}
|
|
}
|
|
@@ -624,7 +629,13 @@ export default {
|
|
|
}
|
|
}
|
|
|
val.roleId=val.roleName
|
|
val.roleId=val.roleName
|
|
|
})
|
|
})
|
|
|
- this.pageResult = res.data;
|
|
|
|
|
|
|
+ this.pageResult = {
|
|
|
|
|
+ content: res.data.records,
|
|
|
|
|
+ pageNum: res.data.current,
|
|
|
|
|
+ pageSize: res.data.size,
|
|
|
|
|
+ totalPages: res.data.pages,
|
|
|
|
|
+ totalSize: res.data.total,
|
|
|
|
|
+ };
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
},
|
|
},
|