diff --git a/src/api/lecturerFeeManagement.js b/src/api/lecturerFeeManagement.js index a4d17758..d992709e 100644 --- a/src/api/lecturerFeeManagement.js +++ b/src/api/lecturerFeeManagement.js @@ -21,11 +21,11 @@ export const queryById= (obj) => http.get('/admin/expenseBill/queryById',{params export const withdrawRecord= (obj) => http.post('/admin/expenseBill/withdrawRecord',obj) //确认讲师费 export const confirm= (obj) => http.post('/admin/teacherExpense/confirm',obj) - - - //获取培训发生组织列表 -export const getTrainOrg= (obj) => http.post('/teacher/fee/getTrainOrg',obj) +export const getTrainOrg= (obj) => http.get('/admin/affiliation/list',{params: obj}) + + + //获取讲师级别 export const getTeacherLevel= (obj) => http.post('/teacher/fee/getTeacherLevel',obj) //列表查看讲师费审批(用于讲师费管理查看讲师费详情里面) diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 62cf97d1..18bc1f79 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -675,7 +675,7 @@ > 归属组织管理 - + diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 21a6d920..1a278049 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -204,9 +204,8 @@ DownloadOutlined } from '@ant-design/icons-vue'; import ProjectManager from "@/components/project/ProjectManagerNew"; - import {getPayRollPlace} from "../../api/Lecturer"; - import {expenseBillList,queryById,getTeacherFeeApprovalList ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel} from "../../api/lecturerFeeManagement"; - import { getTeacherExpertise,getTeacherSystemList } from "../../api/Lecturer"; + import {expenseBillList,queryById,getTeacherFeeApprovalList ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg} from "../../api/lecturerFeeManagement"; + import { getTeacherSystemList } from "../../api/Lecturer"; // lecturerFeeManagement // import {getProjSt} from "../../api/indexProjStu"; // import AddTeacher from "../../components/drawers/project/AddTeacher" @@ -277,27 +276,7 @@ { value: 2, label: "作业人员入模培训" }, { value: 3, label: "其他" }, ]) - //获取内容分类 - const getTeacherExpertiseList = ref([ - // { value: 0, label: "未定级" }, - ]) - const getTeacherExpertiseLista = () => { - getTeacherExpertise().then((res) => { - if (res.data.code === 200) { - let arr = res.data.data; - let array = []; - arr.map((value) => { - let obj = { - value: value.id, - label: value.name, - }; - array.push(obj); - }); - getTeacherExpertiseList.value = array; - } - }) - } - getTeacherExpertiseLista() + const lecturerSystemList = ref([ ]); ///获取讲师体系列表 @@ -322,7 +301,11 @@ const trainOrglist=ref([]) //获取培训发生组织 const trainOrglista =() => { - getTrainOrg().then((res)=>{ + let obj = { + pageNo: "1", + pageSize: "10000" + } + getTrainOrg(obj).then((res)=>{ if (res.data.code === 200) { let arr = res.data.data; let array = []; @@ -338,26 +321,7 @@ }) } trainOrglista() - //获取讲师级别 - const getLevelList = ref([ - ]) - const getLevelLista =() => { - getTeacherLevel().then((res)=>{ - if (res.data.code === 200) { - let arr = res.data.data; - let array = getLevelList.value; - arr.map((value) => { - let obj = { - value: value.levelId, - label: value.levelName, - }; - array.push(obj); - }); - getLevelList.value = array; - } - }) - } - getLevelLista() + //课程类型 const OnTheJobStatusList = ref([ { value: 1, label: "项目开课" }, @@ -369,28 +333,7 @@ { value: 0, label: "未认证" }, { value: 1, label: "已认证" }, ]) - //获取讲师发薪地列表 - const PlaceOfPayList = ref([ - // { value: 0, label: "发薪地B1" }, - ]) - const PlaceOfPayLista =() => { - getPayRollPlace().then((res)=>{ - if (res.data.code === 200) { - let arr = res.data.data; - let array = []; - arr.map((value) => { - let obj = { - value: value.id, - label: value.name, - }; - array.push(obj); - }); - PlaceOfPayList.value = array; - } - console.log("获取发薪地", PlaceOfPayList); - }) - } - PlaceOfPayLista() + //状态 const AccountStatusList = ref([ { value:"A10", label: "待审核", }, @@ -707,17 +650,11 @@ managerChange, trainOrglist, trainOrglista, - getTeacherExpertiseList, - getTeacherExpertiseLista, handlemoreid, handleExport, lecturerSystemList, - getLevelList, OnTheJobStatusList, - getLevelLista, - PlaceOfPayLista, AuthenticationStatusList, - PlaceOfPayList, AccountStatusList, searchSubmit, searchReset, diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index ed7d55b4..79ac24d1 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -52,28 +52,28 @@
- + - - - - @@ -189,7 +189,7 @@ - + @@ -202,10 +202,10 @@ - - - + + + @@ -446,8 +446,8 @@ } from '@ant-design/icons-vue'; import ImportWork from "../../components/project/ImportWork.vue"; import SearchTeacher from "@/components/project/SearchTeacher"; - import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel,deleteInTeacher,confirm} from "../../api/lecturerFeeManagement";4 - import { getTeacherExpertise,getTeacherSystemList,getLevel,getPayRollPlace,fileUp } from "../../api/Lecturer"; + import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTeacherLevel,deleteInTeacher,confirm} from "../../api/lecturerFeeManagement"; + import {getTeacherSystemList, getLevel,getPayRollPlace,fileUp } from "../../api/Lecturer"; // lecturerFeeManagement // import {getProjSt} from "../../api/indexProjStu"; // import AddTeacher from "../../components/drawers/project/AddTeacher" @@ -506,7 +506,7 @@ courseType:null, certStatus:null, salaryName:null, - payrollPlaceId:null, + payrollPlaceName:null, status:null, pageNo: "1", pageSize: "10", @@ -537,27 +537,7 @@ { value: 0, label: "未认证" }, { value: 1, label: "已认证" }, ]) - //获取内容分类 - const getTeacherExpertiseList = ref([ - // { value: 0, label: "未定级" }, - ]) - const getTeacherExpertiseLista = () => { - getTeacherExpertise().then((res) => { - if (res.data.code === 200) { - let arr = res.data.data; - let array = []; - arr.map((value) => { - let obj = { - value: value.id, - label: value.name, - }; - array.push(obj); - }); - getTeacherExpertiseList.value = array; - } - }) - } - getTeacherExpertiseLista() + const lecturerSystemList = ref([ ]); ///获取讲师体系列表 @@ -602,51 +582,29 @@ console.log( "讲师体系id" +val); }) } LecturerSystemLista() - const trainOrglist=ref([]) - //获取培训发生组织 - const trainOrglista =() => { - let obj = { - pageNo: "1", - pageSize: "10000" - } - getTrainOrg(obj).then((res)=>{ - if (res.data.code === 200) { - let arr = res.data.data; - let array = []; - arr.map((value) => { - let obj = { - value: value.trainorgId, - label: value.trainOrg, - }; - array.push(obj); - }); - trainOrglist.value = array; - } - }) - } - trainOrglista() - //获取讲师发薪地列表 - const PlaceOfPayList = ref([ - // { value: 0, label: "发薪地B1" }, - ]) - const PlaceOfPayLista =() => { - getPayRollPlace().then((res)=>{ - if (res.data.code === 200) { - let arr = res.data.data; - let array = []; - arr.map((value) => { - let obj = { - value: value.id, - label: value.name, - }; - array.push(obj); - }); - PlaceOfPayList.value = array; - } - console.log("获取发薪地", PlaceOfPayList); - }) - } - PlaceOfPayLista() + + // //获取讲师发薪地列表 + // const PlaceOfPayList = ref([ + // // { value: 0, label: "发薪地B1" }, + // ]) + // const PlaceOfPayLista =() => { + // getPayRollPlace().then((res)=>{ + // if (res.data.code === 200) { + // let arr = res.data.data; + // let array = []; + // arr.map((value) => { + // let obj = { + // value: value.id, + // label: value.name, + // }; + // array.push(obj); + // }); + // PlaceOfPayList.value = array; + // } + // console.log("获取发薪地", PlaceOfPayList); + // }) + // } + // PlaceOfPayLista() //状态 const AccountStatusList = ref([ { value:"A10", label: "待审核", }, @@ -666,7 +624,6 @@ console.log( "讲师体系id" +val); state.moreid=1 state.searchParam.certStatus=null state.searchParam.salaryName=null - state.searchParam.payrollPlaceId=null state.searchParam.status=null } } @@ -861,7 +818,6 @@ console.log( "讲师体系id" +val); courseType:null, certStatus:null, salaryName:null, - payrollPlaceId:null, status:null, pageNo: 1, pageSize: 10 , @@ -1031,7 +987,7 @@ console.log( "讲师体系id" +val); departId:null, tsystemid:null, levelId:null, - payrollPlaceId:null, + payrollPlaceName:null, // 费用类型 : null teacherpayrollPlace:null, teachingDate:null, @@ -1122,7 +1078,7 @@ console.log( "讲师体系id" +val); departId: [{ required: true, message: '讲师组织不能为空' }], systemId: [{ required: true, message: '讲师体系不能为空' }], levelName: [{ required: true, message: ' 讲师级别 不能为空' }], - payrollPlaceId: [{ required: true, message: '讲师发薪地 不能为空' }], + payrollPlaceName: [{ required: true, message: '讲师发薪地 不能为空' }], courseType: [{ required: true, message: '费用类型不能为空' }], courseName: [{ required: true, message: '课程名称不能为空' }], teachingDate: [{ required: true, message: '授课日期不能为空' }], @@ -1353,7 +1309,7 @@ const column = ref([ state.searchParam.levelId ? state.searchParam.levelId : "" }&courseType=${ state.searchParam.courseType ? state.searchParam.courseType : ""}&certStatus=${ state.searchParam.certStatus ? state.searchParam.certStatus : "" - }&salaryName=${state.searchParam.salaryName ? state.searchParam.salaryName : ""}&payrollPlaceId=${state.searchParam.payrollPlaceId ? state.searchParam.payrollPlaceId : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}` + }&salaryName=${state.searchParam.salaryName ? state.searchParam.salaryName : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}` ); // this.download('lesson_records/export', { // ...state.searchParam @@ -1403,18 +1359,14 @@ const column = ref([ managerChange, courseTypeList, // searchTimeChange, - trainOrglist, - trainOrglista, - getTeacherExpertiseList, - getTeacherExpertiseLista, handlemoreid, handleExport, lecturerSystemList, getLevelList, OnTheJobStatusList, - PlaceOfPayLista, + // PlaceOfPayLista, AuthenticationStatusList, - PlaceOfPayList, + // PlaceOfPayList, AccountStatusList, searchSubmit, searchReset, diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue index c69f4d20..9e7c915a 100644 --- a/src/views/lecturer/LecturerFeeStatistics.vue +++ b/src/views/lecturer/LecturerFeeStatistics.vue @@ -180,9 +180,10 @@ import { reactive, toRefs, ref, watch } from "vue"; import { message } from "ant-design-vue"; import dayjs from "dayjs"; import { useRouter } from "vue-router"; -import { getPayRollPlace } from "../../api/Lecturer"; import { getOrganization } from "../../api/Teaching"; -import { queryTeacherFeeTotalList, queryTeacherFeeMonthly, getTeacherFeeDetailListByTeacherNo, getTeacherFeeListByTeacherNo ,getPreviousTeacherFee} from "../../api/lecturerFeeStatistics"; +import { queryTeacherFeeMonthly, getTeacherFeeDetailListByTeacherNo, getTeacherFeeListByTeacherNo} from "../../api/lecturerFeeStatistics" +; +import {getTeacherFeeList,getTrainOrg} from "../../api/lecturerFeeManagement"; export default { name: "LecturerFeeStatistics", components: { @@ -305,7 +306,7 @@ export default { let objA = { ...state.searchParam }; objA.searchdate=state.searchdate!==null? state.searchdate: "", console.log(objA) - queryTeacherFeeTotalList(objA) + getTeacherFeeList(objA) .then((res) => { tableData.value = res.data.data.records state.tableDataTotal = Number(res.data.data.total); @@ -316,7 +317,19 @@ export default { //重新汇总上月数据 const searchResetPrevious=()=>{ state.tableLoading = true - getPreviousTeacherFee().then((res)=>{ + 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)=>{ tableData.value = res.data.data state.tableDataTotal = Number(res.data.data.total); state.tableLoading = false @@ -355,7 +368,7 @@ export default { ]) //获取培训发生组织 const TrainOrglista = () => { - getPayRollPlace().then((res) => { + getTrainOrg().then((res) => { if (res.data.code === 200) { let arr = res.data.data; let array = [];