diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index 29b8a347..cf016e91 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -27,8 +27,6 @@ export const updateTeacherState = (obj) => http.post('/admin/teacher/updateTeach -//删除内部讲师 -// export const deleteInTeacher= (obj) => http.post(`/admin/teacher/delById?id=${obj}`) //获取内部讲师发薪地 export const getPayRollPlace = (obj) => http.post('/admin/teacher/getPayRollPlace', obj) @@ -36,23 +34,13 @@ export const getPayRollPlace = (obj) => http.post('/admin/teacher/getPayRollPlac export const getTeacherCourseList = (obj) => http.post('/admin/teacher/getTeacherCourseList' ,obj) //获取内部讲师晋升接口 export const getTeacherLogList = (obj) => http.post('/admin/teacher/queryTeacherLevelRecord' ,obj) -//导出内部讲师列表 -// http://pretest.zcwytd.com/manageApi/lesson_records/export -export const exportteacher = (obj) => http.post('/admin/lesson_records/export' ,obj) // 所有教师专长 export const getTeacherExpertise = (obj) => http.post('/admin/teacher/getTeacherExpertise' ,obj) //根据父级教师专长(pid)查找子级教师专长 export const getTeacherExpertiseByPid = (obj) => http.post(`/admin/teacher/deleteInTeacher?id=${obj}`) // 新增页面内部姓名 export const infoteacher = (obj) => http.get('/admin/thirdApi/org/info' ,{params: obj}) -//外部讲师列表 -export const getOutTeacherList = (obj) => http.post('/admin/teacher/getOutTeacherList', obj) -//外部讲师详情 -export const getOuterTeacherById = (obj) => http.post(`/admin/teacher/getOuterTeacherById?id=${obj}`) -//新增外部讲师 -export const insertTeacherOutSide = (obj) => http.post('/admin/teacher/insertTeacherOutSide', obj) -//修改外部讲师 -export const updateOutTeacher = (obj) => http.post('/admin/teacher/updateOutTeacher', obj) + export const fileUp = (obj) => http.post('/file/upload', obj) //组织树查询讲师 diff --git a/src/api/Teaching.js b/src/api/Teaching.js index 81861d11..b8f63811 100644 --- a/src/api/Teaching.js +++ b/src/api/Teaching.js @@ -20,12 +20,6 @@ export const getexport = (obj) => http.post('/lesson_records/export', obj) export const importTeacherCourseRecord = (obj) => http.post('/importTeacherCourseRecord', obj) //获取开课场地 export const getAddress = (obj) => http.post('/admin/teacher/getAddress', obj) -//外部讲师授课记录 -export const getOuterTeacherCourseList = (obj) => http.post('/admin/teacher/getOuterTeacherCourseList', obj) -//获取外部授课记录详情 -export const getOuterTeacherCourseDetail = (obj) => http.post(`/admin/teacher/getOuterTeacherCourseDetail?id=${obj}`) -//新增外部授课记录 -export const insertOutTeaherCourse = (obj) => http.post('/admin/teacher/insertOutTeaherCourse', obj) //讲师费发放情况 export const getCharges = (obj) => http.post('/teacher/fee/getCharges', obj) //上传组件 diff --git a/src/api/lecturerFeeManagement.js b/src/api/lecturerFeeManagement.js index f1086457..457f5644 100644 --- a/src/api/lecturerFeeManagement.js +++ b/src/api/lecturerFeeManagement.js @@ -1,16 +1,25 @@ import http from "./config"; // 获取讲师费列表 -export const getTeacherFeeList = (obj) => http.post('/teacher/fee/getTeacherFeeList',obj) +export const getTeacherFeeList = (obj) => http.get('/admin/teacherExpense/list', {params: obj}) //获取讲师费详情 -export const getTeacherFeeDetail= (obj) => http.post('/teacher/fee/getTeacherFeeDetail',obj) +export const getTeacherFeeDetail= (obj) => http.get('/admin/teacherExpense/queryById',{params: obj}) //添加讲师费 -export const addTeacherFee= (obj) => http.post('/teacher/fee/addTeacherFee',obj) +export const addTeacherFee= (obj) => http.post('/admin/teacherExpense/addTeacherExpense',obj) +//删除讲师费 +export const deleteInTeacher= (obj) => http.post(`/admin/teacher/delByIdr?id=${obj}`) //修改讲师费信息 -export const updateTeacherFee= (obj) => http.post('/teacher/fee/updateTeacherFee',obj) -//修改讲师费状态(已提交) -export const updateStatusSubmit= (obj) => http.post('/teacher/fee/updateStatusSubmit',obj) -//修改讲师费状态(已撤回) -export const approveTeacherFee= (obj) => http.post('/teacher/fee/approveTeacherFee',obj) +export const updateTeacherFee= (obj) => http.post('/admin/teacherExpense/editTeacherExpense',obj) +//修改讲师费状态提交 +export const updateStatusSubmit= (obj) => http.post('/admin/teacherExpense/confirm',obj) +//修改讲师费状态撤回 +export const approveTeacherFee= (obj) => http.post('/admin/teacherExpense/withdraw',obj) +//讲师费汇总审批列表 +export const expenseBillList= (obj) => http.get('/admin/expenseBill/list',{params: obj}) +//讲师费汇总审批详情 +export const queryById= (obj) => http.get('/admin/expenseBill/queryById',{params: obj}) +//移除讲师费 +export const withdrawRecord= (obj) => http.post('/admin/expenseBill/withdrawRecord',obj) + //获取培训发生组织列表 export const getTrainOrg= (obj) => http.post('/teacher/fee/getTrainOrg',obj) //获取讲师级别 diff --git a/src/api/organization.js b/src/api/organization.js index 223fcac5..e9e84ee9 100644 --- a/src/api/organization.js +++ b/src/api/organization.js @@ -1,18 +1,18 @@ import http from "./config"; -// 列表分页查看归属组织 -export const queryTrainOrg = (obj) => http.post( '/configuration/queryTrainOrg', obj) +// 列表查看归属组织 +export const queryTrainOrg = (obj) => http.get( '/admin/affiliation/list', {params: obj}) +//新增归属组织 +export const addReviewer = (obj) => http.post('/admin/affiliation/addAffiliation', obj) +// 删除归属组织 +export const deleteTrainOrg = (obj) => http.post(`/admin/affiliation/delById?id=${obj}`) +//修改归属组织 +export const updateTrainOrg = (obj) => http.post('/admin/affiliation/editInfo', obj) + //列表分页查看讲师体系 export const systemList = (obj) => http.get('/configuration/list',{params: obj}) // 根据体系id查看讲师体系对应的讲师等级详情 export const querySystemLevelByKid = (obj) => http.post('/configuration/querySystemLevelByKid', obj) -//新增归属组织 -export const addReviewer = (obj) => http.post('/configuration/addReviewer', obj) -//修改归属组织 -export const updateTrainOrg = (obj) => http.post('/configuration/updateTrainOrg', obj) -// 删除归属组织 -export const deleteTrainOrg = (obj) => http.post('/configuration/deleteTrainOrg', obj) - //新增讲师体系 export const addLecturerSystem = (obj) => http.post('/configuration/addLecturerSystem', obj) //删除讲师体系 diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue index 7ef8c93b..7debd25a 100644 --- a/src/views/lecturer/ExternalLecturer.vue +++ b/src/views/lecturer/ExternalLecturer.vue @@ -1044,4 +1044,30 @@ export default { border: 0px !important; border-radius: 50%!important; } + +::v-deep .ant-select-selection-overflow-item { + margin-top: -2px; +} + +::v-deep .ant-select-multiple .ant-select-selection-item { + height: 34px +} +.tableBox { +padding-bottom: 20px; +margin: 20px 38px 30px; +::v-deep .ant-select-dropdown{ + display: inline-block; +} +::v-deep .ant-select-selection-item{ +margin-left: 3px; +} +::v-deep .ant-pagination-options-size-changer.ant-select{ +width: 84px; +} +.pa { +width: 100%; +display: flex; +justify-content: right; +} +} \ No newline at end of file diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 7446b821..dd29db2f 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -551,7 +551,6 @@ export default { }); LecturerSystemList.value = array; } - console.log("获取讲师", LecturerSystemList); }) } const isupload = (val) => { diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 9cc715f3..d87af094 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -72,9 +72,23 @@ - - + + + +
@@ -186,10 +200,22 @@ - - - + + + @@ -294,7 +320,7 @@ {{ formParam.beginTime }} {{ formParam.studys }} {{ formParam.score }} - {{ formParam.sysType1 }} + {{ formParam.courseTypeId }} {{ formParam.remark }}
@@ -358,7 +384,7 @@