diff --git a/src/views/business/study/comp/suject.vue b/src/views/business/study/comp/suject.vue index 403dc19..7d425a0 100644 --- a/src/views/business/study/comp/suject.vue +++ b/src/views/business/study/comp/suject.vue @@ -125,11 +125,24 @@ export default { checkPermi, checkRole, 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) - }) + if(this.study.id){ + this.selectedSubjectId = '' + studySubject_listByStudyId({studyId:this.study.id}).then(response => { + this.subjectList = response.data; + for(let i=0;i0 && item.userIdList.indexof(this.userId)>-1)){ + this.selectedSubjectId = item.id + break + } + } + if(this.selectedSubjectId === ''){ + this.selectedSubjectId = this.subjectList.length>0?this.subjectList[0].id:'' + } + + this.$emit('change',this.selectedSubjectId) + }) + } }, changeSelectedSubject(item){ this.selectedSubjectId = item.id