From 892eeae1fd5b35bc266f648d7562117ef07c1a6c Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Thu, 1 Jan 2026 16:11:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=20[=E8=A1=A8=E5=8D=95=E7=AE=A1=E7=90=86]=20=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E5=AD=A6=E7=A7=91=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/study/comp/suject.vue | 12 ++++++++++-- src/views/business/study/comp/tbbd.vue | 28 ++++++++++++++++++++++++---- src/views/business/study/comp/tbbdList.vue | 3 ++- src/views/business/study/comp/ytbd.vue | 28 ++++++++++++++++++++++++---- src/views/business/study/comp/ytbdList.vue | 3 ++- 5 files changed, 62 insertions(+), 12 deletions(-) diff --git a/src/views/business/study/comp/suject.vue b/src/views/business/study/comp/suject.vue index 7d3141d..8d90aef 100644 --- a/src/views/business/study/comp/suject.vue +++ b/src/views/business/study/comp/suject.vue @@ -14,7 +14,7 @@
-
+
{{item.deptName}}({{item.leaderName}})
{{$t('page.business.study.studyEnter.yq')}} @@ -90,6 +90,7 @@ export default { data() { return { subjectList:[], + selectedSubjectId:'', infoDialog:{ title:this.$t('page.business.study.studyEnter.xzxk'), visible:false, @@ -110,8 +111,14 @@ export default { getList(){ studySubject_listByStudyId({studyId:this.study.id}).then(response => { this.subjectList = response.data; + this.selectedSubjectId = this.subjectList.length>0?this.subjectList[0].id:'' + this.$emit('change',this.selectedSubjectId) }) }, + changeSelectedSubject(item){ + this.selectedSubjectId = item.id + this.$emit('change',this.selectedSubjectId) + }, editSubject(){ this.infoDialog.list = [] this.infoDialog.loading = true @@ -257,7 +264,8 @@ export default { justify-content: space-between; background: #f9fafc; border-radius: 5px; - &:hover{ + cursor: pointer; + &.active{ border: 1px solid #47a1ff; } .subject-item-name{ diff --git a/src/views/business/study/comp/tbbd.vue b/src/views/business/study/comp/tbbd.vue index 3686f8e..0ffd96b 100644 --- a/src/views/business/study/comp/tbbd.vue +++ b/src/views/business/study/comp/tbbd.vue @@ -1,10 +1,10 @@ @@ -22,16 +22,36 @@ export default { } } }, + watch:{ + study: { + immediate: true, + handler(v) { + this.studyInfo = { + studyId:v.id, + studyLeader:v.leader, + studySubjectId:'' + } + } + }, + }, components: {sbject,tbbdList}, computed: {}, filters: {}, data() { return { - showDetail:false + showDetail:false, + studyInfo:{ + studyId:this.study.id, + studyLeader:this.study.leader, + studySubjectId:'' + } } }, created() {}, methods: { + changeSubject(val){ + this.studyInfo.studySubjectId = val + }, showDetailCallback(val){ this.showDetail=val this.$emit('showDetail',val) diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue index 6d9ea14..f83d5e0 100644 --- a/src/views/business/study/comp/tbbdList.vue +++ b/src/views/business/study/comp/tbbdList.vue @@ -129,7 +129,8 @@ export default { watch: { study: { handler(newVal) { - this.searchForm.studyId = newVal.id + this.searchForm.studyId = newVal.studyId + this.searchForm.studySubjectId = newVal.studySubjectId this.leader = newVal.leader this.search() }, diff --git a/src/views/business/study/comp/ytbd.vue b/src/views/business/study/comp/ytbd.vue index 18d8db4..b864e4c 100644 --- a/src/views/business/study/comp/ytbd.vue +++ b/src/views/business/study/comp/ytbd.vue @@ -1,10 +1,10 @@ @@ -22,16 +22,36 @@ export default { } } }, + watch:{ + study: { + immediate: true, + handler(v) { + this.studyInfo = { + studyId:v.id, + studyLeader:v.leader, + studySubjectId:'' + } + } + }, + }, components: {sbject,ytbdList}, computed: {}, filters: {}, data() { return { - showDetail:false + showDetail:false, + studyInfo:{ + studyId:this.study.id, + studyLeader:this.study.leader, + studySubjectId:'' + } } }, created() {}, methods: { + changeSubject(val){ + this.studyInfo.studySubjectId = val + }, showDetailCallback(val){ this.showDetail=val this.$emit('showDetail',val) diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue index 1dadb2b..610c06d 100644 --- a/src/views/business/study/comp/ytbdList.vue +++ b/src/views/business/study/comp/ytbdList.vue @@ -128,7 +128,8 @@ export default { watch: { study: { handler(newVal) { - this.searchForm.studyId = newVal.id + this.searchForm.studyId = newVal.studyId + this.searchForm.studySubjectId = newVal.studySubjectId this.leader = newVal.leader this.search() },