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

去掉接口机构的查询

Browse Source
This commit is contained in:
daihh
2022-12-05 23:40:25 +08:00
parent a55182b27d
commit 94cf379aad
3 changed files with 180 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -598,32 +598,32 @@ export default {
}), }),
loadUserGroup(){ loadUserGroup(){
let $this=this; let $this=this;
// apiUserGroup.findByName('').then(rs=>{ apiUserGroup.findByName('').then(rs=>{
// if(rs.status==200){
// let crowdList=[];
// rs.result.forEach(item=>{
// crowdList.push({
// id:item.key,
// name:item.value,
// disabled:false
// })
// })
// this.userGroupList=crowdList;
// }
// });
apiUserBasic.getUserCrowds().then(rs=>{
if(rs.status==200){ if(rs.status==200){
let crowdList=[]; let crowdList=[];
rs.result.forEach(item=>{ rs.result.forEach(item=>{
crowdList.push({ crowdList.push({
id:item.kid, id:item.key,
name:item.audienceName, name:item.value,
disabled:false disabled:false
}) })
}); })
this.userGroupList=crowdList; this.userGroupList=crowdList;
} }
}) });
// apiUserBasic.getUserCrowds().then(rs=>{
// if(rs.status==200){
// let crowdList=[];
// rs.result.forEach(item=>{
// crowdList.push({
// id:item.kid,
// name:item.audienceName,
// disabled:false
// })
// });
// this.userGroupList=crowdList;
// }
// })
}, },
resOwnerName(code) { resOwnerName(code) {
if (code == '') { if (code == '') {
@@ -719,20 +719,20 @@ export default {
} }
this.orgKid=''; this.orgKid='';
if(this.courseInfo.orgId){ if(this.courseInfo.orgId){
// apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{ apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{
// if(rrs.status==200){ if(rrs.status==200){
// this.orgName=rrs.result.name; this.orgName=rrs.result.name;
// this.orgKid=rrs.result.kid; this.orgKid=rrs.result.kid;
// this.orgNamePath=rrs.result.namePath; this.orgNamePath=rrs.result.namePath;
// }
// });
apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rs=>{
if(rs.status==200){
this.orgName=rs.result.name;
//this.orgKid=rs.result.kid;
this.orgNamePath=rs.result.namePath;
} }
}); });
// apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rs=>{
// if(rs.status==200){
// this.orgName=rs.result.name;
// //this.orgKid=rs.result.kid;
// this.orgNamePath=rs.result.namePath;
// }
// });
} }
} else { } else {
@@ -839,42 +839,49 @@ export default {
apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{ apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{
if(ors.status==200){ if(ors.status==200){
$this.courseInfo.orgId=ors.result.id; $this.courseInfo.orgId=ors.result.id;
apiUserBasic.getOrgInfo(ors.result.id).then(rrs=>{ apiOrg.getSimple(ors.result.id).then(rrs=>{
if(rrs.status==200){ if(rrs.status==200){
$this.orgName=rrs.result.name; $this.orgName=rrs.result.name;
//$this.orgKid=rrs.result.kid; $this.orgKid=rrs.result.kid;
$this.orgNamePath=rrs.result.namePath; $this.orgNamePath=rrs.result.namePath;
}else{
this.courseInfo.orgId='';
//this.$message.error('资源归属已变更，请重新选择');
} }
}) })
// apiUserBasic.getOrgInfo(ors.result.id).then(rrs=>{
// if(rrs.status==200){
// $this.orgName=rrs.result.name;
// //$this.orgKid=rrs.result.kid;
// $this.orgNamePath=rrs.result.namePath;
// }else{
// this.courseInfo.orgId='';
// //this.$message.error('资源归属已变更，请重新选择');
// }
// })
}else{ }else{
//this.$message.error('无机构关联，不需要提示'); //this.$message.error('无机构关联，不需要提示');
} }
}) })
}else{ }else{
// apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{ apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{
// if(rrs.status==200){ if(rrs.status==200){
// $this.orgName=rrs.result.name; $this.orgName=rrs.result.name;
// $this.orgKid=rrs.result.kid; $this.orgKid=rrs.result.kid;
// $this.orgNamePath=rrs.result.namePath; $this.orgNamePath=rrs.result.namePath;
// }else{
// $this.courseInfo.orgId='';
// $this.$message.error('资源归属已变更，请重新选择');
// }
// });
apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rs=>{
if(rs.status==200){
$this.orgName=rs.result.name;
//$this.orgKid=rs.result.kid;
$this.orgNamePath=rs.result.namePath;
}else{ }else{
$this.courseInfo.orgId=''; $this.courseInfo.orgId='';
$this.$message.error('资源归属已变更，请重新选择'); $this.$message.error('资源归属已变更，请重新选择');
} }
}); });
// apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rs=>{
// if(rs.status==200){
// $this.orgName=rs.result.name;
// //$this.orgKid=rs.result.kid;
// $this.orgNamePath=rs.result.namePath;
// }else{
// $this.courseInfo.orgId='';
// $this.$message.error('资源归属已变更，请重新选择');
// }
// });
} }
this.resOwnerArray=[]; this.resOwnerArray=[];
@@ -1403,29 +1410,29 @@ 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;

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

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