|
|
@@ -184,6 +184,27 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="领导人" prop="leaderId">
|
|
|
+ <el-select
|
|
|
+ style="width: 200px"
|
|
|
+ v-model="formData.leaderId"
|
|
|
+ placeholder="请选择"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="val in leaderOptions"
|
|
|
+ :label="val.name"
|
|
|
+ :value="val.id"
|
|
|
+ :key="val.id"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="领导人工号" prop="leaderName">
|
|
|
+ <el-input v-model="formData.leaderId" disabled></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="离职时间" prop="logoutTime">
|
|
|
<el-date-picker value-format="yyyy-MM-dd" style="width:200px" v-model="formData.logoutTime" type="date" placeholder="选择日期">
|
|
|
@@ -488,6 +509,7 @@ export default {
|
|
|
//影像上传列表
|
|
|
imagesIdList:[],
|
|
|
dialogPassword:false, //密码是否显示明文
|
|
|
+ leaderOptions:[]
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -567,8 +589,14 @@ export default {
|
|
|
},
|
|
|
//联级选择器触发事件
|
|
|
handleChange(val) {
|
|
|
- if (val.length !== 0) {
|
|
|
+ if (val && val.length !== 0) {
|
|
|
+ this.formData.leaderId = "";
|
|
|
this.formData.deptId = val.at(-1);
|
|
|
+ this.$api.user
|
|
|
+ .findListByDeptId({ deptId: this.formData.deptId, })
|
|
|
+ .then((res) => {
|
|
|
+ this.leaderOptions = res.data;
|
|
|
+ });
|
|
|
}
|
|
|
},
|
|
|
|
|
|
@@ -617,7 +645,7 @@ export default {
|
|
|
// dto: { ...data, roleId: "20", deptId: this.deptId,agentFlag: "2", },
|
|
|
// })
|
|
|
this.$api.user
|
|
|
- .findUserList({dto,pageNum:this.pageData.pageNum,pageSize:this.pageData.pageSize})
|
|
|
+ .findBackUserList({dto,pageNum:this.pageData.pageNum,pageSize:this.pageData.pageSize})
|
|
|
.then((res) => {
|
|
|
res.data.records.forEach(val=>{
|
|
|
if(val.sex&& val.sex!==''&& val.sex!==null){
|
|
|
@@ -664,6 +692,11 @@ export default {
|
|
|
this.activeName = '1'
|
|
|
let res = await this.$api.user.getUserDatail(params.row.userId)
|
|
|
if (res.code == 200) {
|
|
|
+ this.$api.user
|
|
|
+ .findListByDeptId({ deptId: res.data.sysUser.deptId,id:params.row.userId })
|
|
|
+ .then((res) => {
|
|
|
+ this.leaderOptions = res.data;
|
|
|
+ });
|
|
|
res.data.sysUser.status += ''
|
|
|
this.formData = res.data.sysUser
|
|
|
if(this.formData.status==0){
|
|
|
@@ -709,6 +742,7 @@ export default {
|
|
|
})
|
|
|
.catch(() => {});
|
|
|
},
|
|
|
+
|
|
|
//添加人员
|
|
|
handleAddButton() {
|
|
|
// console.log(this.currentTreeNode.managementSource)
|
|
|
@@ -716,6 +750,11 @@ export default {
|
|
|
// this.$message.info("请选择所属公司或部门");
|
|
|
// return;
|
|
|
// }
|
|
|
+ this.$api.user
|
|
|
+ .findListByDeptId({ deptId: this.formData.deptId })
|
|
|
+ .then((res) => {
|
|
|
+ this.leaderOptions = res.data;
|
|
|
+ });
|
|
|
if (this.currentTreeNode == null) {
|
|
|
this.$message.info("请选择所属公司或部门");
|
|
|
return;
|
|
|
@@ -727,6 +766,7 @@ export default {
|
|
|
this.formData = {
|
|
|
roleId: '22',
|
|
|
status: '',
|
|
|
+ leaderId: "",
|
|
|
deptId: this.deptId
|
|
|
}
|
|
|
this.formDataDetail = {}
|
|
|
@@ -790,6 +830,9 @@ export default {
|
|
|
if(this.formData.positionId){
|
|
|
this.formData.positionName=this.postOption.find(val=>val.postId==this.formData.positionId).postName
|
|
|
}
|
|
|
+ if(this.formData.leaderId){
|
|
|
+ this.formData.leaderName=this.leaderOptions.find(val=>val.id==this.formData.leaderId).name
|
|
|
+ }
|
|
|
if (this.dialogTitle == '新增后线人员') {
|
|
|
this.$api.user.saveUserInfo({esmUserImageVo:this.imagesIdList, sysUser: this.formData, sysUserInfo: this.formDataDetail }).then((res) => {
|
|
|
if (res.code == 200) {
|