diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index 19d41f13..58d4ce21 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -68,7 +68,7 @@ export const affiliationDelById = (id)=>http.post(`/admin/affiliation/delById?id //撤回培训发生组织 export const affiliatIsConfirm = (id) => http.post(`/admin/affiliation/isConfirm?id=${id}`) //讲师费统计详情 -export const expenseSummaryById = (obj) => http.get( `/admin/expenseSummary/queryById?id=${obj.id}&name=${obj.name}&trainOrgId=${obj.trainOrgId}`) +export const expenseSummaryById = (obj) => http.get( `/admin/expenseSummary/queryById?id=${obj.id}&name=${obj.name}&trainOrgId=${obj.trainOrgId||''}`) //查看月度讲师费详情 export const queryDetailId = (obj) => http.get(`/admin/expenseSummary/queryDetailId?summaryId=${obj.summaryId}&name=${obj.name}&startTime=${obj.startTime}&endTime=${obj.endTime}`) //查询未汇总的数据(批量确认弹框) diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index 471d6a9e..f3135d70 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -481,15 +481,18 @@ export default { width: 120, customRender: (value) => { return ( -
- {value.record.type == "1" || value.record.type == "0" - ? { - "1": "在线课", - "0": "面授课", - }[value.record.type + ""] || "" - : "-"} -
- ) +
+ {String(value.record.type) + ? { + "0": "在线课", + "1": "面授课", + "2": "课程开发", + "3": "作业员入模培训", + "4": "其他", + }[value.record.type + ""] + : "-"} +
+ ) } }, { diff --git a/src/views/lecturer/ExternalTeachingDetail.vue b/src/views/lecturer/ExternalTeachingDetail.vue index 25b22071..9d9eac3b 100644 --- a/src/views/lecturer/ExternalTeachingDetail.vue +++ b/src/views/lecturer/ExternalTeachingDetail.vue @@ -287,15 +287,18 @@ export default { width: 120, customRender: (value) => { return ( -
- {value.record.waitStatus == "0" || value.record.waitStatus == "1" - ? { - "0": "在线课", - "1": "面授课", - }[value.record.waitStatus + ""] || "" - : "-"} -
- ) +
+ {String(value.record.waitStatus) + ? { + "0": "在线课", + "1": "面授课", + "2": "课程开发", + "3": "作业员入模培训", + "4": "其他", + }[value.record.waitStatus + ""] + : "-"} +
+ ) } }, { diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index f23250f5..e5c73954 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -706,15 +706,18 @@ export default { width: 120, customRender: (value) => { return ( -
- {value.record.type == "1" || value.record.type == "0" - ? { - "1": "在线课", - "0": "面授课", - }[value.record.type + ""] || "" - : "-"} -
- ) +
+ {String(value.record.type) + ? { + "0": "在线课", + "1": "面授课", + "2": "课程开发", + "3": "作业员入模培训", + "4": "其他", + }[value.record.type + ""] + : "-"} +
+ ) } }, { diff --git a/src/views/lecturer/InsideTeachingDetail.vue b/src/views/lecturer/InsideTeachingDetail.vue index 2e97dcec..2cc43129 100644 --- a/src/views/lecturer/InsideTeachingDetail.vue +++ b/src/views/lecturer/InsideTeachingDetail.vue @@ -295,15 +295,18 @@ export default { width: 120, customRender: (value) => { return ( -
- {value.record.waitStatus == "0" || value.record.waitStatus == "1" - ? { - "0": "在线课", - "1": "面授课", - }[value.record.waitStatus + ""] || "" - : "-"} -
- ) +
+ {String(value.record.waitStatus) + ? { + "0": "在线课", + "1": "面授课", + "2": "课程开发", + "3": "作业员入模培训", + "4": "其他", + }[value.record.waitStatus + ""] + : "-"} +
+ ) } }, { diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue index 0a0eeaf4..bce822ee 100644 --- a/src/views/lecturer/LecturerAPPEdit.vue +++ b/src/views/lecturer/LecturerAPPEdit.vue @@ -744,14 +744,14 @@ export default { customRender: (value) => { return (
- {String(value.record. courseType) + {String(value.record.courseType) ? { "0": "在线课", "1": "面授课", "2": "课程开发", "3": "作业员入模培训", "4": "其他", - }[value.record. courseType + ""] + }[value.record.courseType + ""] : "-"}
) diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index c1a5b169..4e72ed19 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -919,14 +919,14 @@ customRender: (value) => { return (
- {String(value.record. courseType) + {String(value.record.courseType) ? { "0": "在线课", "1": "面授课", "2": "课程开发", "3": "作业员入模培训", "4": "其他", - }[value.record. courseType + ""] + }[value.record.courseType + ""] : "-"}
) diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index d8ce8698..fd7d7e3e 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -846,14 +846,14 @@ getAllLevelList().then((res) => { customRender: (value) => { return (
- {String(value.record. courseType) + {String(value.record.courseType) ? { "0": "在线课", "1": "面授课", "2": "课程开发", "3": "作业员入模培训", "4": "其他", - }[value.record. courseType + ""] + }[value.record.courseType + ""] : "-"}
) @@ -1440,12 +1440,14 @@ const column = ref([ customRender: (value) => { return (
- {value.record. courseType == "1" || value.record. courseType == "2"|| value.record.courseTypeype == "3" + {String(value.record.courseType) ? { - "1": "项目开课", - "2": "路径开课", - "3": "面授开课", - }[value.record. courseType + ""] || "" + "0": "在线课", + "1": "面授课", + "2": "课程开发", + "3": "作业员入模培训", + "4": "其他", + }[value.record.courseType + ""] : "-"}
) diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue index fb7787e4..6e6aaf7e 100644 --- a/src/views/lecturer/LookExternalLecturer.vue +++ b/src/views/lecturer/LookExternalLecturer.vue @@ -201,16 +201,18 @@ export default{ width: 120, customRender: (value) => { return ( -
- {value.record.type == 1 || value.record.type == 2 || value.record.type == 0 - ? { - "1": "在线课", - "2": "路径开课", - "0": "面授课", - }[value.record.type + ""] || "" - : "-"} -
- ) +
+ {String(value.record.type) + ? { + "0": "在线课", + "1": "面授课", + "2": "课程开发", + "3": "作业员入模培训", + "4": "其他", + }[value.record.type + ""] + : "-"} +
+ ) } }, { diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue index fb554a36..dd351a9f 100644 --- a/src/views/lecturer/LookInsideLecturer.vue +++ b/src/views/lecturer/LookInsideLecturer.vue @@ -270,16 +270,18 @@ export default{ width: 120, customRender: (value) => { return ( -
- {value.record.type == 1 || value.record.type == 2 || value.record.type == 0 - ? { - "1": "在线课", - "0": "面授课", - "2": "其他", - }[value.record.type + ""] || "" - : "-"} -
- ) +
+ {String(value.record.type) + ? { + "0": "在线课", + "1": "面授课", + "2": "课程开发", + "3": "作业员入模培训", + "4": "其他", + }[value.record.type + ""] + : "-"} +
+ ) } }, { diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue index b634d8e8..4793d202 100644 --- a/src/views/lecturer/MonthlyStatistics.vue +++ b/src/views/lecturer/MonthlyStatistics.vue @@ -51,7 +51,7 @@ :tree-data="sysTypeOptions" v-on:keydown.enter="enterPressHadlerSearch"> --> - @@ -77,14 +77,6 @@ 查看 - @@ -117,7 +109,7 @@
@@ -125,7 +117,7 @@ 重置
-讲师费发放情况 + @@ -196,12 +188,12 @@ export default { departId: null, summaryDate:null, id: route.query.id, - trainOrgId: '', + // trainOrgId: '', }, name:null, drawer: { name: '', - drawersearchdate: '', + drawersearchdate: [], pageNo: '1', pageSize: '10', endTime: '', @@ -210,6 +202,13 @@ export default { }) watch( ) + const endOrg = (val) => { + if(val){ + const parts = val.split('/'); + const reversedParts = parts.reverse(); + return reversedParts.join('/'); + } + } //获取内容分类 const store = useStore(); const sysTypeOptions = computed(() => store.state.content_type); @@ -237,12 +236,14 @@ export default { ellipsis: true, align: "center", width: 200, - scopedSlots: { customRender: "teacherOrg" }, + customRender: ({text})=>{ + return endOrg(text) + } }, { title: '发薪地', - dataIndex: 'trainOrgName', - key: 'trainOrgName', + dataIndex: 'payrollPlace', + key: 'payrollPlace', ellipsis: true, align: "center", width: 200, @@ -303,6 +304,7 @@ export default { ]) // 搜索 const searchSubmit = () => { + state.searchParam.pageNo = 1; getTableDate(); }; @@ -354,7 +356,7 @@ export default { let array = []; arr?.map((value) => { let obj = { - value: value.affiliationCode, + value: value.id, label: value.affiliationName, }; array.push(obj); @@ -368,18 +370,25 @@ export default { const handleLook = (record) => { state.drawer={ name: '', - drawersearchdate: '', + drawersearchdate: [], pageNo: '1', pageSize: '10', endTime: '', startTime: '', + id: record.id, } state.opendrawer=true searchSubmitdrawer() } const searchTimeChange = (e) => { - state.drawer.startTime = e[0] - state.drawer.endTime = e[1] + console.log(e,'eeeee') + if(e){ + state.drawer.startTime = e[0] + state.drawer.endTime = e[1] + }else{ + state.drawer.startTime = '' + state.drawer.endTime = '' + } } const changePagination = (page, pageSize) => { @@ -394,7 +403,7 @@ export default { `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherSummary? &name=${state.searchParam.name ? state.searchParam.name : ""} &billId=${state.searchParam.payrollPlaceId ? state.searchParam.payrollPlaceId : ""} - &trainOrgId=${state.searchParam.courseTypeId || ''}`) + &trainOrgId=${state.searchParam.trainOrgId || ''}`) } //重置 const searchReset = () => { @@ -406,19 +415,21 @@ export default { payrollPlaceId: null, departId: '', summaryDate:'', - trainOrgId: '', + // trainOrgId: '', }; getTableDate(); }; //二级页面重置 const searchResetdrawer =()=>{ + const id = state.drawer.id state.drawer={ name: '', - drawersearchdate: '', + drawersearchdate: [], pageNo: '1', pageSize: '10', endTime: '', startTime: '', + id, } searchSubmitdrawer() } @@ -426,7 +437,7 @@ export default { const searchSubmitdrawer=()=>{ state.tableLoadings = true const params = { - summaryId: '', + summaryId: state.drawer.id, name: state.drawer.name, endTime: state.drawer.endTime, startTime: state.drawer.startTime, @@ -471,12 +482,14 @@ export default { customRender: (value) => { return (
- {value.record. courseType == "1" || value.record. courseType == "2"|| value.record.courseTypeype == "3" + {String(value.record.courseType) ? { - "1": "项目开课", - "2": "路径开课", - "3": "面授开课", - }[value.record. courseType + ""] || "" + "0": "在线课", + "1": "面授课", + "2": "课程开发", + "3": "作业员入模培训", + "4": "其他", + }[value.record.courseType + ""] : "-"}
) @@ -501,22 +514,22 @@ export default { }, { title: '讲师体系', - dataIndex: 'systemName', - key: 'systemName', + dataIndex: 'tsystemName', + key: 'tsystemName', ellipsis: true, align: "center", width: 120, }, { title: '讲师级别 ', - dataIndex: 'levelName', - key: 'levelName', + dataIndex: 'tlevelName', + key: 'tlevelName', ellipsis: true, align: "center", width: 120, }, { title: '讲师发薪地 ', - dataIndex: 'teacherpayrollPlace', - key: 'teacherpayrollPlace', + dataIndex: 'payrollPlace', + key: 'payrollPlace', ellipsis: true, align: "center", width: 120, @@ -524,8 +537,8 @@ export default { { title: '基准课酬 ', - dataIndex: 'teacherlevelPay', - key: 'teacherlevelPay', + dataIndex: 'levelPay', + key: 'levelPay', ellipsis: true, align: "center", width: 100, }, @@ -553,7 +566,7 @@ export default { state.drawer={ name: '', - drawersearchdate: '', + drawersearchdate: [], pageNo: '1', pageSize: '10', endTime: '', @@ -590,6 +603,7 @@ export default { getOrganizationLista, searchResetdrawer, sysTypeOptions, + endOrg, } }, };