diff --git a/src/components/project/lockLecturer.vue b/src/components/project/lockLecturer.vue index fcc63288..58ba86c1 100644 --- a/src/components/project/lockLecturer.vue +++ b/src/components/project/lockLecturer.vue @@ -59,8 +59,17 @@ +
+ + + +
- +
@@ -133,10 +142,39 @@ const columnsTwo = [ key: 'age', }, ] +const columnsThree = ref([ + { + title: '审批提交时间', + dataIndex: 'name', + key: 'name', + }, + { + title: '审批状态', + dataIndex: 'age', + key: 'age', + }, + { + title: '审批人', + dataIndex: 'address', + key: 'age', + }, + { + title: '操作', + dataIndex: 'address', + key:'age', + slots: { customRender: "action" }, + } +]) +const threeList = ref(false) +const lookList = (record) => { + console.log(record,'resssssss') + threeList.value = true +} const visible = ref(false); watch(visible, (val)=>{ console.log(val,'val',props.id) if(val){ + threeList.value = false api.getAffiliationById(props.id).then(res=>{ console.log(res,'resssss') formData.value = res.data.data diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 371392a2..d135cdbf 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -89,12 +89,12 @@ 查看 - 编辑 - 编辑 + 停用 - 启用 - 删除 + 删除 diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue index 7be16677..95a629d7 100644 --- a/src/views/lecturer/LecturerAPPEdit.vue +++ b/src/views/lecturer/LecturerAPPEdit.vue @@ -599,7 +599,7 @@ export default { scopedSlots: { customRender: "teacherOrg" }, }, { - title: '讲师发薪地 ', + title: '讲师体系', dataIndex: 'trainOrgName', key: 'trainOrgName', elipsis: true, @@ -607,7 +607,39 @@ export default { width: 200, }, { - title: '授课时长(系统 ) ', + title: '讲师等级', + dataIndex: 'trainOrgName', + key: 'trainOrgName', + elipsis: true, + align: "center", + width: 200, + }, + { + title: '发薪地', + dataIndex: 'trainOrgName', + key: 'trainOrgName', + elipsis: true, + align: "center", + width: 200, + }, + { + title: '课程类型', + dataIndex: 'trainOrgName', + key: 'trainOrgName', + elipsis: true, + align: "center", + width: 200, + }, + { + title: '课程名称', + dataIndex: 'trainOrgName', + key: 'trainOrgName', + elipsis: true, + align: "center", + width: 200, + }, + { + title: '授课/开发课程日期', dataIndex: 'teachingSystem', key: 'teachingSystem', elipsis: true, @@ -615,13 +647,37 @@ export default { width: 200, }, { - title: '授课时长(录入) ', + title: '授课/开发课程时长 ', dataIndex: 'teachingEnter', key: 'teachingEnter', elipsis: true, align: "center", width: 200, }, + { + title: '参训人数 ', + dataIndex: 'trainOrgName', + key: 'trainOrgName', + elipsis: true, + align: "center", + width: 200, + }, + { + title: '评分 ', + dataIndex: 'trainOrgName', + key: 'trainOrgName', + elipsis: true, + align: "center", + width: 200, + }, + { + title: '课程基准 ', + dataIndex: 'trainOrgName', + key: 'trainOrgName', + elipsis: true, + align: "center", + width: 200, + }, { title: '计划费用 ', dataIndex: 'expense', diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue index dd731a90..c3c6e986 100644 --- a/src/views/lecturer/LecturerFeeStatistics.vue +++ b/src/views/lecturer/LecturerFeeStatistics.vue @@ -349,7 +349,7 @@ export default { //讲师信息弹窗 const handleModify = (record) => { state.teacherdialog = true; - state.teacherdialogtitle = '讲师费月度统计详情' + state.teacherdialogtitle = '月度统计详情' TeacherSystem() } const TrainOrglist = ref([ @@ -357,13 +357,14 @@ export default { //获取培训发生组织 const TrainOrglista = () => { getTrainOrg().then((res) => { + console.log(res,'ressss') if (res.data.code === 200) { - let arr = res.data.data; + let arr = res.data.data.records; let array = []; - arr.map((value) => { + arr?.map((value) => { let obj = { value: value.id, - label: value.name, + label: value.affiliationName, }; array.push(obj); }); @@ -382,12 +383,12 @@ export default { // console.log('getOrganizationList') getOrganization().then((res) => { if (res.data.code === 200) { - let arr = res.data.data; + let arr = res.data.data.records; let array = []; - arr.map((value) => { + arr?.map((value) => { let obj = { - value: value.departId, - label: value.orgName, + value: value.affiliationCode, + label: value.affiliationName, }; array.push(obj); }); diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue index ac19d8ec..6f1e9703 100644 --- a/src/views/lecturer/MonthlyStatistics.vue +++ b/src/views/lecturer/MonthlyStatistics.vue @@ -26,7 +26,7 @@ v-on:keydown.enter="enterPressHadlerSearch"/> - - + --> + +
查询 @@ -183,7 +186,7 @@ export default { payrollPlaceId: null, departId: null, summaryDate:null, - id: '2', + id: route.query.id, trainOrgId: '', }, name:null, @@ -228,7 +231,7 @@ export default { scopedSlots: { customRender: "teacherOrg" }, }, { - title: '讲师发薪地 ', + title: '发薪地', dataIndex: 'trainOrgName', key: 'trainOrgName', elipsis: true, @@ -251,6 +254,14 @@ export default { align: "center", width: 200, }, + { + title: '开发课程时长 ', + dataIndex: 'expense', + key: 'expense', + elipsis: true, + align: "center", + width: 200, + }, { title: '计划费用 ', dataIndex: 'expense', @@ -290,6 +301,7 @@ export default { //获取讲师发薪地列表 const PlaceOfPayLista = () => { getPayRollPlace().then((res) => { + if (res.data.code === 200) { let arr = res.data.data; let array = []; @@ -328,12 +340,12 @@ export default { // console.log('getOrganizationList') getOrganization().then((res) => { if (res.data.code === 200) { - let arr = res.data.data; + let arr = res.data.data.records; let array = []; - arr.map((value) => { + arr?.map((value) => { let obj = { - value: value.departId, - label: value.orgName, + value: value.affiliationCode, + label: value.affiliationName, }; array.push(obj); }); @@ -341,7 +353,7 @@ export default { } }) } - // getOrganizationLista() + getOrganizationLista() //表格内查看数据操作 const handleLook = (record) => { state.drawer={ @@ -378,11 +390,13 @@ export default { const searchReset = () => { state.searchParam = { pageNo: "1", - pageSize: "10", - name : null, - payrollPlaceId: null, - departId: null, - summaryDate:null, + pageSize: "10", + id: route.query.id, + name : '', + payrollPlaceId: null, + departId: '', + summaryDate:'', + trainOrgId: '', }; getTableDate(); }; diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue index 46eaff54..7f51a2a6 100644 --- a/src/views/lecturer/Organization.vue +++ b/src/views/lecturer/Organization.vue @@ -36,10 +36,10 @@ @@ -349,8 +349,8 @@ export default{ }, { title: '状态', - dataIndex: 'type', - key: 'type', + dataIndex: 'status', + key: 'status', ellipsis: true, align: "center", width: 160, customRender: ({text})=>{ @@ -360,9 +360,11 @@ export default{ case '2': return 审核中; case '3': - return 已完成; + return 审核通过; case '4': - return 审核失败; + return 拒绝; + case '5': + return 撤回; default: return -; }