From e1385fe37f8fe9c146f422f722282936e46cf038 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 9 Feb 2026 16:54:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95]?= =?UTF-8?q?=E8=87=B4=E5=91=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/select/SelectTemplate.vue | 4 ++-- src/views/business/comps/select/SelectTemplateDialog.vue | 2 +- src/views/business/study/comp/jhbd/Bj.vue | 2 +- src/views/business/study/comp/sqbd/Bj.vue | 2 +- src/views/business/study/comp/tbbd/Bj.vue | 6 +++--- src/views/business/study/comp/tbbdList.vue | 10 +++++++++- src/views/business/study/comp/ytbd/Bj.vue | 6 +++--- src/views/business/study/comp/ytbdList.vue | 11 +++++++++-- 8 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/views/business/comps/select/SelectTemplate.vue b/src/views/business/comps/select/SelectTemplate.vue index 5584199..abb42e7 100644 --- a/src/views/business/comps/select/SelectTemplate.vue +++ b/src/views/business/comps/select/SelectTemplate.vue @@ -37,7 +37,7 @@ export default { type: Number, default: null }, - studySubjectId: { + selectedDeptId: { type: Number, default: null }, @@ -69,7 +69,7 @@ export default { methods: { showSelectTemplate(){ if(!this.disabled){ - this.$refs.selectTemplateDialog.show({needPre:this.needPre,studyType:this.studyType,studyFormType:this.studyFormType,studySubjectId:this.studySubjectId}) + this.$refs.selectTemplateDialog.show({needPre:this.needPre,studyType:this.studyType,studyFormType:this.studyFormType,selectedDeptId:this.selectedDeptId}) } }, handleChange(obj) { diff --git a/src/views/business/comps/select/SelectTemplateDialog.vue b/src/views/business/comps/select/SelectTemplateDialog.vue index 96e751e..cf2bc07 100644 --- a/src/views/business/comps/select/SelectTemplateDialog.vue +++ b/src/views/business/comps/select/SelectTemplateDialog.vue @@ -81,7 +81,7 @@ export default { this.selectedId = row.id }, show(val) { - this.searchForm.deptId=val.studySubjectId + this.searchForm.deptId=val.selectedDeptId this.searchForm = _.merge({}, this.searchForm, val) this.selectedId = null this.search() diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue index 37e554a..f5ea6e7 100644 --- a/src/views/business/study/comp/jhbd/Bj.vue +++ b/src/views/business/study/comp/jhbd/Bj.vue @@ -42,7 +42,7 @@ + @change="selectTemplateChange" /> diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue index eaa22f3..b9117eb 100644 --- a/src/views/business/study/comp/sqbd/Bj.vue +++ b/src/views/business/study/comp/sqbd/Bj.vue @@ -42,7 +42,7 @@ + @change="selectTemplateChange" /> diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue index a7aba29..3ce998a 100644 --- a/src/views/business/study/comp/tbbd/Bj.vue +++ b/src/views/business/study/comp/tbbd/Bj.vue @@ -46,7 +46,7 @@ + @change="selectTemplateChange" :needPre="1" :selectedDeptId="selectedDeptId"/> @@ -479,7 +479,7 @@ export default { studyType: null, studyFormType: null, ccwzlist: [], - studySubjectId:null, + selectedDeptId:null, } }, computed: { @@ -577,7 +577,7 @@ export default { params = JSON.parse(caesarDecipher(this.$route.params.key)) this.studyType = params.studyType || null this.studyFormType = params.studyFormType || null - this.studySubjectId = params.studySubjectId || null + this.selectedDeptId = params.selectedDeptId || null } catch (e) { console.log('参数错误') } diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue index 4ab6e16..a57684c 100644 --- a/src/views/business/study/comp/tbbdList.vue +++ b/src/views/business/study/comp/tbbdList.vue @@ -203,7 +203,13 @@ export default { default: () => { return {} } - } + }, + selectedDeptId:{ + type:[Number,String], + default:()=>{ + return null + } + }, }, computed: { ...mapGetters([ @@ -426,6 +432,7 @@ export default { studyId: this.searchForm.studyId, studyType: 1, studyFormType:5, + selectedDeptId:this.selectedDeptId, id: null })) this.$tab.openPage(this.$t('page.business.study.studyFormFill.xzbd'), '/study/formFillBj/' + params) @@ -448,6 +455,7 @@ export default { studyId: this.searchForm.studyId, studyType: 1, studyFormType:5, + selectedDeptId:this.selectedDeptId, formId: row.id })) this.$tab.openPage(row.bdmc, '/study/formFillBj/' + params) diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue index 308d7be..31435fb 100644 --- a/src/views/business/study/comp/ytbd/Bj.vue +++ b/src/views/business/study/comp/ytbd/Bj.vue @@ -42,7 +42,7 @@ + :name="form.templateMc" :studyType="studyType" :selectedDeptId="selectedDeptId" :studyFormType="studyFormType" @change="selectTemplateChange" /> @@ -155,7 +155,7 @@ export default { open: false, openSubmit: false, permitForSecectUser: '', - studySubjectId:null, + selectedDeptId:null, rulesApprove: { qmrmm: [{ required: true, @@ -268,7 +268,7 @@ export default { this.permitForSecectUser = row.permitForSecectUser this.studyType = row.studyType||null this.studyFormType = row.studyFormType||null - this.studySubjectId=row.studySubjectId||null + this.selectedDeptId=row.selectedDeptId||null if (row && row.id) { this.showIndex = 2 this.$modal.loading() diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue index bd12dfa..416c3e8 100644 --- a/src/views/business/study/comp/ytbdList.vue +++ b/src/views/business/study/comp/ytbdList.vue @@ -215,7 +215,13 @@ export default { default: () => { return {} } - } + }, + selectedDeptId:{ + type:[Number,String], + default:()=>{ + return null + } + }, }, computed: { ...mapGetters([ @@ -439,6 +445,7 @@ export default { studySn: this.searchForm.studySn, studyMc: this.searchForm.studyMc, studyId: this.searchForm.studyId, + selectedDeptId:this.selectedDeptId, studyType: 1, studySubjectId: this.searchForm.studySubjectId, permitForSecectUser: 'business:studyFormPre:sh' @@ -446,7 +453,7 @@ export default { }, edit(row) { this.$modal.loading() - studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => { + studyMethod_getReadAllMethodStatus({ selectedDeptId:this.selectedDeptId,userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => { if (response.data.toUrl) { this.toRead(response.data) } else {