From 8f9fd4f610e40f614f92581eb7b48e0ea1239549 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 18 Oct 2024 15:37:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AE=B2=E5=B8=88?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=B0=83=E6=95=B4=E8=AE=B2=E5=B8=88=E7=BA=A7?= =?UTF-8?q?=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/SearchTeacher.vue | 10 +++++++++- src/views/lecturer/InsideLecturer.vue | 19 +++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/components/project/SearchTeacher.vue b/src/components/project/SearchTeacher.vue index 84d6fd81..652f68a0 100644 --- a/src/components/project/SearchTeacher.vue +++ b/src/components/project/SearchTeacher.vue @@ -244,6 +244,7 @@ watch(()=>visible.value,(val)=>{ // selectData.value = '' teacherId.value = '' loadingChange.value = false + // teacherId.value = '1012311820121276416' // changeneworg() } }) @@ -266,7 +267,14 @@ watch(()=>teacherId.value,(val)=>{ systemName.value = { systemId:res.data.data.id, systemName:res.data.data.systemName, - systemCode:res.data.data.systemCode + systemCode:res.data.data.systemCode, + levelVoList: res.data.data.levelVoList.map(item=>{ + return ( + item.label = item.levelName, + item.value = item.id, + item + ) + }) } } loadingChange.value = false diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 7446b821..9a13d10f 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -176,7 +176,7 @@ + :options="tSystemNames.levelVoList" @change="handleformlevel"> @@ -413,7 +413,8 @@ export default { tableDataTotal: -1,//table列表总条数 vf: false, tSystemNames:{ - systemName:null + systemName:null, + levelVoList: [] }, formParam: { name: null, @@ -566,8 +567,7 @@ export default { } LecturerSystemLista() //获取内部讲师级别 - const getLevelList = ref([ - ]) + const getLevelList = ref([]) const changetlevel = (val) => { console.log("讲师体系id" + val); getLevel({ id: val }).then((res) => { @@ -1017,7 +1017,8 @@ export default { courses: '', } state.tSystemNames = { - systemName:null + systemName:null, + levelVoList: [] } } const clearNonNumber = () => { @@ -1089,6 +1090,7 @@ export default { state.tSystemNames.systemName = res.data.data.systemName state.tSystemNames.systemCode = res.data.data.systemCode state.tSystemNames.systemId = res.data.data.systemId + state.tSystemNames.levelVoList = res.data.data.levelVoList } @@ -1113,11 +1115,8 @@ export default { // message.warning('请先选择讲师体系') // } // } - const handleformlevel = () => { - console.log('请先选择讲师体系') - if (state.formParam.tSystemId == undefined) { - message.warning('请先选择讲师体系') - } + const handleformlevel = (val) => { + state.formParam.tlevelName = state.tSystemNames.levelVoList.find(item=>item.id===val)?.levelName } //导出功能 const handleExport = () => { From 9a07469b4c890f8d7f53415ea7df13db460fe7d9 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 18 Oct 2024 16:39:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/InsideLecturer.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 9a13d10f..f5e0c700 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -163,7 +163,7 @@ - + @@ -1028,7 +1028,7 @@ export default { name: [{ required: true, message: '',log:'讲师不能为空' }], // newdepartId: [{ required: true, message: '组织不能为空' }], tLevelId: [{ required: true, message: '',log:'讲师级别不能为空' }], - tSystemName: [{ required: true, message: '讲师体系不能为空' }], + systemName: [{ required: true, message: '',log:'讲师体系不能为空' }], defaultteachingTime: [{ required: true, message: '',log:'初始授课时长不能为空' }], // certStatus: [{ required: true, message: '认证状态不能为空' }], From 46aa125204ff645908d114cb0076bd33cda380da Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 18 Oct 2024 17:03:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/InsideLecturer.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index f5e0c700..8e512764 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -163,7 +163,7 @@ - + @@ -867,6 +867,7 @@ export default { } //保存 const createTeacherDialog = async () => { + state.formParam.tSystemName = state.tSystemNames.systemName const formItemNames = Object.keys(rules); for(let i=0;i Date: Fri, 18 Oct 2024 17:16:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=86=85=E9=83=A8=E8=AE=B2=E5=B8=88type?= =?UTF-8?q?=E6=94=B9=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/InsideLecturer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 8e512764..40e87659 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -1005,7 +1005,7 @@ export default { state.formParam = { name: null, status: null, - teacherType: '0', + teacherType: 1, photo: null, name: null, newdepartId: null,