From a6b56cf9fa28d1c0e09e7eb1d8733b05b798bd25 Mon Sep 17 00:00:00 2001 From: wangxuemei <283912718@qq.com> Date: Sat, 26 Oct 2024 13:40:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/lecturer/ImportWork.vue | 8 ++++---- src/views/lecturer/ExternalTeaching.vue | 10 ++++++---- src/views/lecturer/InsideLecturer.vue | 6 +++--- src/views/lecturer/InsideTeaching.vue | 8 ++++++-- src/views/lecturer/LookExternalLecturer.vue | 2 +- src/views/lecturer/LookInsideLecturer.vue | 15 ++++++++++----- 6 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue index 5bdd04aa..aa8a946a 100644 --- a/src/components/lecturer/ImportWork.vue +++ b/src/components/lecturer/ImportWork.vue @@ -274,17 +274,17 @@ import {getCookieForName} from "@/api/method"; } }; function downTemplate() { - if (props.url=='/admin/export/importInTeacherRecord'){ + if (props.url==='/admin/export/importInTeacherRecord'){ window.open( - `${process.env.VUE_APP_BASE_API}/admin/export/importInTeacherRecord? + `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord? &name=${props.name||''}` );} - else if(props.url=='/admin/export/importOutTeacherRecord'){ + else if(props.url==='/admin/export/importOutTeacherRecord'){ window.open( `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacherRecord? &name=${props.name||''}` ); - }else { + }else if(props.url==='/admin/export/exportTeacherExpense') { window.open( `${process.env.VUE_APP_BASE_API}/admin/export/importTeacherExpense? &name=${props.name||''}` diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index b35b4a61..e98f9654 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -186,7 +186,7 @@ {{ (formParam.duration / 60 ).toFixed(2) }}小时 0.00小时 - + @@ -618,7 +618,7 @@ export default { name: null, manager:null, entryType: null, - status: null, + status: 1, entryType:null, systemId:null, endTime:null, @@ -650,6 +650,7 @@ export default { }; // 新增讲师 const addTeacher = () => { + cancel() state.teacherdialog = true; state.teacherdialogtitle = '添加授课记录' state.vf = true @@ -677,6 +678,7 @@ export default { } //保存 const createTeacherDialog = async () => { + state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : "" const formItemNames = Object.keys(rules); for(let i=0;i { message.success("修改成功"); @@ -772,6 +773,7 @@ export default { duration: null, score: null, remark: null, + teachingDate:null } state.teachingDate=null } @@ -817,7 +819,7 @@ export default { // state.searchParam.trainorgName=orgName } const clearNonNumber=()=>{ - state.formParam.defaultteachingTime = state.formParam.defaultteachingTime.replace(/\D/g, ''); + state.formParam.duration = state.formParam.duration.replace(/\D/g, ''); } //导入功能 const handleImport = () => { diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 89fde3a2..e92f7509 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -213,7 +213,7 @@ - + @@ -227,7 +227,7 @@ - + @@ -455,7 +455,7 @@ export default { console.log(val, 'description') }) watch(() => state.formParam.workExperience, (val) => { - console.log(val, '11111') + console.log(val, '') }) watch(() => state.formParam.courses, (val) => { console.log(val, 'courses') diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 7c9706a6..a042c51a 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -830,6 +830,7 @@ export default { }; // 新增授课 const addTeacher = () => { + cancel() state.teacherdialog1 = 0 state.teacherdialog = true; state.teacherdialogtitle = '添加授课记录' @@ -856,8 +857,9 @@ export default { } //保存 const createTeacherDialog = async () => { - console.log( state.formParam) + state.formParam.tSystemName = state.tSystemNames.systemName + state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : "" const formItemNames = Object.keys(rules); for(let i=0;i { message.success("修改成功"); @@ -926,6 +928,7 @@ export default { const cancel = () => { state.formParam = { recordType: 1, + courseStatus:1, teacher: null, orgName: null, tSystemName: null, @@ -938,6 +941,7 @@ export default { remark: null, offcourseId: null, createFrom: null, + teachingDate:null, } state.teachingDate=null state.tSystemNames = { diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue index 1b549105..b6037da4 100644 --- a/src/views/lecturer/LookExternalLecturer.vue +++ b/src/views/lecturer/LookExternalLecturer.vue @@ -36,7 +36,7 @@ ExternalLecturer -
+
{{formParam.remark===null?'--':formParam.remark}} diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue index 23384edc..e90fdbcd 100644 --- a/src/views/lecturer/LookInsideLecturer.vue +++ b/src/views/lecturer/LookInsideLecturer.vue @@ -57,11 +57,16 @@ -
- {{formParam.description ===null ? ' --' :formParam.description}}
- {{formParam.workExperience ===null?'--':formParam.workExperience}} - {{formParam.courses===null?'--':formParam.courses}} - {{formParam.expertise===null?'--':formParam.expertise}} + +
+ + +
+ + +
+ + {{formParam.expertise===null?'':formParam.expertise}}
From f4baf518b931229fba4fe1ef35ea347c5700553a Mon Sep 17 00:00:00 2001 From: wangxuemei <283912718@qq.com> Date: Sat, 26 Oct 2024 17:20:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/ExternalTeaching.vue | 48 +++------------------ src/views/lecturer/LookExternalLecturer.vue | 2 +- src/views/lecturer/LookInsideLecturer.vue | 33 +++++++------- 3 files changed, 21 insertions(+), 62 deletions(-) diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index e98f9654..2c860e08 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -313,8 +313,7 @@ import { message } from "ant-design-vue"; import ProjectManager from "@/components/project/ProjectManagerNew"; import ProjectManagerOutTeacher from "@/components/project/ProjectManagerOutTeacher"; import dayjs from "dayjs"; -import { updateInTeacher, getTeacherExpertise } from "../../api/Lecturer"; -import { getTeacherCourseList, getAddress, updateInTeacherCourse,getNewInTeacherCourseList, deleteInTeacherCourse, insertInTeacherCourse } from "../../api/Teaching"; +import { getTeacherCourseList, updateInTeacherCourse,getNewInTeacherCourseList, deleteInTeacherCourse, insertInTeacherCourse } from "../../api/Teaching"; // import {getProjSt} from "../../api/indexProjStu"; // import AddTeacher from "../../components/drawers/project/AddTeacher" export default { @@ -394,23 +393,7 @@ export default { } //获取开课场地 - const AddressLista = () => { - getAddress().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); - }); - AddressList.value = array; - } - }) - } - AddressLista() + //获取内容分类 const sysTypeOptions = computed(() => store.state.content_type); const OnTheJobStatusList = ref([ @@ -730,27 +713,7 @@ export default { state.deleteTeacherdialog = false }); } - //获取内容分类 - 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 cancelTeacherDialog = () => { if (state.teacherdialog = true) { @@ -766,6 +729,8 @@ export default { //清空数据 const cancel = () => { state.formParam = { + status: 1, + recordType:2, teacher: null, mobile: null, name: null, @@ -851,8 +816,6 @@ const handleImport = () => { entryTypeList, // searchTimeChange, cancelTeachingDialog, - getTeacherExpertiseList, - getTeacherExpertiseLista, handlemoreid, handleExport, AddressList, @@ -874,7 +837,6 @@ const handleImport = () => { createTeacherDialog, getTableDate, //list接口数据调用 // getStu - AddressLista, TeacherSystem, // getSysTypeMap } diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue index b6037da4..b3146bb2 100644 --- a/src/views/lecturer/LookExternalLecturer.vue +++ b/src/views/lecturer/LookExternalLecturer.vue @@ -242,7 +242,7 @@ export default{ state.teacherrecordsLoading = true state.teacherrecords.name = state.formParam.name let obj = { ...state.teacherrecords } - + console.log(111111111111111111112222222222222222) // api接口 getNewInTeacherCourseList(obj).then((res) => { teacherrecordstableData.value = res.data.data.records diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue index e90fdbcd..2c48ef24 100644 --- a/src/views/lecturer/LookInsideLecturer.vue +++ b/src/views/lecturer/LookInsideLecturer.vue @@ -66,7 +66,7 @@
- {{formParam.expertise===null?'':formParam.expertise}} + {{formParam.expertiseNames===null?'':formParam.expertiseNames}}
@@ -171,17 +171,13 @@ export default{ getTeacherById({id:state.id}).then((res) => { let objA= res.data.data console.log(objA ,'11111111111') - // if( objA.orgName !==null ){ - // objA.neworgName=objA.orgName.split('/') - - // objA.neworgName= objA.neworgName[objA.neworgName.length-1] - // } state.formParam = objA state.formParam.photo = state.formParam.photo ===null ?boe : state.formParam.photo state.teacherrepromo.userId=res.data.data.id console.log(state.teacherrepromo.id); getteacherrecordstableData() - getpromotionrecordstableData() + promotionrecordstableData.value = res.data.data.records.levelLogList + // getpromotionrecordstableData() }) .catch((err) => { console.log("内部讲师详情", err); @@ -307,6 +303,7 @@ export default{ teacherrecordstableData.value = res.data.data.records state.teacherrecordstableDataTotal = Number(res.data.data.total); state.teacherrecordsLoading = false + }) }; //授课翻页 @@ -317,7 +314,7 @@ export default{ //晋级记录翻页 const teacherrepromoPagination = (page) => { state.teacherrepromo.pageNo = page; - getpromotionrecordstableData(); + // getpromotionrecordstableData(); }; //晋级记录列表 const promotionrecordsColumns = ref([ @@ -353,15 +350,15 @@ export default{ //晋级记录列表数据 const promotionrecordstableData = ref([ ]) - const getpromotionrecordstableData = () => { - state.promotionrecordsLoading = true - // state.teacherrepromo.kid = state.kid - getTeacherLogList(state.teacherrepromo).then((res) => { - promotionrecordstableData.value = res.data.data.records - state.teacherrepromotableDataTotal = Number(res.data.data.total); - }) - state.promotionrecordsLoading = false - }; + // const getpromotionrecordstableData = () => { + // state.promotionrecordsLoading = true + // // state.teacherrepromo.kid = state.kid + // getTeacherLogList(state.teacherrepromo).then((res) => { + // promotionrecordstableData.value = res.data.data.records + // state.teacherrepromotableDataTotal = Number(res.data.data.total); + // }) + // state.promotionrecordsLoading = false + // }; const goback = ()=>{ router.back() } @@ -397,7 +394,7 @@ const handleup = ()=>{ teacherrepromoPagination, promotionrecordsColumns, promotionrecordstableData, - getpromotionrecordstableData, + // getpromotionrecordstableData, } } } From aaec88f706244c2924a6163016fe7e0121e0a104 Mon Sep 17 00:00:00 2001 From: wangxuemei <283912718@qq.com> Date: Sat, 26 Oct 2024 18:05:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/LecturerFee.vue | 88 ++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 29 deletions(-) diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 901c8354..e9e33e73 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -154,13 +154,13 @@ - + - - + @@ -255,14 +255,15 @@ - - @@ -273,15 +274,15 @@ - - {{ defaultTeachingTime * expense}} @@ -391,9 +392,9 @@ - - + + - - +
+
创建时间：
+ +
查询 @@ -412,6 +421,7 @@
state.formParam.name,(val)=>{ + state.formParam.userNo = val?.split('/')[1] + } ) + //切换筛选 const handlemoreid=()=>{ if(state.moreid==1){ @@ -863,6 +881,7 @@ console.log( "讲师体系id" +val); }; // 添加讲师费 const addTeacher = () => { + cancel() state.teacherdialog = true; state.vf = true state.teacherdialogtitle = '添加讲师费' @@ -907,6 +926,7 @@ console.log( "讲师体系id" +val); } //保存 const createTeacherDialog = async () => { + state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : "" state.formParam.tSystemName = state.tSystemNames.systemName const formItemNames = Object.keys(rules); for(let i=0;i { message.success("修改成功"); @@ -1001,7 +1020,7 @@ console.log( "讲师体系id" +val); const cancel = () => { state.formParam ={ name:null, - teacherId:null, + userNo:null, orgName:null, tSystemName:null, tLevelId:null, @@ -1094,10 +1113,21 @@ console.log( "讲师体系id" +val); }; const clearNonNumber = () => { state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime.replace(/\D/g, ''); + state.formParam.expense = state.formParam.levelPay*state.formParam.defaultTeachingTime + } + const clearstudysNumber = () => { + state.formParam.studys = state.formParam.studys.replace(/\D/g, ''); + } + const clearscoreNumber= () => { + state.formParam.score = state.formParam.score.replace(/\D/g, ''); + } + const clearlevelPayNumber = () => { + state.formParam.levelPay = state.formParam.levelPay.replace(/\D/g, ''); + state.formParam.expense = state.formParam.levelPay*state.formParam.defaultTeachingTime } const rules = { name: [{ required: true, message:'',log: '讲师不能为空' }], - teacherId: [{ required: true, message: '',log:'讲师工号不能为空' }], + userNo: [{ required: true, message: '',log:'讲师工号不能为空' }], orgName: [{ required: true, message: '',log:'讲师组织不能为空' }], tSystemName: [{ required: true, message:'',log: '讲师体系不能为空' }], tLevelId: [{ required: true, message:'',log: ' 讲师级别 不能为空' }], @@ -1112,12 +1142,7 @@ console.log( "讲师体系id" +val); expense: [{ required: true, message: '',log:'计划费用不能为空' }], } - function managerChange(e, l, d, t, orgName) { - console.log(e, l); - state.searchParam.userNo = d; - state.searchParam.userNo = t; - // state.searchParam.trainorgName=orgName - } + const handleImport = () => { state.showWork = true } @@ -1130,7 +1155,8 @@ const cancelallFeedialog= ()=>{ const searchResetdrawer=()=>{ state.searchall={ name:null, - status:null, + beginTime: null, + endTime: null, pageNo: "1", pageSize: "10", } @@ -1141,7 +1167,9 @@ const searchSubmitdrawer=()=>{ } const allFeeList=()=>{ state.tableLoadings=true - let objA = {...state.searchall}; + let objA = { ...state.searchall }; + objA.beginTime = state.allsearchdate ? dayjs(state.allsearchdate[0]).format("YYYY-MM-DD") : "", + objA.endTime = state.allsearchdate ? dayjs(state.allsearchdate[1]).format("YYYY-MM-DD") : "", getTeacherFeeList(objA) .then((res) => { tableDatas.value = res.data.data.records @@ -1376,7 +1404,6 @@ const column = ref([ beforeUpload2, closeDeleteTeacher, cancelTeachingDialog, - managerChange, courseTypeList, // searchTimeChange, handlemoreid, @@ -1418,6 +1445,9 @@ const column = ref([ tableDatas, handleformlevel, validateField, + clearstudysNumber, + clearscoreNumber, + clearlevelPayNumber, } }, };