diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index 3cb7cfcd..a2dc3415 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -97,3 +97,7 @@ export const isConfirm = (obj) => http.post('/admin/expenseBill/isConfirm',obj) export const parentList = () => http.get('/admin/affiliation/parentList') //讲师级别获取 export const getAllLevelList = () => http.get('/admin/system/getAllLevelList') +//删除讲师费 +export const deleteLecturerFee = (obj) => http.post(`/admin/teacherExpense/delById?id=${obj.id}`,obj) +//停用/启用讲师费 +export const updateLecturerFee = (obj) => http.post(`/admin/teacherExpense/isEnable?id=${obj.id}&status=${obj.status}`,obj) diff --git a/src/api/Teaching.js b/src/api/Teaching.js index c44fbe60..497ef340 100644 --- a/src/api/Teaching.js +++ b/src/api/Teaching.js @@ -1,7 +1,7 @@ import http from "./config"; import {getCookieForName} from "@/api/method"; //列表查询授课记录 -export const getNewInTeacherCourseList = (obj) => http.get('/admin/teacherRecord/list', {params: obj}) +export const getNewInTeacherCourseList = (obj) => http.get('/admin/teacherRecord/getlistByUserId', {params: obj}) //新增授课记录 export const insertInTeacherCourse = (obj) => http.post('/admin/teacherRecord/addTeacherRecord', obj) //删除讲师授课记录 diff --git a/src/assets/icon.png b/src/assets/icon.png index 6d9a5120..39d6f553 100644 Binary files a/src/assets/icon.png and b/src/assets/icon.png differ diff --git a/src/assets/iconnot.png b/src/assets/iconnot.png index c492aef5..df14eb9c 100644 Binary files a/src/assets/iconnot.png and b/src/assets/iconnot.png differ diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 4c8d43f8..2531531f 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -415,7 +415,7 @@ 意见 - + - @@ -305,7 +312,7 @@ - + @@ -326,7 +333,7 @@ v-model:value="formParam.sourceBelongId" v-model:name="formParam.sourceBelongFullName" > --> - @@ -341,7 +348,7 @@ /> {{formParam.courseType==2?'课程':'授课'}}日期 : - @@ -376,7 +383,7 @@ /> 参训人数 - @@ -394,7 +401,7 @@ /> 评分 - @@ -528,7 +535,7 @@ {{formParam.expense?formParam.expense+'元': '-'}} - {{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'审核通过', 4:'审核拒绝',5:'待提交'}[formParam?.status]}} + {{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'审核通过', 4:'审核拒绝',5:'停用'}[formParam?.status]}} {{formParam.remark || '-'}} @@ -583,7 +590,7 @@ import ImportWork from "../../components/lecturer/ImportWork.vue"; import SearchTeacher from "@/components/project/SearchTeacher"; import {getTeacherFeeList,getTeacherFeeDetail,getListByTeacherExpenseId,addTeacherFee ,getListByIds,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTeacherLevel,deleteInTeacher,confirm} from "../../api/lecturerFeeManagement"; - import {getTeacherSystemList, getAllLevelList,getPayRollPlace,fileUp,submitApproval } from "../../api/Lecturer"; + import {getTeacherSystemList, getAllLevelList,getPayRollPlace,fileUp,submitApproval,deleteLecturerFee,updateLecturerFee } from "../../api/Lecturer"; // lecturerFeeManagement // import {getProjSt} from "../../api/indexProjStu"; // import AddTeacher from "../../components/drawers/project/AddTeacher" @@ -661,6 +668,7 @@ name:null, trainOrgId:null, tSystemId:null, + courseName: null, tLevelName:null, courseType:null, certStatus:null, @@ -840,7 +848,7 @@ getAllLevelList().then((res) => { state.moreid=1 // state.searchParam.certStatus=null // state.searchParam.salaryName=null - // state.searchParam.status=null + state.searchParam.status=null state.searchParam.tSystemId = null state.searchParam.tLevelName = null } @@ -1051,7 +1059,7 @@ getAllLevelList().then((res) => { "2": "审核中", "3": "审核通过", '4': '审核拒绝', - '5': '待提交', + '5': '停用', }[value.record.status + ""] || "" : "-"} @@ -1102,7 +1110,7 @@ getAllLevelList().then((res) => { key: 'operation', ellipsis: true, align: "center", fixed: "right", - width: 160, + width: 180, scopedSlots: { customRender: "action" }, }, @@ -1125,6 +1133,7 @@ getAllLevelList().then((res) => { beginTime:null, userNo:null, tSystemId:null, + courseName: null, tLevelName:null, courseType:null, certStatus:null, @@ -1275,10 +1284,43 @@ getAllLevelList().then((res) => { } }; //删除弹窗 - // const deleteModal = (record) => { - // state.deleteInTeacherdialog = true - // state.delTeacherId = record.id - // }; + const deleteModal = (record) => { + dialog({ + content: '是否确认进行删除?', + ok: () => { + deleteLecturerFee({id:record.id}).then(res=>{ + if(typeof (res.data.data) != 'object'){ + message.error(res.data.data) + return + } + message.success("删除成功"); + searchSubmit() + }).catch(err=>{ + message.destroy() + message.error(err.data.msg) + }) + } + }) + }; + const updateModal = (record) => { + dialog({ + content: `是否确认${record.status == 5 ? '启用':'停用'}?`, + ok: () => { + const status = record.status ==0 ? 5 : 0 + updateLecturerFee({id:record.id,status}).then(res=>{ + if(typeof (res.data.data) != 'object'){ + message.error(res.data.data) + return + } + message.success(`${status == 0 ? '启用':'停用'}成功`); + searchSubmit() + }).catch(err=>{ + message.destroy() + message.error(err.data.msg) + }) + } + }) + } //修改状态窗口 const handleOperate = (record) => { dialog({ @@ -1742,7 +1784,7 @@ const column = ref([ "2": "审核中", "3": "审核通过", '4': '审核拒绝', - '5': '待提交', + '5': '停用', }[value.record.status + ""] || "" : "-"} @@ -1787,7 +1829,7 @@ const column = ref([ const handleExport = ()=>{ window.open ( `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?name=${state.searchParam.name || "" - }&status=${ state.searchParam.status || ""}&trainOrgId=${ state.searchParam.trainOrgId || ""}&type=${state.searchParam.type || ""}&tSystemId=${ state.searchParam.tSystemId || ""}&tLevelName=${ state.searchParam.tLevelName || ""}&beginTime=${state.searchParam.beginTime || ""}&endTime=${state.searchParam.endTime || ""}` + }&status=${ state.searchParam.status || ""}&trainOrgId=${ state.searchParam.trainOrgId || ""}&type=${state.searchParam.type || ""}&courseName=${ state.searchParam.courseName || ""}&tSystemId=${ state.searchParam.tSystemId || ""}&tLevelName=${ state.searchParam.tLevelName || ""}&beginTime=${state.searchParam.beginTime || ""}&endTime=${state.searchParam.endTime || ""}` ); // this.download('lesson_records/export', { // ...state.searchParam @@ -1866,7 +1908,8 @@ const column = ref([ handleLook, orgSplit, cancel, - // deleteModal, + deleteModal, + updateModal, handleModify, // closeDeleteTeacher, createTeacherDialog, diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue index 3151ab0d..a4fe3608 100644 --- a/src/views/lecturer/MonthlyStatistics.vue +++ b/src/views/lecturer/MonthlyStatistics.vue @@ -69,6 +69,9 @@ --> +
+ 注:下表为按讲师汇总的费用 +
@@ -105,7 +108,7 @@
--> +@closa="cancelTeachingDialog" :maskClosable="true" width="80%" :title="false">
查看详情
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue index 4b84f830..1c6e0d5d 100644 --- a/src/views/lecturer/Organization.vue +++ b/src/views/lecturer/Organization.vue @@ -293,7 +293,7 @@
- +