diff --git a/src/api/lecturerFeeStatistics.js b/src/api/lecturerFeeStatistics.js index 8ac31a1f..e942df57 100644 --- a/src/api/lecturerFeeStatistics.js +++ b/src/api/lecturerFeeStatistics.js @@ -1,12 +1,19 @@ import http from "./config"; -// 列表查看讲师费月度统计 -// export const queryTeacherFeeTotalList = (params) => http.get('teacher/fee/queryTeacherFeeTotalList',{ params }) -export const queryTeacherFeeTotalList = (obj) => http.post ('teacher/fee/queryTeacherFeeTotalList',obj) +// 列表查看讲师费统计 +export const TeacherFeeTotalList = (params) => http.get('/admin/expenseSummary/list',{ params }) +//讲师费统计详情 +export const TeacherFeequeryById = (params) => http.get('/admin/expenseSummary/queryById',{ params }) +//查看月度讲师费详情 +export const TeacherFeequeryDetailId = (params) => http.get('/admin/expenseSummary/queryDetailId',{ params }) +//讲师费汇总上月数据 +export const createMonthSummary = (obj) => http.post('/admin/expenseSummary/CreateMonthSummary', obj) + +// export const queryTeacherFeeTotalList = (obj) => http.post ('/admin/expenseSummary/list',obj) // 列表查看讲师费月度统计详情 -export const queryTeacherFeeMonthly = (obj) => http.post('teacher/fee/queryTeacherFeeMonthly', obj) +export const queryTeacherFeeMonthly = (obj) => http.get('/admin/expenseSummary/queryDetailId', obj) ////讲师费月度统计--明细 export const getTeacherFeeDetailListByTeacherNo = (params) => http.get('teacher/fee/getTeacherFeeDetailListByTeacherNo',{ params }) //讲师费明细 -export const getTeacherFeeListByTeacherNo = (obj) => http.post('teacher/fee/getTeacherFeeListByTeacherNo', obj) +export const getTeacherFeeListByTeacherNo = (obj) => http.get('teacher/fee/getTeacherFeeListByTeacherNo', { params }) //讲师费汇总上月数据 -export const getPreviousTeacherfee = (params) => http.get('teacher/fee/getPreviousTeacherFee', {params}) \ No newline at end of file +export const getPreviousTeacherfee = (obj) => http.post('teacher/fee/getPreviousTeacherFee', obj) \ No newline at end of file diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index 6683715a..a6694919 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -630,6 +630,8 @@ export default { // // 翻页 const changePagination = (page) => { state.searchParam.pageNo = page; + // state.pageNo = page; + state.searchParam.pageSize = pageSize; getTableDate(); }; // 新增讲师 diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 28928f6a..31279d4a 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -831,8 +831,8 @@ export default { // // 翻页 const changePagination = (page, pageSize) => { state.searchParam.pageNo = page; - state.currentPage1 = page; - state.pageSize1 = pageSize; + // state.pageNo = page; + state.searchParam.pageSize = pageSize; getTableDate(); }; // 新增授课 diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 1a278049..9f9cada3 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -101,8 +101,8 @@
{ state.searchParam.pageNo = page; - state.currentPage1 = page; - state.pageSize1 = pageSize; - getTableDate(); + // state.pageNo = page; + state.searchParam.pageSize = pageSize; + getTableDate(); }; // 新增讲师 const addTeacher = () => { @@ -628,9 +628,7 @@ //导出功能 const handleExport = ()=>{ window.open ( - `${process.env.VUE_APP_BASE_API}/teacher/fee/exportTeacherFee?pageNo=${ - state.currentPage1 - }&pageSize=${state.pageSize1}&teacherNo=${ + `${process.env.VUE_APP_BASE_API}/teacher/fee/exportTeacherFee?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&teacherNo=${ state.searchParam.teacherNo ? state.searchParam.teacherNo : "" }&tsystemName=${ state.searchParam.tsystemName ? state.searchParam.tsystemName : ""}&levelId=${ state.searchParam.levelId ? state.searchParam.levelId : "" diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 0f8fb4c4..9e08f439 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -838,9 +838,9 @@ console.log( "讲师体系id" +val); // // 翻页 const changePagination = (page,pageSize) => { state.searchParam.pageNo = page; - state.currentPage1 = page; - state.pageSize1 = pageSize; - getTableDate(); + // state.pageNo = page; + state.searchParam.pageSize = pageSize; + getTableDate(); }; // 添加讲师费 const addTeacher = () => { diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue index 74d761b7..4ccc5694 100644 --- a/src/views/lecturer/LecturerFeeStatistics.vue +++ b/src/views/lecturer/LecturerFeeStatistics.vue @@ -46,18 +46,10 @@
-
- +
+
@@ -181,9 +173,9 @@ import { message } from "ant-design-vue"; import dayjs from "dayjs"; import { useRouter } from "vue-router"; import { getOrganization } from "../../api/Teaching"; -import { queryTeacherFeeMonthly, getTeacherFeeDetailListByTeacherNo, getTeacherFeeListByTeacherNo} from "../../api/lecturerFeeStatistics" +import { queryTeacherFeeMonthly, getTeacherFeeDetailListByTeacherNo, getTeacherFeeListByTeacherNo,TeacherFeeTotalList,createMonthSummary} from "../../api/lecturerFeeStatistics" ; -import {getTeacherFeeList,getTrainOrg} from "../../api/lecturerFeeManagement"; +import {getTrainOrg} from "../../api/lecturerFeeManagement"; export default { name: "LecturerFeeStatistics", components: { @@ -258,8 +250,8 @@ export default { }, { title: '汇总日期 ', - dataIndex: 'summaryTime', - key: 'summaryTime', + dataIndex: 'summaryDate', + key: 'summaryDate', elipsis: true, align: "center", width: 200, @@ -306,7 +298,7 @@ export default { let objA = { ...state.searchParam }; objA.searchdate=state.searchdate!==null? state.searchdate: "", console.log(objA) - getTeacherFeeList(objA) + TeacherFeeTotalList(objA) .then((res) => { tableData.value = res.data.data.records state.tableDataTotal = Number(res.data.data.total); @@ -317,19 +309,19 @@ export default { //重新汇总上月数据 const searchResetPrevious=()=>{ state.tableLoading = true - const now = new Date(); - const year = now.getFullYear(); - const month = now.getMonth(); + // const now = new Date(); + // const year = now.getFullYear(); + // const month = now.getMonth(); - const lastMonthStart = new Date(year, month - 1, 1); // 上个月的月初 - const lastMonthEnd = new Date(year, month, 1); // 上个月的月末 - let obj = { - beginTime:'', - endTime:'', - } - obj.beginTime = lastMonthStart.toISOString().split('T')[0]; - obj.endTime = lastMonthEnd.toISOString().split('T')[0]; - getTeacherFeeList(obj).then((res)=>{ + // const lastMonthStart = new Date(year, month - 1, 1); // 上个月的月初 + // const lastMonthEnd = new Date(year, month, 1); // 上个月的月末 + // let obj = { + // beginTime:'', + // endTime:'', + // } + // obj.beginTime = lastMonthStart.toISOString().split('T')[0]; + // obj.endTime = lastMonthEnd.toISOString().split('T')[0]; + createMonthSummary().then((res)=>{ tableData.value = res.data.data.records state.tableDataTotal = Number(res.data.data.total); state.tableLoading = false @@ -349,6 +341,8 @@ export default { // // 翻页 const changePagination = (page, pageSize) => { state.searchParam.pageNo = page; + // state.pageNo = page; + state.searchParam.pageSize = pageSize; getTableDate(); }; //二级列表翻页 @@ -431,7 +425,7 @@ export default { } //表格内查看数据操作 const handleLook = (record) => { - let id = record.summaryDate + let id = record.id router.push({ path: '/MonthlyStatistics', query: { id } }) // state.teacherdialog = true; // state.teacherdialogtitle = '讲师费月度统计详情' @@ -1136,5 +1130,23 @@ export default { border: 0px !important; border-radius: 50%!important; } + .tableBox { +padding-bottom: 20px; +margin: 20px 38px 30px; +::v-deep .ant-select-dropdown{ + display: inline-block; +} +::v-deep .ant-select-selection-item{ +margin-left: 3px; +} +::v-deep .ant-pagination-options-size-changer.ant-select{ +width: 84px; +} +.pa { +width: 100%; +display: flex; +justify-content: right; +} +} \ No newline at end of file diff --git a/src/views/lecturer/LecturerSystem.vue b/src/views/lecturer/LecturerSystem.vue index 48bc092e..cc45692c 100644 --- a/src/views/lecturer/LecturerSystem.vue +++ b/src/views/lecturer/LecturerSystem.vue @@ -301,7 +301,9 @@ export default { }; // // 翻页 const changePagination = (page, pageSize) => { - state.searchParam.pageNo = page; + state.searchParam.pageNo = page; + // state.pageNo = page; + state.searchParam.pageSize = pageSize; getTableDate(); }; //删除弹窗 diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue index b3146bb2..f7a04d3f 100644 --- a/src/views/lecturer/LookExternalLecturer.vue +++ b/src/views/lecturer/LookExternalLecturer.vue @@ -254,6 +254,8 @@ export default{ //授课翻页 const teacherchangePagination = (page) => { state.teacherrecords.pageNo = page; + // state.pageNo = page; + state.teacherrecords.pageSize = pageSize; getteacherrecordstableData(); }; return{ diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue index 2c48ef24..b595f5cc 100644 --- a/src/views/lecturer/LookInsideLecturer.vue +++ b/src/views/lecturer/LookInsideLecturer.vue @@ -309,6 +309,8 @@ export default{ //授课翻页 const teacherchangePagination = (page) => { state.teacherrecords.pageNo = page; + // state.pageNo = page; + state.teacherrecords.pageSize = pageSize; getteacherrecordstableData(); }; //晋级记录翻页 diff --git a/src/views/lecturer/LookLecturerSystem.vue b/src/views/lecturer/LookLecturerSystem.vue index c23db825..9f25054c 100644 --- a/src/views/lecturer/LookLecturerSystem.vue +++ b/src/views/lecturer/LookLecturerSystem.vue @@ -159,6 +159,8 @@ export default{ //翻页 const teacherchangePagination = (page) => { state.teacherrecords.pageNo = page; + // state.pageNo = page; + state.teacherrecords.pageSize = pageSize; getteacherrecordstableData(); }; return{ diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue index 750eb4e2..3453611a 100644 --- a/src/views/lecturer/MonthlyStatistics.vue +++ b/src/views/lecturer/MonthlyStatistics.vue @@ -27,9 +27,21 @@ :options="PlaceOfPayList" allowClear showSearch/> - - + +
查询 @@ -124,7 +136,8 @@