diff --git a/src/api/boe/HRBP.js b/src/api/boe/HRBP.js new file mode 100644 index 00000000..6b38359a --- /dev/null +++ b/src/api/boe/HRBP.js @@ -0,0 +1,15 @@ +import ajax from '@/api/boe/boeApiAjax.js' + +/** + * 获取课程审核的 HRBP 审核 人信息 + * 机构的id + * organization_id + */ +const getHRBP = function(orgId) { + return ajax.get('/b1/system/user/org-hrbp?organization_id='+orgId); +} + + +export default { + getHRBP +} diff --git a/src/api/modules/course.js b/src/api/modules/course.js index a647c86d..143c1879 100644 --- a/src/api/modules/course.js +++ b/src/api/modules/course.js @@ -274,13 +274,18 @@ const countWaitAudit = function() { } /** - * 当前用户需要审核的课程列表 + * 管理员需要审核的课程列表 * @param {Object} query 同pageList */ const auditList = function(query) { return ajax.post('/xboe/m/course/manage/audit-pagelist', query); } +/**教师需要审核的课程列表*/ +const teacherAuditList = function(query) { + return ajax.post('/xboe/m/course/audit/teacher-course', query); +} + /** * 指定审核人,转审核人 * 点击“转审” 弹出教师查询窗口,查询教师,填写备注,提交,调用此接口 @@ -430,6 +435,7 @@ export default { getHomework, countWaitAudit, auditList, + teacherAuditList, auditAppoint, getAuditInfo, getAuditLogs, diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 38dd03b7..c4dc5669 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -1158,13 +1158,14 @@ export default { let $this = this; //先获取课程内容 apiHRBP.getHRBP(this.orgKid).then(rs=>{ - if(rs.status==200){ + if(rs.status==200 && rs.result.length>0){ + let hrbpUser=rs.result[0]; postData.auditUser={ - email:rs.result.email, - code:rs.result.user_no, - name:rs.result.real_name, - kid:rs.result.user_id, - orgId:rs.result.orgnization_id, + email:hrbpUser.email, + code:hrbpUser.user_no, + name:hrbpUser.real_name, + kid:hrbpUser.user_id, + orgId:hrbpUser.orgnization_id } apiCourse.submitCourse(postData).then(res => { //this.btnLoading=false; diff --git a/src/views/course/WaitAudit.vue b/src/views/course/WaitAudit.vue index c27bff49..6b2ed9a6 100644 --- a/src/views/course/WaitAudit.vue +++ b/src/views/course/WaitAudit.vue @@ -5,7 +5,7 @@ - + @@ -14,6 +14,7 @@ + 搜索 重置 - + - -
-
-
搜索
-
-
- - - - - - - - - -
- -
@@ -229,6 +199,7 @@ export default { examin:{ detailType: '', examineId: '', + auditId:'', examineName: '', }, paperJson:{items:[]}, @@ -304,15 +275,7 @@ export default { this.loadSysTypes(); }, methods: { - remarksInterception(info){ - let name = ''; - if(info == '' || info == null || info == undefined) { - name = '--'; - } else { - name = info.split('请')[0]; - } - return name; - }, + getseatch(){ this.params.pageIndex= 1; this.searchData(); @@ -348,7 +311,7 @@ export default { //预览跳转页面 toPreview(row) { if(row.type == 10) { - + window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`); } else{ window.open(`${this.webBaseUrl}/course/rePreview?id=${row.id}`); @@ -359,7 +322,8 @@ export default { examineData(flag) { if(this.isExamine == 1) { let params = { - id:this.examin.examineId,//课程id, + auditId:this.examin.auditId, + courseId:this.examin.examineId,//课程id, title:this.examin.examineName,//课程的名称, pass: this.auditInfo.pass,//Boolean 是否通过, remark: this.auditInfo.remark// 备注 @@ -395,7 +359,7 @@ export default { }, // 课程查询 async searchData() { - + this.params.resOwner1 = this.resOwner[0]; this.params.resOwner2 = this.resOwner[1]; this.params.resOwner3 = this.resOwner[2]; @@ -407,7 +371,7 @@ export default { this.params.sysType3 = this.sysTypeList[2]; try { this.loading = true; - const {result, status,message} = await apiCourse.auditList(this.params); + const {result, status,message} = await apiCourse.teacherAuditList(this.params); if(status === 200) { this.pageData = result.list; @@ -437,6 +401,7 @@ export default { }, toExamine(row) { this.audit = {}; + this.examin.auditId=row.auditId; this.examin.detailType = row.type; this.examin.examineId = row.id; this.examin.examineName = row.name; diff --git a/src/views/examine/NotApproved.vue b/src/views/examine/NotApproved.vue index b5fe1190..ac433ff5 100644 --- a/src/views/examine/NotApproved.vue +++ b/src/views/examine/NotApproved.vue @@ -5,7 +5,7 @@ - + @@ -14,6 +14,7 @@ + 搜索 重置 - +