diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 505bf8ae..ffce15cf 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -700,24 +700,6 @@ mode="inline" @click="handleClick" > - - 讲师列表 - - - 授课记录 - - - 讲师费管理 - - - 讲师费统计 - - - 归属组织管理 - - - 讲师体系管理 - 审核 @@ -788,7 +770,24 @@ 字典 - + + 讲师列表 + + + 授课记录 + + + 讲师费管理 + + + 讲师费统计 + + + 归属组织管理 + + + 讲师体系管理 + @@ -834,6 +833,8 @@ export default { "sub25", "sub26", "sub27", + "sub28", + "sub29", ], openKeys: localStorage.getItem("openKeys") ? JSON.parse(localStorage.getItem("openKeys")) @@ -1055,30 +1056,42 @@ export default { selectedKeys: "sub23-1", pagename: "测评上传", }, - // { - // href: "/lecturerlist", - // openKeys: "sub24", - // selectedKeys: "sub24", - // pagename: "讲师列表", - // }, - // { - // href: "/externallecturer", - // openKeys: "sub25", - // selectedKeys: "sub25", - // pagename: "外部讲师", - // }, - // { - // href: "/insideteaching", - // openKeys: "sub26", - // selectedKeys: "sub26", - // pagename: "内部授课", - // }, - // { - // href: "/externalteaching", - // openKeys: "sub27", - // selectedKeys: "sub27", - // pagename: "外部授课", - // }, + { + href: "/lecturerlist", + openKeys: "sub24", + selectedKeys: "sub24", + pagename: "讲师列表", + }, + { + href: "/teachingrecord", + openKeys: "sub25", + selectedKeys: "sub25", + pagename: "授课记录", + }, + { + href: "/lecturerfeemanagement", + openKeys: "sub26", + selectedKeys: "sub26", + pagename: "讲师费管理", + }, + { + href: "/lecturerfeestatistics", + openKeys: "sub27", + selectedKeys: "sub27", + pagename: "讲师费统计", + }, + { + href: "/organization", + openKeys: "sub28", + selectedKeys: "sub28", + pagename: "归属组织管理", + }, + { + href: "/lecturerSystem", + openKeys: "sub29", + selectedKeys: "sub29", + pagename: "讲师体系管理", + }, { href: "/download", openKeys: "sub15", diff --git a/src/components/project/SearchTeacher.vue b/src/components/project/SearchTeacher.vue index c0c0be16..e1c0820d 100644 --- a/src/components/project/SearchTeacher.vue +++ b/src/components/project/SearchTeacher.vue @@ -151,12 +151,12 @@ const searchMember = (keyword) => { return { value: item.realName, label: item.realName+'('+item.userNo+')'+item.orgName, - system: item.realName+'('+item.userNo+')'+item.systemName, - level: item.realName+'('+item.userNo+')'+item.levelName, + system: item.realName+'('+item.userNo+')'+item.tSystemName, + level: item.realName+'('+item.userNo+')'+item.sLevelName, key: item.id, orgName: item.orgName, - systemName:item.systemName, - levelName:item.levelName + tSystemName:item.tSystemName, + sLevelName:item.sLevelName } }) }else{ diff --git a/src/components/project/Upload.vue b/src/components/project/Upload.vue deleted file mode 100644 index 6831248f..00000000 --- a/src/components/project/Upload.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 36823f0f..5e827649 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -17,7 +17,7 @@ - @@ -144,7 +144,7 @@ + v-model:system="formParam.tSystemName" v-model:level="formParam.sLevelName"> @@ -162,19 +162,19 @@ - - - - - + @@ -421,8 +421,8 @@ export default { pageNo: 1, // pageSize1: "10", teacherNameOrUserNo: null, - systemId: null, - levelId: null, + tSystemName: null, + sLevelName: null, waitStatus: null, certStatus: null, courses: null, @@ -810,8 +810,8 @@ export default { name: null, userNo: null, newdepartId: null, - systemid: null, - levelId: null, + tsystemname: null, + sLevelName: null, waitStatus: null, certStatus: null, salaryName: null, @@ -1005,9 +1005,9 @@ export default { photo: null, teacherNameOrUserNo: null, newdepartId: null, - levelId: null, + sLevelName: null, defaultteachingTime:null, - systemId: null, + tSystemName: null, certStatus: 0, description: '', workExperience: '', @@ -1020,8 +1020,8 @@ export default { const rules = { name: [{ required: true, message: '讲师不能为空' }], newdepartId: [{ required: true, message: '组织不能为空' }], - levelId: [{ required: true, message: '讲师级别不能为空' }], - systemId: [{ required: true, message: '讲师体系不能为空' }], + sLevelName: [{ required: true, message: '讲师级别不能为空' }], + tSystemName: [{ required: true, message: '讲师体系不能为空' }], defaultteachingTime: [{ required: true, message: '' }], certStatus: [{ required: true, message: '认证状态不能为空' }], @@ -1037,12 +1037,12 @@ export default { message.warning('组织不能为空') return } - if (state.formParam.levelId == null) { + if (state.formParam.sLevelName == null) { state.log = true message.warning('讲师级别不能为空') return } - if (state.formParam.systemId == null) { + if (state.formParam.tSystemName == null) { state.log = true message.warning('讲师体系不能为空') return @@ -1099,7 +1099,7 @@ export default { // } // const handlesearchlevel = () => { // console.log('请先选择讲师体系') - // if (state.searchParam.systemId == undefined) { + // if (state.searchParam.tSystemName == undefined) { // message.warning('请先选择讲师体系') // } // } @@ -1112,13 +1112,7 @@ export default { //导出功能 const handleExport = () => { window.open( - `${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.searchParam.pageNo - }&pageSize=${state.searchParam.pageSize}&teacherNameOrUserNo=${state.searchParam.teacherNameOrUserNo ? state.searchParam.teacherNameOrUserNo : ""} - &systemId=${state.searchParam.systemId ? state.searchParam.systemId : ""} - &levelId=${state.searchParam.levelId ? state.searchParam.levelId : "" - }&waitStatus=${state.searchParam.waitStatus ? state.searchParam.waitStatus : ""} - &certStatus=${state.searchParam.certStatus ? state.searchParam.certStatus : "" - }&courses=${state.searchParam.courses ? state.searchParam.courses : ""}` + `${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&teacherNameOrUserNo=${state.searchParam.teacherNameOrUserNo ? state.searchParam.teacherNameOrUserNo : ""}&systemId=${state.searchParam.systemId ? state.searchParam.systemId : ""}&sLevelName=${state.searchParam.sLevelName ? state.searchParam.sLevelName : "" }&waitStatus=${state.searchParam.waitStatus ? state.searchParam.waitStatus : ""}&certStatus=${state.searchParam.certStatus ? state.searchParam.certStatus : ""}&courses=${state.searchParam.courses ? state.searchParam.courses : ""}` ); // this.download('lesson_records/export', { // ...state.searchParam diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 36c90158..b5efc1f5 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -134,37 +134,37 @@ - + + v-model:system="formParam.tSystemName" v-model:level="formParam.sLevelName"> - + - - + - + - @@ -174,10 +174,9 @@ - @@ -281,7 +280,7 @@ {{ formParam.userNo }} {{ formParam.organizationName }} {{ formParam.systemName }} - {{ formParam.levelName }} + {{ formParam.sLevelName }} {{ formParam.entryType == 0 ? '系统生成' : formParam.entryType == 1 ? '手动录入' : '' }} {{ formParam.type == 1 ? '项目开课' : formParam.type == 2 ? '路径开课' : formParam.type == 3 @@ -899,8 +898,8 @@ export default { state.formParam = { teacherType: '0', teacher: null, - departId: null, - systemId: null, + orgName: null, + tSystemName: null, levelId: null, courseName: null, duration:null, @@ -952,8 +951,8 @@ export default { teacherType: '0', teacherName: record.teacherName, userNo: record.userNo, - departId: record.departId, - systemId: record.systemId, + orgName: record.orgName, + tSystemName: record.tSystemName, levelId: record.levelId, type: record.type, courseName: record.courseName, @@ -977,7 +976,7 @@ export default { userNo: record.userNo, organizationName: record.organizationName, systemName: record.systemName, - levelName: record.levelName, + sLevelName: record.sLevelName, type: record.type, courseName: record.courseName, status:record.status, @@ -1054,9 +1053,9 @@ export default { const tableDatas = ref([]) const rules = { teacher: [{ required: true, message: '讲师不能为空' }], - departId: [{ required: true, message: '讲师组织不能为空' }], + orgName: [{ required: true, message: '讲师组织不能为空' }], levelId: [{ required: true, message: '讲师级别不能为空' }], - systemId: [{ required: true, message: '讲师体系不能为空' }], + tSystemName: [{ required: true, message: '讲师体系不能为空' }], id: [{ required: true, message: '内容分类不能为空' }], courseName: [{ required: true, message: '课程名称不能为空' }], beginTime: [{ required: true, message: '授课/课程日期不能为空' }], @@ -1068,7 +1067,7 @@ export default { state.log = true message.warning('讲师不能为空') } - if (state.formParam.departId == null) { + if (state.formParam.orgName == null) { state.log = true message.warning('组织不能为空') } @@ -1076,7 +1075,7 @@ export default { state.log = true message.warning('讲师级别不能为空') } - if (state.formParam.systemId == null) { + if (state.formParam.tSystemName == null) { state.log = true message.warning('讲师体系不能为空') }