From 8a6d8edca0cd6bef84148c1a6851927ff8e6289a Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 1 Nov 2024 11:01:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Lecturer.js | 3 +- src/components/project/ConfirmLecturer.vue | 22 +++++++----- src/components/project/ImportWork.vue | 8 +++-- src/components/project/SearchTeacher.vue | 30 ++++++++++++++-- src/views/lecturer/LecturerApproval.vue | 6 ++-- src/views/lecturer/LecturerFee.vue | 40 ++++++++++++++-------- src/views/lecturer/MonthlyStatistics.vue | 5 +-- 7 files changed, 81 insertions(+), 33 deletions(-) diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index 7645dc3a..22de65ac 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -1,4 +1,5 @@ import http from "./config"; +import https from "./confign"; /* * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-18 14:09:43 @@ -46,7 +47,7 @@ export const fileUp = (obj) => http.post('/file/upload', obj) //组织树查询讲师 export const getTeacherByDepartId = (obj) => http.get(`/admin/thirdApi/user/list?departId=${obj.organizationId}&pageNo=1&pageSize=1000&keyword=`) //根据姓名工号查询讲师 -export const getTeacherByNameOrUserNo = (obj) => http.get(`/admin/thirdApi/user/list?keyword=${obj.nameOrUserNo}&pageNo=1&pageSize=50&departId=`) +export const getTeacherByNameOrUserNo = (obj) => https.get(`/user/tacherList?keyword=${obj.nameOrUserNo}&pageNo=1&pageSize=50&departId=`) //根据userid获取讲师体系信息 export const getSystemInfoByUserId = (id) => http.get(`/admin/system/getSystemInfoByUserId?id=${id}`) //讲师搜索 diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue index fe504e25..a62e8b63 100644 --- a/src/components/project/ConfirmLecturer.vue +++ b/src/components/project/ConfirmLecturer.vue @@ -134,15 +134,21 @@ const handleConfirm = () => { } numTime.value+=1 localStorage.setItem('numTime',numTime.value) - const obj = { - id: '1', - status: 1 - } - api.isConfirm(obj).then(res=>{ + const ids = expenseList.value.map(item=>item.id) + api.teacherExpenseConfirm(ids).then(res=>{ console.log(res,'resssss') - message.success('提交成功') - close() - closeDrawer() + const obj = ids.map(item=>{ + return { + id: item, + status: 1 + } + }) + api.isConfirm(obj).then(res=>{ + console.log(res,'resssss') + message.success('提交成功') + close() + closeDrawer() + }) }) } const forData = ref() diff --git a/src/components/project/ImportWork.vue b/src/components/project/ImportWork.vue index 074f6a3b..3d842ade 100644 --- a/src/components/project/ImportWork.vue +++ b/src/components/project/ImportWork.vue @@ -31,7 +31,7 @@
上传：
-

@@ -159,7 +159,11 @@ import {getCookieForName} from "@/api/method"; title:{ type: String, default: null, - } + }, + fileName:{ + type: String, + default: 'file', + }, }, setup(props, ctx) { const state = reactive({ diff --git a/src/components/project/SearchTeacher.vue b/src/components/project/SearchTeacher.vue index c17a0831..51b62a3f 100644 --- a/src/components/project/SearchTeacher.vue +++ b/src/components/project/SearchTeacher.vue @@ -97,9 +97,17 @@ const props = defineProps({ id:{ type: String, default: '', - } + }, + payrollPlaceCode: { + type: String, + default: '', + }, + payrollPlaceName: { + type: String, + default: '', + }, }) -const emit = defineEmits(['update:value','update:lable','update:system','update:level','update:newlable','update:orgId','update:id']) +const emit = defineEmits(['update:value','update:lable','update:system','update:level','update:newlable','update:orgId','update:id','update:payrollPlaceCode','update:payrollPlaceName']) const visible = ref(false); const selectData = ref(null); watch(()=>props.value,(val)=>{ @@ -120,6 +128,8 @@ function blur() { } const orgName = ref('') const orgId = ref('') +const payrollPlaceCode = ref('') +const payrollPlaceName = ref('') const systemName = ref(null) const levelName = ref('') const neworgName = ref('') @@ -133,6 +143,8 @@ const handleChange = (e,l) => { levelName.value = l.levelName teacherId.value = l.key orgId.value = l.orgId + payrollPlaceCode.value = l.payrollPlaceCode + payrollPlaceName.value = l.payrollPlaceName if( l.orgName !==null ){ neworgName.value= orgName.value.split('/') neworgName.value= neworgName.value[ neworgName.value.length-1] @@ -171,7 +183,9 @@ const searchMember = (keyword) => { orgName: item.orgName, orgId: item.departId, tSystemName:item.tSystemName, - sLevelName:item.sLevelName + sLevelName:item.sLevelName, + payrollPlaceCode: item.payrollPlaceCode, + payrollPlaceName:item.payrollPlaceName } }) }else{ @@ -234,6 +248,8 @@ function stuStuOrgSelect(e, {selected: bool, selectedNodes, node, event}) { systemName.value = null levelName.value = '' teacherId.value = '' + payrollPlaceCode.value = '' + payrollPlaceName.value = '' if(selectedNodes[0].isLeaf){ teacherName.value = selectedNodes[0].name orgName.value = selectedNodes[0].orgName @@ -242,6 +258,8 @@ function stuStuOrgSelect(e, {selected: bool, selectedNodes, node, event}) { levelName.value = selectedNodes[0].levelName teacherId.value = selectedNodes[0].id // emit('update:value',selectedNodes[0].realName) + payrollPlaceCode.value = selectedNodes[0].payrollPlaceCode + payrollPlaceName.value = selectedNodes[0].payrollPlaceName } } watch(()=>visible.value,(val)=>{ @@ -260,6 +278,8 @@ watch(()=>visible.value,(val)=>{ loadingChange.value = false // teacherId.value = '1012311820121276416' // changeneworg() + payrollPlaceCode.value = '' + payrollPlaceName.value = '' } }) const notChange = () => { @@ -272,6 +292,8 @@ const notChange = () => { neworgName.value='' teacherId.value = '' loadingChange.value = false + payrollPlaceCode.value = '' + payrollPlaceName.value = '' } const loadingChange = ref(false) watch(()=>teacherId.value,(val)=>{ @@ -320,6 +342,8 @@ const changeOut = () => { emit('update:level',levelName.value) emit('update:newlable',neworgName.value) emit('update:id',teacherId.value) + emit('update:payrollPlaceCode',payrollPlaceCode.value) + emit('update:payrollPlaceName',payrollPlaceName.value) notChange() } diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 9f9cada3..82c7ca18 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -307,12 +307,12 @@ } getTrainOrg(obj).then((res)=>{ if (res.data.code === 200) { - let arr = res.data.data; + let arr = res.data.data.records; let array = []; arr.map((value) => { let obj = { - value: value.trainorgId, - label: value.trainOrg, + value: value.affiliationCode, + label: value.affiliationName, }; array.push(obj); }); diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index dfc22528..65f1bb27 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -110,9 +110,9 @@ @@ -355,13 +355,13 @@ @closa="cancelTeachingDialog" :maskClosable="true" width="60%" title="查看讲师费用"> 讲师费用详情 - + {{formParam.name}} {{formParam.userNo}} - {{formParam.teacherOrg}} - {{formParam.systemName}} - {{formParam.levelName }} - {{formParam.teacherpayrollPlace}} + {{formParam.orgName}} + {{formParam.tsystemName}} + {{formParam.tlevelName }} + {{formParam.payrollPlace}} "费用类型(未命名)" {{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':''}} {{formParam.courseName}} @@ -369,7 +369,7 @@ {{formParam.teachingDate}} {{formParam.studys}} {{formParam.score}} - {{formParam.teacherlevelPay}} + {{formParam.levelPay}} {{formParam.expense}} {{formParam.payableExpense}} {{formParam.status=="0"?'待确认' :formParam.status=="1"?'待提交':formParam.status== "2" ?'审核中':formParam.status== "3"?'审核通过':''}} @@ -392,7 +392,7 @@

- +
@@ -635,8 +635,9 @@ console.log( "讲师体系id" +val); title: '课程名称 ', dataIndex: 'courseName', key: 'courseName', - elipsis: true, align: "center", - width: 120, + elipsis: true, + align: "center", + width: 200, }, { title: '培训发生组织', @@ -778,9 +779,9 @@ console.log( "讲师体系id" +val); title: '操作 ', dataIndex: 'operation', key: 'operation', - elipsis: true, align: "right", + elipsis: true, align: "center", fixed: "right", - width: 400, + width: 160, scopedSlots: { customRender: "action" }, }, @@ -1017,6 +1018,17 @@ console.log( "讲师体系id" +val); // state.formParam=Object.assign({} ,res.data.data) state.formParam=res.data.data // tableDataFeeDetail.value = res.data.data.records + state.formParam.courseType = String(res.data.data.courseType) + state.formParam.levelPay = String(res.data.data.levelPay) + state.tSystemNames.systemName = res.data.data.tsystemName + state.tSystemNames.systemId = res.data.data.tsystemId + state.tSystemNames.systemCode = res.data.data.systemCode + state.tSystemNames.levelVoList = res.data.data.levelVoList + state.formParam.tlevelName = res.data.data.tlevelName + state.formParam.tlevelId = res.data.data.tlevelId + state.formParam.name = res.data.data.name+'/'+res.data.data.userNo + state.teachingDate = dayjs(res.data.data.teachingDate) + }) .catch((err) => { console.log("详情", err); diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue index 3bdf61e7..dd2228d2 100644 --- a/src/views/lecturer/MonthlyStatistics.vue +++ b/src/views/lecturer/MonthlyStatistics.vue @@ -366,9 +366,10 @@ export default { // 导出 const handleFeeMonthly = () => { window.open( - `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherSummary?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize} + `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherSummary? &name=${state.searchParam.name ? state.searchParam.name : ""} - &payrollPlaceId=${state.searchParam.payrollPlaceId ? state.searchParam.payrollPlaceId : ""}`) + &billId=${state.searchParam.payrollPlaceId ? state.searchParam.payrollPlaceId : ""} + &trainOrgId=${state.searchParam.courseTypeId || ''}`) } //重置 const searchReset = () => {