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] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95=E8=B0=83?= =?UTF-8?q?=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}}