hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-12 04:16:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

还原组织机构及hrbp审核

Browse Source
This commit is contained in:
daihh
2022-11-23 18:40:13 +08:00
parent 670c779825
commit 4e3397d950
3 changed files with 131 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/components/Course/courseForm.vue
View File

@@ -560,10 +560,10 @@ export default {
}, },
confirmChooseOrg(orgInfo){ confirmChooseOrg(orgInfo){
//console.log(orgInfo,'orgInfo'); //console.log(orgInfo,'orgInfo');
if(!orgInfo.hrbpId || orgInfo.hrbpId=='0'){ // if(!orgInfo.hrbpId || orgInfo.hrbpId=='0'){
this.$message.error("此机构无HRBP审核人信息，请重新选择"); // this.$message.error("此机构无HRBP审核人信息，请重新选择");
return; // return;
} // }
this.orgName=orgInfo.name; this.orgName=orgInfo.name;
this.orgKid=orgInfo.kid; //kid已不存在 this.orgKid=orgInfo.kid; //kid已不存在
this.courseInfo.orgId=orgInfo.id; this.courseInfo.orgId=orgInfo.id;
@@ -1383,28 +1383,28 @@ export default {
let $this = this; let $this = this;
console.log(this.courseInfo.orgId,'this.courseInfo.orgId') console.log(this.courseInfo.orgId,'this.courseInfo.orgId')
//先获取HRBP审核 人员信息，姓名，机构路径，工号，用于邮件中的信息 //先获取HRBP审核 人员信息，姓名，机构路径，工号，用于邮件中的信息
apiUserBasic.getOrgHrbpInfo(this.courseInfo.orgId).then(rs=>{ // apiUserBasic.getOrgHrbpInfo(this.courseInfo.orgId).then(rs=>{
if(rs.status==200 && rs.result){ // if(rs.status==200 && rs.result){
postData.auditUser={
email:rs.result.email,
code:rs.result.userNo,
name:rs.result.name,
aid:rs.result.id,
orgId:rs.result.orgId
}
postData.course.orgName=rs.result.orgNamePath+'/'+rs.result.orgName;
// apiHRBP.getHRBP(this.orgKid).then(rs=>{
// if(rs.status==200 && rs.result.length>0){
// let hrbpUser=rs.result[0];
// postData.auditUser={ // postData.auditUser={
// email:hrbpUser.email, // email:rs.result.email,
// code:hrbpUser.user_no, // code:rs.result.userNo,
// name:hrbpUser.real_name, // name:rs.result.name,
// kid:hrbpUser.user_id, // aid:rs.result.id,
// orgId:hrbpUser.orgnization_id // orgId:rs.result.orgId
// } // }
// postData.course.orgName=hrbpUser.orgnization_name_path+'/'+$this.orgName; // postData.course.orgName=rs.result.orgNamePath+'/'+rs.result.orgName;
apiHRBP.getHRBP(this.orgKid).then(rs=>{
if(rs.status==200 && rs.result.length>0){
let hrbpUser=rs.result[0];
postData.auditUser={
email:hrbpUser.email,
code:hrbpUser.user_no,
name:hrbpUser.real_name,
kid:hrbpUser.user_id,
orgId:hrbpUser.orgnization_id
}
postData.course.orgName=hrbpUser.orgnization_name_path+'/'+$this.orgName;
apiCourse.submitCourse(postData).then(res => { apiCourse.submitCourse(postData).then(res => {
//this.btnLoading=false; //this.btnLoading=false;

87
src/components/System/chooseOrg.vue
View File

@@ -106,56 +106,57 @@
}else{ }else{
let $this=this; let $this=this;
if(node.level === 1){ if(node.level === 1){
apiUserBasic.findOrgsByKeyword('').then(rs=>{ parentId = '-1';
let treeList=[]; // apiUserBasic.findOrgsByKeyword('').then(rs=>{
rs.result.forEach(item=>{ // let treeList=[];
let node={ // rs.result.forEach(item=>{
id:item.id, // let node={
name:item.name, // id:item.id,
hrbpId:item.hrbpId, // name:item.name,
children:[] // hrbpId:item.hrbpId,
} // children:[]
treeList.push(node); // }
}); // treeList.push(node);
resolve(treeList); // });
}); // resolve(treeList);
// });
}else{ }else{
parentId = node.data.id; parentId = node.data.id;
apiUserBasic.findOrgTreeByOrgId(parentId).then(rs=>{ // apiUserBasic.findOrgTreeByOrgId(parentId).then(rs=>{
if(rs.status==200){ // if(rs.status==200){
let treeList=[]; // let treeList=[];
if(rs.result.length>0 && rs.result[0].treeChildList){ // if(rs.result.length>0 && rs.result[0].treeChildList){
rs.result[0].treeChildList.forEach(item=>{ // rs.result[0].treeChildList.forEach(item=>{
let node={ // let node={
id:item.id, // id:item.id,
name:item.name, // name:item.name,
hrbpId:item.hrbpId, // hrbpId:item.hrbpId,
children:[] // children:[]
} // }
if(item.treeChildList){ // if(item.treeChildList){
$this.readTreeNode(node,item.treeChildList); // $this.readTreeNode(node,item.treeChildList);
} // }
treeList.push(node); // treeList.push(node);
}); // });
} // }
resolve(treeList); // resolve(treeList);
}else{
resolve([]);
}
});
}
// usergroupApi.userOrgs(parentId).then(res =>{
// if (res.status == 200) {
// if(res.result != null && res.result.length > 0){
// resolve(res.result);
// }else{ // }else{
// resolve([]); // resolve([]);
// } // }
// }else{
// this.$message.error('查询用户的机构失败');
// }
// }); // });
} }
usergroupApi.userOrgs(parentId).then(res =>{
if (res.status == 200) {
if(res.result != null && res.result.length > 0){
resolve(res.result);
}else{
resolve([]);
}
}else{
this.$message.error('查询用户的机构失败');
}
});
}
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;

84
src/views/course/TeacherList.vue
View File

@@ -208,48 +208,18 @@ export default {
type: 'warning' type: 'warning'
}).then(()=>{ }).then(()=>{
//新的提交流程 //新的提交流程
apiUserBasic.getOrgHrbpInfo(row.orgId).then(rs=>{ // apiUserBasic.getOrgHrbpInfo(row.orgId).then(rs=>{
if(rs.status==200 && rs.result){ // if(rs.status==200 && rs.result){
let req={
courseId:row.id,
email:rs.result.email,
courseUser:row.sysCreateBy,
courseName:row.name,
ucode:rs.result.userNo,
auditUser:rs.result.name,
//ukid:hrbpUser.user_id,
orgId:row.orgId,
orgName:rs.result.orgNamePath +'/'+rs.result.name
}
apiCourse.sumbits(req).then(res=>{
if(res.status==200){
$this.$message.success('提交成功');
row.status=2
}
if(res.status==400){
$this.$message.error('提交失败:'+res.message);
}
})
}else{
$this.$message.error("获取HRBP审核人员失败:"+rs.message);
}
});
// apiOrg.getSimple(row.orgId).then(rrs=>{
// if(rrs.status==200){
// apiHRBP.getHRBP(rrs.result.kid).then(rs=>{
// if(rs.status==200 && rs.result.length>0){
// let hrbpUser=rs.result[0];
// let req={ // let req={
// courseId:row.id, // courseId:row.id,
// email:hrbpUser.email, // email:rs.result.email,
// courseUser:row.sysCreateBy, // courseUser:row.sysCreateBy,
// courseName:row.name, // courseName:row.name,
// ucode:hrbpUser.user_no, // ucode:rs.result.userNo,
// auditUser:hrbpUser.real_name, // auditUser:rs.result.name,
// ukid:hrbpUser.user_id, // //ukid:hrbpUser.user_id,
// orgId:row.orgId, // orgId:row.orgId,
// orgName:rs.result.orgnization_name_path+'/'+rrs.result.name // orgName:rs.result.orgNamePath +'/'+rs.result.name
// } // }
// apiCourse.sumbits(req).then(res=>{ // apiCourse.sumbits(req).then(res=>{
// if(res.status==200){ // if(res.status==200){
@@ -263,11 +233,41 @@ export default {
// }else{ // }else{
// $this.$message.error("获取HRBP审核人员失败:"+rs.message); // $this.$message.error("获取HRBP审核人员失败:"+rs.message);
// } // }
// }) // });
// }else{
// $this.$message.error("处理资源归属失败，请重新设置资源归属"); apiOrg.getSimple(row.orgId).then(rrs=>{
// } if(rrs.status==200){
// }) apiHRBP.getHRBP(rrs.result.kid).then(rs=>{
if(rs.status==200 && rs.result.length>0){
let hrbpUser=rs.result[0];
let req={
courseId:row.id,
email:hrbpUser.email,
courseUser:row.sysCreateBy,
courseName:row.name,
ucode:hrbpUser.user_no,
auditUser:hrbpUser.real_name,
ukid:hrbpUser.user_id,
orgId:row.orgId,
orgName:rs.result.orgnization_name_path+'/'+rrs.result.name
}
apiCourse.sumbits(req).then(res=>{
if(res.status==200){
$this.$message.success('提交成功');
row.status=2
}
if(res.status==400){
$this.$message.error('提交失败:'+res.message);
}
})
}else{
$this.$message.error("获取HRBP审核人员失败:"+rs.message);
}
})
}else{
$this.$message.error("处理资源归属失败，请重新设置资源归属");
}
})
}) })
}, },
delItem(row) { delItem(row) {