diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 126fe924..abcf574e 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -613,26 +613,26 @@ - 讲师列表 + 讲师列表 - 授课记录 + 授课记录 讲师费管理 @@ -640,12 +640,30 @@ 讲师费统计 + + + 归属组织管理 + + + + 讲师体系管理 + @@ -663,10 +681,10 @@ @click="handleClick" > - 讲师列表 + 讲师列表 - 授课记录 + 授课记录 讲师费管理 @@ -674,6 +692,12 @@ 讲师费统计 + + 归属组织管理 + + + 讲师体系管理 + 审核 @@ -1026,7 +1050,7 @@ export default { { href: "/externalteaching", openKeys: "sub27", - selectedKeys: "ssub27", + selectedKeys: "sub27", pagename: "外部授课", }, { diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index ecfadcbf..b0e8e7a4 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -154,11 +154,10 @@ - - {{ (formParam.defaultTeachingTime / 60 - ).toFixed(2) }}小时 + {{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时 @@ -310,6 +309,7 @@ export default { formParam: { status: 1, entryType:1, + defaultTeachingTime:0 }, searchParam: { pageNo: 1, @@ -662,6 +662,7 @@ export default { duration: null, score: null, remark: null, + defaultTeachingTime:0 } } diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index a23deee9..d57a038c 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -200,10 +200,10 @@ - - {{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时 + {{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时 @@ -345,7 +345,7 @@ import dayjs from "dayjs"; import ProjectManager from "@/components/project/ProjectManagerNew"; import { message } from "ant-design-vue"; import { getTeacherSystemList, infoteacher, getTeacherExpertise, deleteInTeacherCourse } from "../../api/Lecturer"; -import { getNewInTeacherCourseList, getOrganization, getTeacherCourseList, insertInTeacherCourse, updateInTeacherCourse } from "../../api/Teaching"; +import { getNewInTeacherCourseList, getOrganization, getTeacherCourseList, insertInTeacherCourse, updateInTeacherCourse ,getCharges} from "../../api/Teaching"; // import AddTeacher from "../../components/drawers/project/AddTeacher" export default { name: "InsideTeaching", @@ -363,6 +363,7 @@ export default { setup() { const router = useRouter(); const state = reactive({ + tableLoadings:false, moreid: 1, currentPage1: 1, pageSize1: 10, @@ -384,6 +385,7 @@ export default { formParam: { status: 1, entryType:1, + defaultTeachingTime:0 }, searchParam: { userNo: null,//工号姓名 @@ -786,7 +788,7 @@ export default { systemId:null, levelId: null, teacherNo:null, - defaultTeachingTime: null, + defaultTeachingTime: 0, beginTime: null, studys: null, score: null, @@ -817,6 +819,7 @@ export default { state.lookTeacherId = record.teacherId // // alert(record.grade) TeacherSystem(record) + gettableDatas(record) // let id = record.userNo // router.push({ path: '/insideteachingdetail', query: { id } }) // router.push({ path: '/InsideTeachingDetail' }) @@ -857,8 +860,8 @@ export default { } const column = ref([ { title: '基准课酬 ', - dataIndex: 'teacherlevelPay', - key: 'teacherlevelPay', + dataIndex: 'levelPay', + key: 'levelPay', elipsis: true, align: "center", width: 120, }, { @@ -869,9 +872,9 @@ export default { width: 120, }, { - title: '应发费用(未命名) ', - dataIndex: 'expense', - key: 'expense', + title: '应发费用 ', + dataIndex: 'payableExpense', + key: 'payableExpense', elipsis: true, align: "center", width: 120, }, @@ -906,6 +909,29 @@ export default { scopedSlots: { customRender: "action" }, }, ]) + const gettableDatas =(record)=>{ + state.tableLoadings = true + getCharges({kid:record.kid}) + .then((res) => { + console.log(res) + tableDatas.value = res.data.data.records + state.tableDataTotal = Number(res.data.data.total); + state.tableLoadings = false + }) + } + const tableDatas = ref([]) + const rules = { + teacher: [{ required: true, message: '讲师不能为空' }], + departId: [{ required: true, message: '讲师组织不能为空' }], + levelId: [{ required: true, message: '讲师级别不能为空' }], + systemId: [{ required: true, message: '讲师体系不能为空' }], + tlevelName: [{ required: true, message: '内容分类不能为空' }], + teacherNo: [{ required: true, message: '课程名称不能为空' }], + beginTime: [{ required: true, message: '授课/课程日期不能为空' }], + defaultTeachingTime: [{ required: true, message: '授课时长不能为空' }], + certStatus: [{ required: true, message: '认证状态不能为空' }], + + } //导出功能 const handleExport = () => { window.open( @@ -923,7 +949,10 @@ export default { } return { ...toRefs(state), + rules, column, + tableDatas, + gettableDatas, handlemoreid, infoteacherList, getinfoteacher, diff --git a/src/views/lecturer/LecturerSystem.vue b/src/views/lecturer/LecturerSystem.vue index 6bbb7634..0c277d3c 100644 --- a/src/views/lecturer/LecturerSystem.vue +++ b/src/views/lecturer/LecturerSystem.vue @@ -27,6 +27,7 @@