Merge branch '250213-prod-master_1202-gx' into compulsory_professional_skills_copy

This commit is contained in:
gengxin
2025-02-25 20:02:34 +08:00
23 changed files with 8080 additions and 5444 deletions

View File

@@ -75,6 +75,13 @@ export const affiliationDelById = (id)=>http.post(`/admin/affiliation/delById?id
export const isEnable = (obj) => http.post(`/admin/affiliation/isEnable`,obj)
//撤回培训发生组织
export const affiliatIsConfirm = (id) => http.post(`/admin/affiliation/isConfirm?id=${id}`)
//删除 待提交 ,拒绝 的培训发生组织
export const affiliatRemoveById = (id) => http.post(`/admin/affiliation/removeById?id=${id}`)
//讲师费统计详情
export const expenseSummaryById = (obj) => http.get( `/admin/expenseSummary/queryById?id=${obj.id}&name=${obj.name}&trainOrgId=${obj.trainOrgId||''}&pageNo=${obj.pageNo}&pageSize=${obj.pageSize}`)
//撤回讲师费统计详情

View File

@@ -23,8 +23,14 @@ export const importTeacherCourseRecord = (obj) => http.post('/importTeacherCours
export const getAddress = (obj) => http.post('/admin/teacher/getAddress', obj)
//讲师费发放情况
export const getCharges = (obj) => http.post('/teacher/fee/getCharges', obj)
//讲师费发放情况
export const exportTeacherExpense = (obj) => http.get('/admin/export/exportExpenseTemplate', {params: obj})
//上传组件
export const teacherUpload = (data) =>
http.post("/admin/teacher/teacherUpload", data, {
headers: { "Content-Type": "multipart/form-data",token:getCookieForName("token") },
});

View File

@@ -13,7 +13,7 @@ export const addTeacherFee= (obj) => http.post('/admin/teacherExpense/addTeacher
export const deleteInTeacher= (obj) => http.post(`/admin/teacher/delByIdr?id=${obj}`)
//修改讲师费信息
export const updateTeacherFee= (obj) => http.post('/admin/teacherExpense/editTeacherExpense',obj)
//修改讲师费状态提交
//修改讲师费状态提交/admin/expenseBill
export const updateStatusSubmit= (obj) => http.post('/admin/teacherExpense/confirm',obj)
//修改讲师费状态撤回
export const approveTeacherFee= (obj) => http.post('/admin/teacherExpense/withdraw',obj)
@@ -57,5 +57,7 @@ export const CreateSummary= () => http.post('/admin/expenseBill/CreateSummary')
export const queryExpnseByBillId= (obj) => http.get('/admin/expenseBill/queryExpnseByBillId',{params:obj})
//
export const CreateSummaryAgain= (id) => http.post(`/admin/expenseBill/createSummaryAgain?billId=${id}`)
//删除 费用审批删除
export const expenseBillDelById = (id)=>http.post(`/admin/expenseBill/delById?id=${id}`)
//
export const submitApproval= (obj) => http.post('/admin/expenseBill/submitApproval',obj)