diff --git a/src/api/lecturerFeeStatistics.js b/src/api/lecturerFeeStatistics.js index 2392b4fe..8ac31a1f 100644 --- a/src/api/lecturerFeeStatistics.js +++ b/src/api/lecturerFeeStatistics.js @@ -1,6 +1,7 @@ import http from "./config"; // 列表查看讲师费月度统计 -export const queryTeacherFeeTotalList = (params) => http.get('teacher/fee/queryTeacherFeeTotalList',{ params }) +// export const queryTeacherFeeTotalList = (params) => http.get('teacher/fee/queryTeacherFeeTotalList',{ params }) +export const queryTeacherFeeTotalList = (obj) => http.post ('teacher/fee/queryTeacherFeeTotalList',obj) // 列表查看讲师费月度统计详情 export const queryTeacherFeeMonthly = (obj) => http.post('teacher/fee/queryTeacherFeeMonthly', obj) ////讲师费月度统计--明细 diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index 03aa5d20..b7b94fba 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -278,6 +278,7 @@ import { } from '@ant-design/icons-vue'; import { message } from "ant-design-vue"; import ProjectManager from "@/components/project/ProjectManagerNew"; +import dayjs from "dayjs"; import { updateInTeacher, getTeacherExpertise } from "../../api/Lecturer"; import { getOuterTeacherCourseList, getAddress, updateInTeacherCourse, deleteInTeacherCourse, insertOutTeaherCourse,getOuterTeacherCourseDetail } from "../../api/Teaching"; // import {getProjSt} from "../../api/indexProjStu"; @@ -297,7 +298,7 @@ export default { const state = reactive({ moreid: 1, tableLoading: false, - delTeacherId: null, //删除id确认 + delTeacherId: null, //删除id确认 userNoid: null, //详情工号确认 lookTeacherId: null, //详情id确认 deleteTeacherdialog: false, //删除弹窗 @@ -561,6 +562,8 @@ export default { const getTableDate = (obj) => { state.tableLoading = true let objA = { ...state.searchParam }; + objA.startDate = state.searchParam.startDate !== null ? dayjs(new Date(state.searchParam.startDate).getTime()).format("YYYY-MM-DD") : "", + objA.endDate = state.searchParam.endDate !== null ? dayjs(new Date(state.searchParam.endDate).getTime()).format("YYYY-MM-DD") : "", getOuterTeacherCourseList(objA) .then((res) => { tableData.value = res.data.data.records @@ -587,6 +590,7 @@ export default { const handleModify = (record) => { state.teacherdialog = true; state.teacherdialogtitle = '修改授课记录' + state.lookTeacherId = record.teacherId TeacherSystem(record) } //保存 diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index ba316e1e..1ae14e03 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -179,13 +179,12 @@ - + - @@ -218,7 +217,7 @@ - {{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时 + {{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时 @@ -407,7 +406,8 @@ export default { formParam: { userNo:null, certStatus: 0,//认证状态 - defaultTeachingTime: '0' + defaultTeachingTime: '0', + }, searchParam: { name:null, @@ -475,7 +475,7 @@ export default { let array = []; arr.map((value) => { let obj = { - value: value.systemid, + value: value.kid, label: value.systemName, }; array.push(obj); @@ -649,7 +649,7 @@ console.log( "讲师体系id" +val); } const columns = ref([ { - title: '姓名 ', + title: '讲师姓名 ', dataIndex: 'name', key: 'name', elipsis: true, @@ -657,7 +657,7 @@ console.log( "讲师体系id" +val); width: 100, }, { - title: '工号 ', + title: '讲师工号 ', dataIndex: 'userNo', key: 'userNo', elipsis: true, @@ -787,6 +787,7 @@ console.log( "讲师体系id" +val); state.searchParam = { name:null, userNo: null, + departId:null, systemid: null, tlevelId: null, waitStatus: null, diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 911ee351..7b43fdce 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -51,24 +51,38 @@ + :options="AuthenticationStatusList" allowClear showSearch> + :options="getOrganizationList" allowClear showSearch> + :options="LecturerSystemList" allowClear showSearch> + :options="getTeacherExpertiseList" allowClear showSearch> +
+ + + + + + + + +
@@ -201,11 +215,11 @@ - - + - {{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时 + {{ (formParam.duration /60 ).toFixed(2)}}小时 @@ -268,7 +282,7 @@ {{formParam.type==1?'项目开课' :formParam.type==2 ?'路径开课':formParam.type==3 ?'面授开课':''}} {{formParam.name}} {{formParam.status==0?'未开课' :formParam.status==1 ?'已开课':''}} - {{formParam.duration}} + {{ (formParam.duration /60 ).toFixed(2)}}小时 {{formParam.beginTime}} {{formParam.studys}} {{formParam.score}} @@ -370,6 +384,7 @@ export default { setup() { const router = useRouter(); const state = reactive({ + moreid:1, showWork: false, currentPage1: 1, pageSize1: 10, @@ -391,7 +406,7 @@ export default { formParam: { status: 1, entryType:1, - defaultTeachingTime:0 + duration:0 }, searchParam: { userNo: null,//工号姓名 @@ -798,7 +813,7 @@ export default { systemId:null, levelId: null, name:null, - defaultTeachingTime:0, + duration:0, endDate:null, startDate:null, studys: null, @@ -861,7 +876,7 @@ export default { // ref< moment.Moment >(moment(record.beginTime,'YYYY-MM-DD')), // record.beginTime, duration: record.duration, - defaultTeachingTime: record.defaultTeachingTime, + duration: record.duration, score: record.score, studys: record.studys, remark: record.remark, @@ -921,13 +936,11 @@ export default { }, ]) const gettableDatas =(record)=>{ - state.tableLoadings = true getCharges({kid:record.kid}) .then((res) => { console.log(res) tableDatas.value = res.data.data.records state.tableDataTotal = Number(res.data.data.total); - state.tableLoadings = false }) } const tableDatas = ref([]) @@ -939,7 +952,7 @@ export default { id: [{ required: true, message: '内容分类不能为空' }], name: [{ required: true, message: '课程名称不能为空' }], beginTime: [{ required: true, message: '授课/课程日期不能为空' }], - defaultTeachingTime: [{ required: true, message: '授课时长不能为空' }], + duration: [{ required: true, message: '授课时长不能为空' }], certStatus: [{ required: true, message: '认证状态不能为空' }], } diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index a33d04a3..e004c997 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -72,9 +72,11 @@
+ 导出 +
当前页面汇总金额：1,230,490元 当前总汇总金额：9,230,490元
@@ -157,8 +159,9 @@ zIndex: 1, }"> 取消 - 返回 + 通过 + 拒绝
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index fb5b3708..7b0c7466 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -86,7 +86,9 @@ 导出 -
+ +
当前页面汇总金额：1,230,490元 当前总汇总金额：9,230,490元
+
- @@ -861,16 +863,16 @@ console.log( "讲师体系id" +val); state.kid= record.kid }; // //确认删除 - // const closeDeleteTeacher=()=>{ - // //调用删除接口 - // deleteInTeacher(state.delTeacherId).then((res)=>{ - // if(res.data.code == 200 ){ - // // message.success("删除成功"); - // state.deleteInTeacherdialog = false - // getTableDate(); - // } - // }) - // } + const closeDeleteTeacher=()=>{ + //调用删除接口 + deleteInTeacher(state.delTeacherId).then((res)=>{ + if(res.data.code == 200 ){ + // message.success("删除成功"); + state.deleteInTeacherdialog = false + getTableDate(); + } + }) + } //提交撤回状态 const closehandleOperate= ()=>{ //调用接口 @@ -1041,6 +1043,7 @@ console.log( "讲师体系id" +val); return { ...toRefs(state), rules, + closeDeleteTeacher, cancelTeachingDialog, managerChange, courseTypeList, diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue index b600f16c..5b8e72ca 100644 --- a/src/views/lecturer/LecturerFeeStatistics.vue +++ b/src/views/lecturer/LecturerFeeStatistics.vue @@ -9,9 +9,12 @@ :options="PlaceOfPayList"> - + + +
查询 @@ -25,6 +28,7 @@ 重新汇总上月讲师费 +
当前页面汇总金额：1,230,490元 当前总汇总金额：9,230,490元
@@ -326,6 +330,17 @@ export default { state.tableLoading = false }) } + //重置 + const searchReset = () => { + state.searchParam = { + pageNo: "1", + pageSize: "10", + startDate: null, + endDate: null, + payrollPlaceId: null, + }; + getTableDate(); + }; // // 翻页 const changePagination = (page, pageSize) => { state.searchParam.pageNo = page; @@ -744,6 +759,7 @@ export default { return { ...toRefs(state), router, + searchReset, searchTimeChange, handleFeeMonthly, TeacherSystem, diff --git a/src/views/lecturer/LecturerSystem.vue b/src/views/lecturer/LecturerSystem.vue index 203de18f..1e6538b2 100644 --- a/src/views/lecturer/LecturerSystem.vue +++ b/src/views/lecturer/LecturerSystem.vue @@ -124,7 +124,7 @@
-
+
@@ -187,7 +187,7 @@ import { import dialog from "@/utils/dialog"; import { message } from "ant-design-vue"; import ProjectManager from "@/components/project/ProjectManagerNew"; -import { systemList,addLecturerSystem ,deleteLecturerSystem,updateSystem} from "../../api/organization"; +import { systemList,addLecturerSystem ,deleteLecturerSystem,querySystemLevelByKid,updateSystem} from "../../api/organization"; export default { name: "LecturerSystem", components: { @@ -347,7 +347,14 @@ export default { }) .catch((err) => { }); + getteacherrecordstableData() } + const getteacherrecordstableData = () => { + // api接口 + querySystemLevelByKid({systemId: state.delId}).then((res) => { + state.formParam.levelList = res.data.data + }) + }; const cancel = () => { state.formParam = { kid:null, @@ -366,34 +373,21 @@ export default { } //保存 const createTeacherDialog = () => { - let a ={ - kid:11111111, - systemCode: 888, - systemName: 'cesceshi', - remark: 'cesceshi', - levelList:[{ - levelName:'cesceshi', - levelTime:'222', - sort:1, - levelPay:'56', - upperLimit:'186' - }, ] - } - console.log(a) - // console.log(state.formParam) - // if (state.formParam.kid != undefined) { - // updateSystem(state.formParam).then(response => { - // message.success("修改成功"); - // }); - // } - // else { - addLecturerSystem(a) + + console.log(state.formParam) + if (state.formParam.kid != undefined) { + updateSystem(state.formParam).then(response => { + message.success("修改成功"); + }); + } + else { + addLecturerSystem(state.formParam) .then((res) => { message.success("保存成功"); }).catch((err) => { console.log(err); }); - // } + } cancel() state.teacherdialog = false; getTableDate(); @@ -427,6 +421,7 @@ export default { return { ...toRefs(state), rules, + getteacherrecordstableData, inputRemove, inputAdd, managerChange, diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue index 82460571..b16b8eb6 100644 --- a/src/views/lecturer/LookInsideLecturer.vue +++ b/src/views/lecturer/LookInsideLecturer.vue @@ -18,7 +18,11 @@ - + + {{formParam.userNo}} {{formParam.name}} {{formParam.tsystemName}} @@ -26,7 +30,8 @@ {{formParam.tlevelName }} {{ formParam.certStatus==0?'未认证' :formParam.certStatus==1 ?'已认证':''}} - {{formParam.teaching}} + {{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时 + {{formParam.payrollPlaceName}} {{formParam.waitStatus==0?'在职' :formParam.waitStatus==1 ?'离职':''}} diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue index b8df9ed1..d2ec4b73 100644 --- a/src/views/lecturer/MonthlyStatistics.vue +++ b/src/views/lecturer/MonthlyStatistics.vue @@ -24,11 +24,11 @@ + :options="PlaceOfPayList" allowClear showSearch/> + :options="trainOrglist" allowClear showSearch>
@@ -82,8 +82,45 @@ />
- - + + + + + + + + + + +
+ 查询 + 重置 +
+ +讲师费发放情况 + + + +
+ 取消 + 返回 + +
+>