diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index 58d4ce21..772ba054 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -61,6 +61,10 @@ export const getUnSelectOrg = () => http.get(`/admin/affiliation/getUnSelectOrg` export const getAffiliationCode = () => http.get('/admin/affiliation/getAffiliationCode') //查看或编辑回显培训发生组织 export const getAffiliationById = (id) => http.get(`/admin/affiliation/queryById?id=${id}`) +//审核记录 +export const getByBusinessIdList = (obj) => http.post(`/admin/approval/getByBusinessIdList?businessId=${obj.businessId}&businessType=${obj.businessType}&pageNo=${obj.pageNo}&pageSize=${obj.pageSize}`) +//审核记录查看操作 +export const getApprovalResultByApprovalIdList = (approvalId) => http.post(`/admin/approval/getApprovalResultByApprovalIdList?approvalId=${approvalId}`) //恢复培训发生组织的数据 export const recovery = (id) => http.post(`/admin/affiliation/recovery?id=${id}`) //删除培训发生组织 diff --git a/src/api/lecturerFeeManagement.js b/src/api/lecturerFeeManagement.js index 382e1671..08ae7b91 100644 --- a/src/api/lecturerFeeManagement.js +++ b/src/api/lecturerFeeManagement.js @@ -5,6 +5,8 @@ export const getExpenseByCourseId = (obj) => http.get('/admin/teacherExpense/get export const getTeacherFeeList = (obj) => http.get('/admin/teacherExpense/list', {params: obj}) //获取讲师费详情 export const getTeacherFeeDetail= (obj) => http.get('/admin/teacherExpense/queryById',{params: obj}) +//查看详情讲师费审批 +export const getListByTeacherExpenseId= (teacherExpenseId) => http.post(`/admin/approval/getListByTeacherExpenseId?teacherExpenseId=${teacherExpenseId}`) //添加讲师费 export const addTeacherFee= (obj) => http.post('/admin/teacherExpense/addTeacherExpense',obj) //删除讲师费 diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue index 5577618a..554c9809 100644 --- a/src/components/project/BatchLecturer.vue +++ b/src/components/project/BatchLecturer.vue @@ -137,12 +137,18 @@ const columns = [ dataIndex: 'tlevelName', key: 'tlevelName', align: 'center', + customRender: ({ text })=>{ + return text||'-' + } }, { title: '发薪地', dataIndex: 'payrollPlace', key: 'payrollPlace', align: 'center', + customRender: ({ text })=>{ + return text||'-' + } }, { @@ -193,12 +199,18 @@ const columns = [ dataIndex: 'studys', key: 'studys', align: 'center', + customRender: ({ text })=>{ + return text||'0' + } }, { title: '评分', dataIndex: 'score', key: 'score', align: 'center', + customRender: ({ text })=>{ + return text||'-' + } }, { title: '课酬基准', diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue index 715512b6..c79b2348 100644 --- a/src/components/project/ConfirmLecturer.vue +++ b/src/components/project/ConfirmLecturer.vue @@ -287,12 +287,18 @@ const columns = [ dataIndex: 'tlevelName', key: 'tlevelName', align: 'center', + customRender: ({ text })=>{ + return text||'-' + } }, { title: '发薪地', dataIndex: 'payrollPlace', key: 'payrollPlace', align: 'center', + customRender: ({ text })=>{ + return text||'-' + } }, { @@ -343,12 +349,18 @@ const columns = [ dataIndex: 'studys', key: 'studys', align: 'center', + customRender: ({ text })=>{ + return text||'0' + } }, { title: '评分', dataIndex: 'score', key: 'score', align: 'center', + customRender: ({ text })=>{ + return text||'-' + } }, { title: '课酬基准', diff --git a/src/components/project/lockLecturer.vue b/src/components/project/lockLecturer.vue index 8b67a676..1f127b22 100644 --- a/src/components/project/lockLecturer.vue +++ b/src/components/project/lockLecturer.vue @@ -59,7 +59,7 @@
- +