diff --git a/src/api/Teaching.js b/src/api/Teaching.js index 18e2cff8..969d75f5 100644 --- a/src/api/Teaching.js +++ b/src/api/Teaching.js @@ -26,7 +26,7 @@ export const getOuterTeacherCourseDetail = (obj) => http.post(`/admin/teacher/ge //新增外部授课记录 export const insertOutTeaherCourse = (obj) => http.post('/admin/teacher/insertOutTeaherCourse', obj) //讲师费发放情况 -export const getCharges = (obj) => http.post('/admin/teacher/fee/getCharges', obj) +export const getCharges = (obj) => http.post('/teacher/fee/getCharges', obj) //上传组件 export const teacherUpload = (data) => http.post("/admin/teacher/teacherUpload", data, { diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue index 0c3983fc..64b000c1 100644 --- a/src/views/lecturer/ExternalLecturer.vue +++ b/src/views/lecturer/ExternalLecturer.vue @@ -103,7 +103,7 @@ - diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index f2f5a06d..36823f0f 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -30,7 +30,7 @@ 重置 -
+
展开 @@ -134,7 +134,7 @@
- 支持图片格式为jpg/jpeg/png 图片最大为500KB + 支持图片格式为jpg/jpeg/png
@@ -143,8 +143,8 @@ - + @@ -163,19 +163,22 @@ - - + --> + + -
+ -
+
@@ -329,7 +332,7 @@
-
取消
+
取消
确定
@@ -521,9 +524,6 @@ export default { state.updialog = false } const LecturerSystemList = ref([ - { value: null, label: "讲师体系" }, - { value: 1, label: "未定级" }, - { value:2, label: "未定级11" }, ]); //获取讲师体系列表 const LecturerSystemLista = () => { @@ -582,8 +582,6 @@ export default { LecturerSystemLista() //获取内部讲师级别 const getLevelList = ref([ - { value: 0, label: "未定级" }, - { value: 1, label: "未定级11" }, ]) const changetlevel = (val) => { console.log("讲师体系id" + val); @@ -604,12 +602,12 @@ export default { } changetlevel() const OnTheJobStatusList = ref([ - { value: null, label: "全部" }, + { value:"", label: "全部" }, { value: 0, label: "在职" }, { value: 1, label: "离职" }, ]) const AuthenticationStatusList = ref([ - { value: null, label: "全部" }, + { value: "", label: "全部" }, { value: 0, label: "未认证" }, { value: 1, label: "已认证" }, ]) diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index dcf14cd8..cce53f99 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -10,7 +10,7 @@ - @@ -176,7 +176,8 @@ - @@ -282,10 +283,10 @@ {{ formParam.systemName }} {{ formParam.levelName }} - {{ formParam.entryType == 0 ? '系统生成' : formParam.entryType == 1 ? '手动录入' : '' }} + {{ formParam.entryType == 0 ? '系统生成' : formParam.entryType == 1 ? '手动录入' : '' }} {{ formParam.type == 1 ? '项目开课' : formParam.type == 2 ? '路径开课' : formParam.type == 3 ? '面授开课' : '' }} - {{ formParam.name }} + {{ formParam.coursename }} {{ formParam.status == 0 ? '未开课' : formParam.status == 1 ? '已开课' : '' }} {{ @@ -621,8 +622,8 @@ export default { }, { title: '课程名称 ', - dataIndex: 'name', - key: 'name ', + dataIndex: 'courseName', + key: 'courseName ', elipsis: true, align: "center", width: 120, }, @@ -741,7 +742,7 @@ export default { else if (state.moreid == 2) { state.moreid = 1 state.searchParam.entryType = null - state.searchParam.status = null + state.searchParam.status = '0' state.searchParam.trainorgId = null state.searchParam.systemId = null state.searchParam.id = null @@ -780,7 +781,7 @@ export default { managerId: null, teacherNameOrUserNo: null, entryType: null, - status: null, + status: '0', trainorgId: null, systemId: null, endDate: null, @@ -901,7 +902,7 @@ export default { departId: null, systemId: null, levelId: null, - name: null, + courseName: null, duration:null, endDate: null, startDate: null, @@ -955,7 +956,7 @@ export default { systemId: record.systemId, levelId: record.levelId, type: record.type, - name: record.name, + courseName: record.courseName, status:record.status, beginTime: dayjs(record.beginTime, 'YYYY-MM-DD'), // ref< moment.Moment >(moment(record.beginTime,'YYYY-MM-DD')), @@ -978,7 +979,7 @@ export default { systemName: record.systemName, levelName: record.levelName, type: record.type, - name: record.name, + courseName: record.courseName, status:record.status, beginTime:record.beginTime, // ref< moment.Moment >(moment(record.beginTime,'YYYY-MM-DD')), @@ -1043,7 +1044,7 @@ export default { }, ]) const gettableDatas = (record) => { - getCharges({ kid: record.kid }) + getCharges({ id: record.id }) .then((res) => { console.log(res) tableDatas.value = res.data.data.records @@ -1057,7 +1058,7 @@ export default { levelId: [{ required: true, message: '讲师级别不能为空' }], systemId: [{ required: true, message: '讲师体系不能为空' }], id: [{ required: true, message: '内容分类不能为空' }], - name: [{ required: true, message: '课程名称不能为空' }], + courseName: [{ required: true, message: '课程名称不能为空' }], beginTime: [{ required: true, message: '授课/课程日期不能为空' }], duration: [{ required: true, message: '授课时长不能为空' }], status: [{ required: true, message: '开课状态不能为空' }], @@ -1108,7 +1109,7 @@ export default { `${process.env.VUE_APP_BASE_API}/lesson_records/export?pageNo=${state.searchParam.currentPage }&pageSize=${state.searchParam.pageSize} &userNo=${state.searchParam.userNo ? state.searchParam.userNo : ""} - &name=${state.searchParam.name ? state.searchParam.name : ""} + &courseName=${state.searchParam.courseName ? state.searchParam.courseName : ""} &departId=${state.searchParam.departId ? state.searchParam.departId : ""} &systemId=${state.searchParam.systemId ? state.searchParam.systemId : ""} &startDate=${state.searchParam.startDate ? state.searchParam.startDate : ""} diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 3ed5ccfc..a6ae55af 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -234,7 +234,7 @@ tagsshow:"1", delTeacherId:null, //删除id确认 newStatus:null , //修改状态码确认 - kid:null, //内部讲师工号确认 + id:null, //内部讲师工号确认 lookTeacherId:null, //内部讲师详情id确认 // deleteInTeacherdialog: false, //删除弹窗 editTeacher:false , //修改状态弹窗 @@ -252,14 +252,14 @@ formParamstatues:{ status:'S20', remark: null, - kid:null, + id:null, }, searchdate: null, //选择时间 searchParam: { teacherNo:null, teacherName:null, trainorgId:null, - kid:null, + id:null, levelId:null, courseType:null, certStatus:null, @@ -506,7 +506,7 @@ endDate:null, startDate:null, teacherNo:null, - kid:null, + id:null, levelId:null, courseType:null, certStatus:null, @@ -560,7 +560,7 @@ //修改状态窗口 const handleOperate = (record) => { state.editTeacher = true - state.formParamstatues.kid= record.kid + state.formParamstatues.id= record.id }; //提交 const closehandleOperate= ()=>{ @@ -586,7 +586,7 @@ teacher:null, teacherNo:null, departId:null, - kid:null, + id:null, courseName:0, levelId:null, payrollPlaceId:null, @@ -607,14 +607,14 @@ //表格内查看数据操作 const handleLook = (record) => { state.teachingdialog = true; - state.kid= record.kid + state.id= record.id TeacherSystem() gettableDataExamine( ) } //详情 const TeacherSystem=()=>{ - getTeacherFeeDetail({kid : state.kid}).then((res) => { + getTeacherFeeDetail({id : state.id}).then((res) => { // state.formParam=Object.assign({} ,res.data.data) state.formParam=res.data.data console.log( state.formParam) @@ -626,7 +626,7 @@ const tableDataExamine = ref([ ]) const gettableDataExamine = () => { - getTeacherFeeApprovalList({kid : state.kid}) + getTeacherFeeApprovalList({id : state.id}) .then((res) => { tableDataExamine.value = res.data.data.records }) diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 10752403..0a576a91 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -69,7 +69,7 @@ - @@ -184,7 +184,7 @@ - @@ -482,7 +482,7 @@ tagsshow:"1", delTeacherId:null, //删除id确认 newStatus:null , //修改状态码确认 - kid:null, //内部讲师工号确认 + id:null, //内部讲师工号确认 lookTeacherId:null, //内部讲师详情id确认 // deleteInTeacherdialog: false, //删除弹窗 editTeacher:false , //修改状态弹窗 @@ -502,7 +502,7 @@ teacherNo:null, teacherName:null, trainorgId:null, - kid:null, + id:null, levelId:null, courseType:null, certStatus:null, @@ -584,7 +584,7 @@ ]) const changetlevel = (val) => { console.log( "讲师体系id" +val); - getLevel( {kid:val}).then((res) => { + getLevel( {id:val}).then((res) => { if (res.data.code === 200) { let arr = res.data.data; let array = []; @@ -850,7 +850,7 @@ console.log( "讲师体系id" +val); endDate:null, startDate:null, teacherNo:null, - kid:null, + id:null, levelId:null, courseType:null, certStatus:null, @@ -906,7 +906,7 @@ console.log( "讲师体系id" +val); const handleModify = (record) => { state.teacherdialog = true; state.teacherdialogtitle = '修改信息' - state.kid= record.kid + state.id= record.id state.vf = false TeacherSystem() } @@ -950,7 +950,7 @@ console.log( "讲师体系id" +val); state.handleOperate1=null state.handleOperate1 = record.status state.editTeacher = true - state.kid= record.kid + state.id= record.id }; // //确认删除 const closeDeleteTeacher=()=>{ @@ -967,7 +967,7 @@ console.log( "讲师体系id" +val); const closehandleOperate= ()=>{ //调用接口 let ids ={ - kid : state.kid + id : state.id } console.log(state.handleOperate1) if ( state.handleOperate1 === 'A10'){ @@ -1006,7 +1006,7 @@ console.log( "讲师体系id" +val); teacher:null, teacherNo:null, departId:null, - kid:null, + id:null, levelId:null, payrollPlaceId:null, // 费用类型 : null @@ -1027,14 +1027,14 @@ console.log( "讲师体系id" +val); const handleLook = (record) => { state.teachingdialog = true; state.teacherdialogtitle = '查看详情' - state.kid= record.id + state.id= record.id // alert(record.grade) TeacherSystem() // getteacherrecordstableData () } //详情 const TeacherSystem=()=>{ - getTeacherFeeDetail({id : state.kid}).then((res) => { + getTeacherFeeDetail({id : state.id}).then((res) => { // state.formParam=Object.assign({} ,res.data.data) state.formParam=res.data.data // tableDataFeeDetail.value = res.data.data.records @@ -1326,7 +1326,7 @@ const column = ref([ state.currentPage1 }&pageSize=${state.pageSize1}&teacherNo=${ state.searchParam.teacherNo ? state.searchParam.teacherNo : "" - }&kid=${ state.searchParam.kid ? state.searchParam.kid : ""}&levelId=${ + }&id=${ state.searchParam.id ? state.searchParam.id : ""}&levelId=${ state.searchParam.levelId ? state.searchParam.levelId : "" }&courseType=${ state.searchParam.courseType ? state.searchParam.courseType : ""}&certStatus=${ state.searchParam.certStatus ? state.searchParam.certStatus : "" diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue index c623b8b4..eab8536e 100644 --- a/src/views/lecturer/LookInsideLecturer.vue +++ b/src/views/lecturer/LookInsideLecturer.vue @@ -38,7 +38,7 @@ @click="handleup">查看认证资料 - {{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时 + {{ (formParam.teaching /60 ).toFixed(2)}}小时 {{formParam.payrollPlaceName}} @@ -171,8 +171,8 @@ export default{ // console.log(objA ,'11111111111') state.formParam = objA state.formParam.photo = state.formParam.photo ===null ? 'https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png' : state.formParam.photo - state.teacherrepromo.userId=res.data.data[0].kid - console.log(state.teacherrepromo.kid); + state.teacherrepromo.userId=res.data.data[0].id + console.log(state.teacherrepromo.id); getpromotionrecordstableData() }) .catch((err) => { @@ -184,16 +184,16 @@ export default{ const teacherrecordsColumns = ref([ { title: '课程编号', - dataIndex: 'index', - key: 'index', + dataIndex: 'courseId', + key: 'courseId', align: "center", customRender: (text,record,index) => `${index+1}`, width: 120, }, { title: '课程名称', - dataIndex: 'name', - key: 'name', + dataIndex: 'courseName', + key: 'courseName', elipsis: true, align: "center", width: 120, }, @@ -239,15 +239,15 @@ export default{ }, { title: '学习总人数', - dataIndex: 'projectMember', - key: 'projectMember', + dataIndex: 'studentNum', + key: 'studentNum', elipsis: true, align: "center", width: 120, }, { title: '授课时长(分钟)', - dataIndex: 'duration', - key: 'duration', + dataIndex: 'teaching', + key: 'teaching', elipsis: true, align: "center", width: 120, }, diff --git a/src/views/lecturer/LookLecturerSystem.vue b/src/views/lecturer/LookLecturerSystem.vue index ab1a3a9f..6d50f5cf 100644 --- a/src/views/lecturer/LookLecturerSystem.vue +++ b/src/views/lecturer/LookLecturerSystem.vue @@ -37,8 +37,8 @@ ExternalLecturer - {{ record.remark }} + + {{ record.remark }}