From ef32cde8c9a5873b97d2bb43cab6ff202ffe5e28 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 3 Jan 2025 10:31:20 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/lecturerFeeManagement.js | 2 ++ src/views/lecturer/LecturerFeeStatistics.vue | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/api/lecturerFeeManagement.js b/src/api/lecturerFeeManagement.js index fdd837ad..f5986576 100644 --- a/src/api/lecturerFeeManagement.js +++ b/src/api/lecturerFeeManagement.js @@ -27,6 +27,8 @@ export const withdrawRecord= (obj) => http.post('/admin/expenseBill/withdrawReco export const confirm= (obj) => http.post('/admin/teacherExpense/confirm',obj) //获取培训发生组织列表 export const getTrainOrg= (obj) => http.get('/admin/affiliation/list',{params: obj}) +//获取资源归属所有 +export const getParentAapprovallist= (obj) => http.get('/admin/affiliation/getParentAapprovallist',{params: obj}) // 根据发生组织查询汇总的讲师费数据（一键确认弹框使用） export const getListByIds= (obj) => http.get('/admin/teacherExpense/getListByIds',{params: obj}) //根据发生组织查询汇总的数据（一键确认弹框使用） diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue index 2fc5b688..2a55b31a 100644 --- a/src/views/lecturer/LecturerFeeStatistics.vue +++ b/src/views/lecturer/LecturerFeeStatistics.vue @@ -181,7 +181,7 @@ import { useRouter } from "vue-router"; import { getOrganization } from "../../api/Teaching"; import { queryTeacherFeeMonthly, getTeacherFeeDetailListByTeacherNo, getTeacherFeeListByTeacherNo,TeacherFeeTotalList,createMonthSummary} from "../../api/lecturerFeeStatistics" ; -import {expenseSummaryList,getTrainOrg,CreateMonthSummary,isShowReimport} from "../../api/lecturerFeeManagement"; +import {expenseSummaryList,getTrainOrg,getParentAapprovallist,CreateMonthSummary,isShowReimport} from "../../api/lecturerFeeManagement"; import dialog from '@/utils/dialog' import MonthlyStatistics from './MonthlyStatistics' export default { @@ -383,10 +383,10 @@ export default { ]) //获取培训发生组织 const TrainOrglista = () => { - getTrainOrg().then((res) => { + getParentAapprovallist().then((res) => { console.log(res,'ressss') if (res.data.code === 200) { - let arr = res.data.data.records; + let arr = res.data.data; let array = []; arr?.map((value) => { let obj = { @@ -427,7 +427,7 @@ export default { } }) } - getOrganizationLista() + // getOrganizationLista() //二级页面取消按钮 const cancelTeacherDialog = () => { if (state.teacherdialog = true) { From 7684bfd5cd48a1c8d60f3707480e09b544995515 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 3 Jan 2025 17:14:57 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Lecturer.js | 4 +- src/views/lecturer/InsideTeaching.vue | 76 ++++++++++++++++-------- src/views/lecturer/LecturerFee.vue | 13 ++-- src/views/lecturer/MonthlyStatistics.vue | 73 +++++++++++++++++------ 4 files changed, 116 insertions(+), 50 deletions(-) diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index b40f7629..24ae116e 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -76,7 +76,9 @@ export const isEnable = (obj) => http.post(`/admin/affiliation/isEnable`,obj) //撤回培训发生组织 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||''}&pageNo=${obj.pageNo}&pageSize=${obj.pageSize}`) +//撤回讲师费统计详情 +export const removeBySummaryId = (obj) => http.post(`/admin/expenseSummary/removeBySummaryId?summaryId=${obj.summaryId}`,obj) //查看月度讲师费详情 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/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 618a8d88..7e877d9e 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -28,28 +28,37 @@ - + :options="AuthenticationStatusList" allowClear v-on:keydown.enter="enterPressHadlerSearch"> - + - + > --> + + + + + + - + allowClear v-on:keydown.enter="enterPressHadlerSearch"> + {{{0:'否',1:'是'}[formParam.createdFee]}} {{ formParam.remark||'-' }}
@@ -549,6 +559,7 @@ export default { const formRef = ref(); const router = useRouter(); const state = reactive({ + orgListSearch: [], moreid: 1, title: '导入内部授课记录', vf: false, @@ -598,7 +609,7 @@ export default { pageSize: 10, managerId: null, name: null, - createFrom: null, + type: null, courseStatus: null, orgId: null, sourceBelongFullName:null, @@ -643,6 +654,11 @@ export default { const LecturerSystemList = ref([ // { value: 0, systemName: "讲师体系" }, ]); + const LecturerLevelList = ref([ + {value:'',label:'全部'}, + {value:'0',label:'否'}, + {value:'1',label:'是'} + ]) //获取讲师体系列表 const LecturerSystemLista = () => { let obj = { @@ -689,8 +705,8 @@ export default { ]) const entryTypeList = ref([ { value: '', label: "全部" }, - { value: '0', label: "系统生成" }, - { value: '1', label: "手动录入" }, + { value: '0', label: "在线课" }, + { value: '1', label: "面授课" }, ]) const scoreList = ref([ { value: '', label: "全部" }, @@ -902,7 +918,7 @@ export default { } }, { - title: '是否生成课时费 ', + title: '是否生成讲师费 ', dataIndex: 'createdFee', key: 'createdFee', ellipsis: true, align: "center", @@ -948,6 +964,15 @@ export default { value: item.id } }) + state.orgListSearch = res.data.data?.map(item=>{ + return{ + label: item.affiliationName, + value: item.id + } + }) + state.orgListSearch.unshift({ + label: '全部', value: '' + }) }) } const changeOrg = (e,l) => { @@ -975,8 +1000,10 @@ export default { } else if (state.moreid == 2) { state.moreid = 1 - state.searchParam.createFrom = null - state.searchParam.courseStatus = null + // state.searchParam.type = null + // state.searchParam.courseStatus = null + state.searchParam.trainOrgId = null + state.searchParam.createdFee = null state.searchParam.orgId = null state.searchParam.sourceBelongFullName = null state.searchParam.tSystemId = null @@ -1018,7 +1045,7 @@ export default { managerId: null, name: null, courseName: null, - createFrom: null, + type: null, courseStatus: null, orgId: null, sourceBelongFullName :null, @@ -1048,7 +1075,7 @@ export default { let findValue = false; tableData.value.some(item=>{ if(item.createFrom == 1 && item.isSuperPermission === 'true'){ - columns.value[14].width = 160 + columns.value[columns.value.length-1].width = 160 findValue = true return true } @@ -1056,9 +1083,9 @@ export default { if(!findValue){ const text = tableData.value.find(item=>item.createFrom == 1) if(text){ - columns.value[14].width = 120 + columns.value[columns.value.length-1].width = 120 }else{ - columns.value[14].width = 100 + columns.value[columns.value.length-1].width = 100 } } }) @@ -1400,7 +1427,7 @@ export default { //导出功能 const handleExport = () => { window.open( - `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?recordType=1&name=${state.searchParam.name || ''}&courseName=${state.searchParam.courseName || ''}&createFrom=${state.searchParam.createFrom || ''}&courseStatus=${state.searchParam.courseStatus || ''}&tSystemId=${state.searchParam.tSystemId || ''}&beginTime=${state.searchParam.beginTime || ''}&endTime=${state.searchParam.endTime || ''}&orgId=${state.searchParam.orgId || ''}&courseTypeId=${state.searchParam.courseTypeId || ''}&score=${state.searchParam.score || ''}&studys=${state.searchParam.studys || ''} + `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?recordType=1&name=${state.searchParam.name || ''}&courseName=${state.searchParam.courseName || ''}&type=${state.searchParam.type || ''}&courseStatus=${state.searchParam.courseStatus || ''}&tSystemId=${state.searchParam.tSystemId || ''}&beginTime=${state.searchParam.beginTime || ''}&endTime=${state.searchParam.endTime || ''}&orgId=${state.searchParam.orgId || ''}&courseTypeId=${state.searchParam.courseTypeId || ''}&score=${state.searchParam.score || ''}&studys=${state.searchParam.studys || ''} `) console.log(state.searchParam.name, state.searchParam, '参数') } @@ -1493,6 +1520,7 @@ export default { handleExport, handleImport, LecturerSystemList, + LecturerLevelList, scoreList, studysList, OnTheJobStatusList, diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 0d087e53..665e980d 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -344,7 +344,7 @@ src="@/assets/images/coursewareManage/asterisk.png" alt="" /> - 授课/课程日期 : + {{formParam.courseType==2?'课程':'授课'}}日期 : @@ -361,7 +361,7 @@ src="@/assets/images/coursewareManage/asterisk.png" alt="" /> - 授课时长 + {{formParam.courseType==2?'课程时长':'授课时长'}} @@ -516,24 +516,25 @@ 讲师费用详情 {{formParam.name}} - {{formParam.userNo}} + {{formParam.tsystemName}} {{formParam.tlevelName }} {{formParam.orgName}} - {{formParam?.payrollPlace || '-'}} + {{formParam?.payrollPlace || '-'}} {{{0:'在线',1:'面授',2:'课程开发',3:'作业员入模培训',4:'其他'}[formParam?.courseType]}} {{formParam.courseName || '-'}} {{formParam.trainOrgName || '-'}} - {{(formParam.teachingDate) || '-'}} + {{(formParam.teachingDate) || '-'}} {{formParam.teachingTime || '-'}}分 ({{(formParam.teachingTime/60).toFixed(2)}}小时) {{formParam.studys?formParam.studys+'人' : '-'}} {{formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0)+'分':'-' }} - {{formParam.levelPay||formParam.levelPay==0?formParam.levelPay+'元' : '-'}} + {{formParam.levelPay||formParam.levelPay==0?formParam.levelPay+'元' : '-'}} {{formParam.expense?formParam.expense+'元': '-'}} {{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'审核通过', 4:'审核拒绝',5:'待提交'}[formParam?.status]}} + {{{"0": "在线课","1": "面授课","2": "课程开发","3": "作业员入模培训","4": "其他",}[formParam.courseType + ""]}} {{formParam.remark || '-'}}
diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue index 2ce72277..b9f98512 100644 --- a/src/views/lecturer/MonthlyStatistics.vue +++ b/src/views/lecturer/MonthlyStatistics.vue @@ -25,7 +25,7 @@
- @@ -71,11 +71,15 @@
+ :data-source="tableData" :loading="tableLoading" :scroll="{ x: 600}" :pagination="pagination"> + " @@ -84,13 +88,13 @@
-
+ @@ -159,12 +163,14 @@ import { useRouter,useRoute } from "vue-router"; import { UploadOutlined, } from '@ant-design/icons-vue'; - import { getPayRollPlace,expenseSummaryById ,queryDetailId} from "../../api/Lecturer"; + import { getPayRollPlace,expenseSummaryById ,removeBySummaryId,queryDetailId} from "../../api/Lecturer"; import { getOrganization } from "../../api/Teaching"; import ProjectManager from "@/components/project/ProjectManagerNew"; import {queryTeacherFeeMonthly} from "../../api/lecturerFeeStatistics"; import {CostDetails} from "../lecturer/CostDetails.vue" // import * as api from '@/api/Lecturer' +import dialog from '@/utils/dialog' +import {message} from 'ant-design-vue' export default { name: "MonthlyStatistics", components: { @@ -245,8 +251,9 @@ export default { const endOrg = (val) => { if(val){ const parts = val.split('/'); - const reversedParts = parts.reverse(); - return reversedParts.join('/'); + // const reversedParts = parts.reverse(); + // return reversedParts.join('/'); + return parts[parts.length - 1] } } //获取内容分类 @@ -276,9 +283,10 @@ export default { ellipsis: true, align: "center", width: 160, - customRender: ({text})=>{ - return endOrg(text) - } + // customRender: ({text})=>{ + // return endOrg(text) + // }, + slots: { customRender: "orgName" }, }, { title: '发薪地', @@ -350,7 +358,7 @@ export default { ellipsis: true, align: "center", fixed: "right", - width: 100, + width: 120, scopedSlots: { customRender: "action" }, }, ]) @@ -391,8 +399,7 @@ export default { state.tableLoading = true expenseSummaryById(state.searchParam) .then((res) => { - console.log(res,'resssss') - tableData.value = res.data.data + tableData.value = res.data.data.records state.tableDataTotal = Number(res.data.data.total); state.tableLoading = false }).catch(err=>{ @@ -438,6 +445,24 @@ export default { state.opendrawer=true searchSubmitdrawer() } + const handleLess = (record) => { + console.log(record,'record') + dialog({ + content: '是否确认撤回 ?', + ok:()=>{ + removeBySummaryId({summaryId:record.id}).then(res=>{ + if(res.data.code == 200){ + message.success('撤回成功') + searchSubmit() + }else{ + message.error(res.data.msg) + } + }).catch(err=>{ + message.error(err.data.msg) + }) + } + }) + } const searchTimeChange = (e) => { console.log(e,'eeeee') if(e){ @@ -449,6 +474,14 @@ export default { } } + const pagination = computed(() => ({ + total: state.tableDataTotal, + showSizeChanger: true, + showQuickJumper:true, + current: state.searchParam.pageNo, + pageSize: state.searchParam.pageSize, + onChange: changePagination, + })); const changePagination = (page, pageSize) => { state.searchParam.pageNo = page; // state.pageNo = page; @@ -659,7 +692,9 @@ export default { searchReset, handleFeeMonthly, handleLook, + handleLess, changePagination, + pagination, searchTimeChange, searchSubmitdrawer, getTableDate, @@ -1043,9 +1078,9 @@ export default { // /* 确保文字垂直居中 */ // } ::v-deep .ant-select-single:not(.ant-select-customize-input) .ant-select-selector { - height: 40px !important; - line-height: 40px; - border-radius: 8px + height: 32px !important; + // line-height: 40px; + // border-radius: 8px } // 抽屉内样式 @@ -1063,8 +1098,8 @@ export default { margin-right: 20px } ::v-deep .ant-select:not(.ant-select-customize-input) .ant-select-selector{ - border-radius:8px; - height:40px; + // border-radius:8px; + height:32px; } .ant-col-12{ height:90px; From 2a9fe9cfd79af9f62b43ea046dd7b71bc409f941 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Sat, 4 Jan 2025 17:06:16 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/LecturerFeeStatistics.vue | 6 +++++- src/views/lecturer/MonthlyStatistics.vue | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue index 2a55b31a..2f4d4237 100644 --- a/src/views/lecturer/LecturerFeeStatistics.vue +++ b/src/views/lecturer/LecturerFeeStatistics.vue @@ -168,7 +168,7 @@
- +