From bbf207f00892437c716cf9ed0232bd2b4e962340 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 10 Dec 2024 11:42:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/SearchTeacher.vue | 13 ++++--- src/views/lecturer/ExternalLecturer.vue | 4 +-- src/views/lecturer/ExternalTeaching.vue | 31 ++++++++-------- src/views/lecturer/InsideTeaching.vue | 36 ++++++++++--------- src/views/lecturer/LecturerApproval.vue | 6 ++-- src/views/lecturer/LecturerFee.vue | 8 ++--- src/views/lecturer/LecturerFeeStatistics.vue | 4 +-- src/views/lecturer/MonthlyStatistics.vue | 4 +-- src/views/lecturer/Organization.vue | 18 ++++++++-- .../projectcenter/ProjectManage copy.vue | 2 +- src/views/projectcenter/ProjectManage.vue | 2 +- 11 files changed, 74 insertions(+), 54 deletions(-) diff --git a/src/components/project/SearchTeacher.vue b/src/components/project/SearchTeacher.vue index 1a6d6495..4c57d866 100644 --- a/src/components/project/SearchTeacher.vue +++ b/src/components/project/SearchTeacher.vue @@ -147,6 +147,7 @@ const systemName = ref(null) const levelName = ref('') const neworgName = ref('') const teacherId = ref('') +const changeValue = ref({}) const handleChange = (e,l) => { isOpen.value = false // emit('update:value',e) @@ -161,8 +162,9 @@ const handleChange = (e,l) => { if( l.orgName !==null ){ neworgName.value= orgName.value.split('/') neworgName.value= neworgName.value[ neworgName.value.length-1] - } - emit('tlevel',l) + } + changeValue.value = l + // emit('tlevel',l) }; function debounce(func, wait) { let timeout; @@ -335,6 +337,7 @@ watch(()=>visible.value,(val)=>{ orgId.value = '' systemName.value = null levelName.value = '' + changeValue.value = {} neworgName.value='' selectName.value = null // selectData.value = '' @@ -352,7 +355,8 @@ const notChange = () => { orgName.value = '' orgId.value = '' systemName.value = null - levelName.value = '' + levelName.value = '' + changeValue.value = {} neworgName.value='' teacherId.value = '' loadingChange.value = false @@ -379,7 +383,7 @@ watch(()=>teacherId.value,(val)=>{ } } loadingChange.value = false - emit('update:system',systemName.value) + // emit('update:system',systemName.value) }).catch(err=>{ message.error('讲师体系获取失败，请重新选择') loadingChange.value = false @@ -398,6 +402,7 @@ const changeOut = () => { // neworgName= neworgName[neworgName.length-1] // } + emit('tlevel',changeValue.value) selectData.value = teacherName.value emit('update:value',teacherName.value) emit('update:lable',orgName.value) diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue index 32ef4335..ed931266 100644 --- a/src/views/lecturer/ExternalLecturer.vue +++ b/src/views/lecturer/ExternalLecturer.vue @@ -6,13 +6,13 @@ - - diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index 3034b8d2..7a5f0b17 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -9,17 +9,17 @@ - - - @@ -27,20 +27,20 @@
授课日期：
-
- - - @@ -198,13 +198,13 @@ - + :maxLength="8" @change="clearNonNumber"> - {{ (formParam.teaching / 60 + @@ -221,7 +221,7 @@ - @@ -398,7 +398,8 @@ export default { teaching: null, teachingDate: null, teacherId:null, - mobile:null + mobile:null, + score: 0 }, searchdate: undefined, //选择时间 searchParam: { @@ -758,7 +759,7 @@ export default { if(state.formParam.studys==0){ state.formParam.studys = null } - if(state.formParam.score){ + if(state.formParam.score||state.formParam.score==0){ state.formParam.score = String(state.formParam.score) }else{ state.formParam.score = null @@ -836,7 +837,7 @@ export default { name: null, type: null, teaching: null, - score: null, + score: 0, remark: null, teachingDate: null, teacherId:null diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index c812942a..89b7fca0 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -5,12 +5,12 @@
- - @@ -21,19 +21,19 @@
授课日期
-
- - - + @@ -64,13 +64,13 @@ - - - @@ -487,6 +487,7 @@ export default { teachingDate: null, // sourceBelongId: null, sourceBelongFullName: null, + score: 0, }, startTime: null, searchParam: @@ -964,7 +965,7 @@ export default { state.formParam.userNo = state.formParam.name?.split('/')[1] state.formParam.tsystemName = state.tSystemNames.systemName state.formParam.tsystemId = state.tSystemNames?.systemId - if(state.formParam.score){ + if(state.formParam.score||state.formParam.score==0){ state.formParam.score = String(state.formParam.score) }else{ state.formParam.score = null @@ -1049,7 +1050,7 @@ export default { courseName: null, teaching: null, studys: null, - score: null, + score: 0, type: null, remark: null, // sourceBelongId: null, @@ -1678,7 +1679,8 @@ export default { .moreidbtn { border: none; color: #4ea6ff; - width: 80px + // width: 80px + padding: 0; } //小竖线 diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 9bce14a4..1b6c50b3 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -5,7 +5,7 @@
- @@ -15,7 +15,7 @@
汇总时间：
 - diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 368cea42..a47d7a2e 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -9,15 +9,15 @@
-
+
- @@ -27,7 +27,7 @@
授课日期：
- - diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue index 4793d202..ceeaae27 100644 --- a/src/views/lecturer/MonthlyStatistics.vue +++ b/src/views/lecturer/MonthlyStatistics.vue @@ -24,7 +24,7 @@
- @@ -51,7 +51,7 @@ :tree-data="sysTypeOptions" v-on:keydown.enter="enterPressHadlerSearch"> --> - diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue index 95fa67fc..706b9f37 100644 --- a/src/views/lecturer/Organization.vue +++ b/src/views/lecturer/Organization.vue @@ -5,7 +5,7 @@
-
@@ -221,7 +221,7 @@ > 取消 保存 - 提交 + 提交
@@ -252,6 +252,8 @@ export default{ setup() { const formRef = ref(); const state = reactive({ + editParams: true, + editIndex: 0, tableDataTotal: 0, vf:true, showContent: false, @@ -476,7 +478,8 @@ const getTableDate = (obj) => { getTableDate(); }).catch(err=>{ console.log(err,'errr') - message.error(err.msg) + message.destroy() + message.error(err.data.msg) }) } }) @@ -530,6 +533,9 @@ const getTableDate = (obj) => { watch(()=>state.teacherdialog,(val)=>{ if(val){ placeData() + }else{ + state.editParams = true + state.editIndex = 0 } }) const addTeacher=()=>{ @@ -548,10 +554,16 @@ const getTableDate = (obj) => { const addContentData = () => { state.showContent = true } + watch(()=>state.formParam,(val)=>{ + if(!state.editParams){ + state.editIndex++ + } + },{deep:true}) //修改信息弹窗 const handleModify = (record) => { lecturer.getAffiliationById(record.id).then(res=>{ console.log(res,'resssss') + state.editParams = false state.formParam = res.data.data const actArray = res.data.data.affiliationUserList.filter(item=>item.type == 0) const leveOneArray = res.data.data.affiliationUserList.filter(item=>item.type == 1) diff --git a/src/views/projectcenter/ProjectManage copy.vue b/src/views/projectcenter/ProjectManage copy.vue index 0bec868e..5e83dd23 100644 --- a/src/views/projectcenter/ProjectManage copy.vue +++ b/src/views/projectcenter/ProjectManage copy.vue @@ -8,7 +8,7 @@ diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 0bec868e..5e83dd23 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -8,7 +8,7 @@