diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index de27f7c4..47a660d9 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -36,7 +36,7 @@ export const exportteacher = (obj) => http.post('/admin/lesson_records/export' , // 所有教师专长 export const getTeacherExpertise = (obj) => http.post('/admin/teacher/getTeacherExpertise' ,obj) //根据父级教师专长(pid)查找子级教师专长 -export const getTeacherExpertiseByPid = (obj) => http.post('/admin/teacher/getTeacherExpertiseByPid' ,obj) +export const getTeacherExpertiseByPid = (obj) => http.post(`/admin/teacher/deleteInTeacher?id=${obj}`) // 新增页面内部姓名 export const infoteacher = (obj) => http.get('/admin/thirdApi/org/info' ,{params: obj}) //外部讲师列表 diff --git a/src/api/Teaching.js b/src/api/Teaching.js index ddef67ec..1431121d 100644 --- a/src/api/Teaching.js +++ b/src/api/Teaching.js @@ -2,7 +2,8 @@ import http from "./config"; //列表查询内部讲师授课记录 export const getNewInTeacherCourseList = (obj) => http.post('/admin/teacher/getNewInTeacherCourseList', obj) //内部讲师授课记录详情 -export const getTeacherCourseList = (obj) => http.post('/admin/teacher/getTeacherCourseList', obj) +export const getTeacherCourseList = (obj) => http.post(`/admin/teacher/getTeacherCourseList?=${obj}`) +// export const getTeacherCourseList = (obj) => http.post('/admin/teacher/getTeacherCourseList', obj) //授课记录导出 export const getexport = (obj) => http.post('/lesson_records/export', obj) //授课记录导入 @@ -10,4 +11,12 @@ export const importTeacherCourseRecord = (obj) => http.post('/importTeacherCours //外部讲师授课记录 export const getOuterTeacherCourseList = (obj) => http.post('/admin/teacher/getOuterTeacherCourseList', obj) //获取所属组织 -export const getOrganization = (obj) => http.post('/admin/teacher/getOrganization', obj) \ No newline at end of file +export const getOrganization = (obj) => http.post('/admin/teacher/getOrganization', obj) +//获取开课场地 +export const getAddress = (obj) => http.post('/admin/teacher/getAddress', obj) +//获取外部授课记录详情 +export const getOuterTeacherCourseDetail = (obj) => http.post(`/admin/teacher/getOuterTeacherCourseDetail?id=${obj}`) +//删除讲师授课记录 +export const deleteInTeacherCourse= (obj) => http.post(`/admin/teacher/deleteInTeacherCourse?offcourseId=${obj}`) +//新增内部授课记录 +export const insertInTeacherCourse = (obj) => http.post('/admin/teacher/insertInTeacherCourse', obj) \ No newline at end of file diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue index 903a1a00..a5a1b725 100644 --- a/src/views/lecturer/ExternalLecturer.vue +++ b/src/views/lecturer/ExternalLecturer.vue @@ -2,13 +2,13 @@ @@ -62,127 +64,102 @@
- +
- -
-
-
- 个人详情 - 授课记录 + +
+
+
+ 个人详情 + 授课记录
- -
-
-
-
- +
+
+
+
+ -
-
- -
- - 讲师姓名 : - - - {{ formParam.name }} -
-
-
- -
- 手机号码 : - - - {{ formParam.mobile }} -
-
-
- -
- 邮箱: - - - {{ formParam.email }} -
-
-
- 讲师介绍 : +
+ +
+ + 讲师姓名 : + + + {{ formParam.name }} +
+
+
+ +
+ 手机号码 : + + + {{ formParam.mobile }} +
+
+
+ +
+ 邮箱: + + + {{ formParam.email }} +
+
+ +
+ 讲师介绍 : +
+ + {{ formParam.description + }} +
+
+ 备注 : + + + {{ formParam.remark }} +
+
+ 取消 + 保存 +
- - {{ formParam.description }} -
-
- 备注 : - - - {{ formParam.remark }} -
-
- 取消 - 保存 -
-
- -
+ +
- - - -
- + + +
+ +
@@ -203,8 +180,7 @@
取消
-
+
确定
@@ -212,10 +188,9 @@
- -
- + +
+
@@ -224,8 +199,8 @@ 提示
- 您确定要启用此讲师状态吗 - 您确定要停用此讲师状态吗 + 您确定要启用此讲师状态吗 + 您确定要停用此讲师状态吗
@@ -246,10 +221,10 @@ import { reactive, toRefs, ref } from "vue"; import Editor from "@/components/project/Editor"; import { message } from "ant-design-vue"; -import {getOutTeacherList ,getOuterTeacherById ,getOuterTeacherCourseList,deleteInTeacher,updateInTeacher, updateTeacherState,insertTeacherOutSide,updateOutTeacher} from "../../api/Lecturer"; +import { getOutTeacherList, getOuterTeacherById, getOuterTeacherCourseList, deleteInTeacher, updateInTeacher, updateTeacherState, insertTeacherOutSide, updateOutTeacher } from "../../api/Lecturer"; // import {getProjSt} from "../../api/indexProjStu"; // import AddTeacher from "../../components/drawers/project/AddTeacher" -export default { +export default { name: "ExternalLecturer", components: { // AddTeacher, @@ -259,40 +234,40 @@ export default { const state = reactive({ currentPage1: 1, pageSize1: 10, - promotionrecordsLoading:false , //晋级记录遮罩层 - tableLoading:false, - tagsshow:"1", - delTeacherId:null, //删除id确认 - editTeacherid:null,//修改状态id确认 - userNoid:null, //讲师详情工号确认 - lookTeacherId:null, //讲师详情id确认 - newStatus:null , //修改状态码确认 + promotionrecordsLoading: false, //晋级记录遮罩层 + tableLoading: false, + tagsshow: "1", + delTeacherId: null, //删除id确认 + editTeacherid: null,//修改状态id确认 + userNoid: null, //讲师详情工号确认 + lookTeacherId: null, //讲师详情id确认 + newStatus: null, //修改状态码确认 deleteTeacherdialog: false, //删除弹窗 - editTeacher:false , //修改状态弹窗 - handleOperate1:null, //修改状态弹窗内容 + editTeacher: false, //修改状态弹窗 + handleOperate1: null, //修改状态弹窗内容 teacherdialog1: null, teacherdialog: false, //控制讲师弹窗 teacherdialogtitle: '',//讲师弹框title内容 pageSizeOptions: ['10', '20', '30', '50'], //下拉选择每页显示多少条 pageSize: 10, tableDataTotal: -1,//table列表总条数 - teacherrecordstableDataTotal:-1,//授课记录列表总条数 + teacherrecordstableDataTotal: -1,//授课记录列表总条数 formParam: { }, searchParam: { - name:null,//姓名 - status:null,//状态 + name: null,//姓名 + status: null,//状态 pageNo: "1", pageSize: "10" }, - activeName:'first' + activeName: 'first' }) const AccountStatusList = ref([ { value: 0, label: "启用" }, { value: 1, label: "停用" }, ]) const columns = ref([ - { + { title: '讲师编号 ', dataIndex: 'userNo', key: 'userNo', @@ -307,7 +282,7 @@ export default { width: 200, }, { - title: '手机号 ', + title: '手机号 ', dataIndex: 'mobile', key: 'mobile', elipsis: true, @@ -343,15 +318,15 @@ export default { customRender: (value) => { return (
- {value.record.status == 0 || value.record.status == 1|| value.record.status == 2 + {value.record.status == 0 || value.record.status == 1 || value.record.status == 2 ? { '0': "临时", '1': "启用", '2': "停用" - }[value.record.status + ""] || "" + }[value.record.status + ""] || "" : "-"}
- ) + ) } }, { @@ -374,24 +349,25 @@ export default { //重置 const searchReset = () => { state.searchParam = { - pageNo: 1, - pageSize: 10 , - name:null, - status:null}; + pageNo: 1, + pageSize: 10, + name: null, + status: null + }; getTableDate(); }; // List接口数据 - const getTableDate = (obj) => { - state.tableLoading=true + const getTableDate = (obj) => { + state.tableLoading = true state.loading = true; - let objA = {...state.searchParam}; + let objA = { ...state.searchParam }; getOutTeacherList(objA) .then((res) => { tableData.value = res.data.data.records state.tableDataTotal = Number(res.data.data.total); - state.tableLoading=false + state.tableLoading = false // console.log("获取讲师tableDatateacherName", tableData); - }) + }) }; getTableDate() // // List接口数据 @@ -437,105 +413,91 @@ export default { state.teacherdialog1 = 0 state.teacherdialog = true; state.teacherdialogtitle = '修改信息' - state.lookTeacherId= record.id + state.lookTeacherId = record.id TeacherSystem() } //保存 const createTeacherDialog = () => { console.log(state.formParam); - // if (state.formParam.id != undefined) { - updateOutTeacher (state.formParam).then(response => { - message.success("修改成功"); - }); - // } - // let objA = {...state.formParam}; - // state.formParam ={ - // name:'新增测试', - // userNo:'12315', - // departId:'8465784657', - // defaultTeachingTime:50, - // leveId:1, - // tsystemName:249, - // certStatus:1, - // description:'测试13.00', - // workExperience:'测试13.00', - // courses:'测试13.00', - // } - // else { - // insertTeacherOutSide(state.formParam) - // .then((res) => { - // message.success("保存成功"); - // }).catch((err) => { - // console.log(err); - // }); - // } - state.teacherdialog = false; + if (state.formParam.id != undefined) { + updateOutTeacher(state.formParam).then(response => { + message.success("修改成功"); + }); + } + else { + insertTeacher(state.formParam) + .then((res) => { + message.success("保存成功"); + }).catch((err) => { + console.log(err); + }); + } + state.teacherdialog = false; getTableDate(); }; //删除弹窗 const deleteModal = (record) => { state.deleteTeacherdialog = true - state.delTeacherId = record.id + state.delTeacherId = record.id }; //修改状态窗口 const handleOperate = (record) => { - if( record.status == 1){ + if (record.status == 1) { state.handleOperate1 = record.status - state.newStatus= 2 - } - if( record.status == 2){ - state.handleOperate1 =record.status - state.newStatus= 1 - } - state.editTeacherid =record.id + state.newStatus = 2 + } + if (record.status == 2) { + state.handleOperate1 = record.status + state.newStatus = 1 + } + state.editTeacherid = record.id state.editTeacher = true }; - //确认删除 - const closeDeleteTeacher=()=>{ + //确认删除 + const closeDeleteTeacher = () => { //调用删除接口 - deleteInTeacher(state.delTeacherId).then((res)=>{ - if(res.data.code == 200 ){ + deleteInTeacher(state.delTeacherId).then((res) => { + if (res.data.code == 200) { // message.success("删除成功"); state.deleteTeacherdialog = false getTableDate(); } }) - } + } //确认启用停用 - const closehandleOperate= ()=>{ - //调用接口 - let ids ={ - id : state.editTeacherid, - newStatus: state.newStatus + const closehandleOperate = () => { + //调用接口 + let ids = { + id: state.editTeacherid, + newStatus: state.newStatus } console.log(ids) updateTeacherState(ids).then((res) => { - // message.success("操作成功"); - state.editTeacher = false - getTableDate(); - }) + // message.success("操作成功"); + state.editTeacher = false + getTableDate(); + }) } //取消按钮 清空输入的数据 const cancelTeacherDialog = () => { - if(state.teacherdialog = true ) - { - state.teacherdialog = false - cancel() - } - state.deleteTeacherdialog = false - state.editTeacher = false - state.tagsshow= 1 + if (state.teacherdialog = true) { + state.teacherdialog = false + cancel() + } + state.deleteTeacherdialog = false + state.editTeacher = false + state.tagsshow = 1 }; //清空数据 const cancel = () => { - state.formParam= { - name :null , - mobile:null , - email:null, - teacherIntrofuce:null , - remark:null + state.formParam = { + name: null, + mobile: null, + email: null, + teacherIntrofuce: null, + remark: null } console.log(state.formParam); } @@ -544,34 +506,34 @@ export default { state.teacherdialog1 = 1 state.teacherdialog = true; state.teacherdialogtitle = '查看详情' - state.userNoid= record.userNo - state.lookTeacherId= record.id + state.userNoid = record.userNo + state.lookTeacherId = record.id // alert(record.grade) TeacherSystem() } //外部讲师详情 - const TeacherSystem=()=>{ + const TeacherSystem = () => { getOuterTeacherById(state.lookTeacherId).then((res) => { - console.log("外部讲师详情", res.data); - state.formParam= res.data.data - }) - .catch((err) => { + console.log("外部讲师详情", res.data); + state.formParam = res.data.data + }) + .catch((err) => { console.log("外部讲师详情", err); }); } // tab 标签切换 - const particulars=()=>{ - state.tagsshow= 1 + const particulars = () => { + state.tagsshow = 1 } - const teacherrecords=()=>{ - state.tagsshow= 2 - getteacherrecordstableData () + const teacherrecords = () => { + state.tagsshow = 2 + getteacherrecordstableData() } - const promotionrecords=()=>{ - state.tagsshow= 3 + const promotionrecords = () => { + state.tagsshow = 3 } //授课记录列表 - const teacherrecordsColumns = ref ([ + const teacherrecordsColumns = ref([ { title: '课程编号', dataIndex: 'id', @@ -609,7 +571,7 @@ export default { customRender: (value) => { return (
- {value.record.type == 1 || value.record.type == 2||value.record.type == 3 + {value.record.type == 1 || value.record.type == 2 || value.record.type == 3 ? { "1": "项目开课", "2": "路径开课", @@ -661,37 +623,38 @@ export default { } } ]) - //授课记录列表数据 - const teacherrecordstableData = ref([ + //授课记录列表数据 + const teacherrecordstableData = ref([ ]) const getteacherrecordstableData = () => { - state.teacherrecordsLoading=true + state.teacherrecordsLoading = true state.loading = true; - // let ids={id: state.lookTeacherId ,pageNo: "1", pageSize: "10" } - let ids= - {id: "965341999643234304", - pageNo: "1", - pageSize: "10"} + // let ids={id: state.lookTeacherId ,pageNo: "1", pageSize: "10" } + let ids = + { + id: "965341999643234304", + pageNo: "1", + pageSize: "10" + } // api接口 - getOuterTeacherCourseList(ids).then((res) => { + getOuterTeacherCourseList(ids).then((res) => { teacherrecordstableData.value = res.data.data state.teacherrecordstableDataTotal = Number(res.data.data.total); - state.teacherrecordsLoading=false - }) + state.teacherrecordsLoading = false + }) }; - + // getpromotionrecordstableData() //导出功能 - const handleExport = ()=>{ + const handleExport = () => { window.open( - `${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${ - state.currentPage1 - }&pageSize=${state.pageSize1}&name=${state.searchParam.name ? state.searchParam.name : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}` - ); - // this.download('lesson_records/export', { - // ...state.searchParam - // }, `project_${new Date().getTime()}.xlsx` ) - } + `${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.currentPage1 + }&pageSize=${state.pageSize1}&name=${state.searchParam.name ? state.searchParam.name : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}` + ); + // this.download('lesson_records/export', { + // ...state.searchParam + // }, `project_${new Date().getTime()}.xlsx` ) + } return { ...toRefs(state), handleExport, @@ -711,14 +674,14 @@ export default { createTeacherDialog, handleOperate, closehandleOperate, - getTableDate, //list接口数据调用 + getTableDate, //list接口数据调用 TeacherSystem, particulars, teacherrecords, promotionrecords, teacherrecordstableData, teacherrecordsColumns, - getteacherrecordstableData , + getteacherrecordstableData, teacherchangePagination, // getpromotionrecordstableData @@ -729,11 +692,11 @@ export default {