From e622b49d37524d85f9f735dbc6a9d6ccbefb5274 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 6 Feb 2026 11:36:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/select/SelectTemplate.vue | 8 +- src/views/business/form/drug/comp/sqbdList.vue | 3 +- src/views/business/form/drug/comp/tbbdList.vue | 3 + src/views/business/form/drug/comp/ytbdList.vue | 1 + src/views/business/form/nonTrial/comp/tbbdList.vue | 10 +- src/views/business/form/nonTrial/comp/ytbdList.vue | 4 +- src/views/business/study/comp/jhbd/Bj.vue | 8 +- src/views/business/study/comp/jhbdList.vue | 5 +- src/views/business/study/comp/sqbd/Bj.vue | 8 +- src/views/business/study/comp/tbbd/Bj.vue | 6 +- src/views/business/study/comp/tbbdList.vue | 6 +- src/views/business/study/comp/ytbd/Bj.vue | 6 +- src/views/business/study/comp/ytbdList.vue | 4 +- src/views/business/template/list.vue | 134 ++++++++++++++------- 14 files changed, 142 insertions(+), 64 deletions(-) diff --git a/src/views/business/comps/select/SelectTemplate.vue b/src/views/business/comps/select/SelectTemplate.vue index c3e9cb5..4e26e5a 100644 --- a/src/views/business/comps/select/SelectTemplate.vue +++ b/src/views/business/comps/select/SelectTemplate.vue @@ -31,7 +31,11 @@ export default { }, studyType: { type: Number, - default: 20 + default: null + }, + studyFormType: { + type: Number, + default: null }, }, watch: { @@ -61,7 +65,7 @@ export default { methods: { showSelectTemplate(){ if(!this.disabled){ - this.$refs.selectTemplateDialog.show({needPre:this.needPre,studyType:this.studyType}) + this.$refs.selectTemplateDialog.show({needPre:this.needPre,studyType:this.studyType,studyFormType:this.studyFormType}) } }, handleChange(obj) { diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue index 0e84623..21cb0af 100644 --- a/src/views/business/form/drug/comp/sqbdList.vue +++ b/src/views/business/form/drug/comp/sqbdList.vue @@ -322,7 +322,8 @@ export default { add() { this.showEdit = true this.$emit('showDetail', this.showEdit) - this.$refs.Bj.edit({studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc, studyId: this.searchForm.studyId }) + this.$refs.Bj.edit({ + studyFormType:15,studyType: 10,studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc, studyId: this.searchForm.studyId }) }, edit(row) { this.showEdit = true diff --git a/src/views/business/form/drug/comp/tbbdList.vue b/src/views/business/form/drug/comp/tbbdList.vue index 4b9431d..85b9f52 100644 --- a/src/views/business/form/drug/comp/tbbdList.vue +++ b/src/views/business/form/drug/comp/tbbdList.vue @@ -331,6 +331,7 @@ export default { url: this.$route.fullPath, studyId: this.searchForm.studyId, studyType: 10, + studyFormType:5, formId: null })) this.$tab.openPage(this.$t('page.business.study.studyFormFill.xzbd'), '/drug/formFillBj/' + params) @@ -342,6 +343,8 @@ export default { let params = caesarCipher(JSON.stringify({ url: this.$route.fullPath, studyId: this.searchForm.studyId, + studyType: 10, + studyFormType:5, formId: row.id })) this.$tab.openPage(row.bdmc, '/drug/formFillBj/' + params) diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue index 35502a5..19def2e 100644 --- a/src/views/business/form/drug/comp/ytbdList.vue +++ b/src/views/business/form/drug/comp/ytbdList.vue @@ -403,6 +403,7 @@ export default { studyMc: this.searchForm.studyMc, studyId: this.searchForm.studyId, studyType: 10, + studyFormType:1, permitForSecectUser: 'business:drugFormPre:sh' }) }, diff --git a/src/views/business/form/nonTrial/comp/tbbdList.vue b/src/views/business/form/nonTrial/comp/tbbdList.vue index e85876f..da38b8c 100644 --- a/src/views/business/form/nonTrial/comp/tbbdList.vue +++ b/src/views/business/form/nonTrial/comp/tbbdList.vue @@ -401,13 +401,15 @@ export default { // this.$emit('showDetail', this.showEdit) // this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId }) this.$modal.loading() - studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { + studyMethod_getReadAllMethodStatus({ + studyType: 5,userId: this.id, studyId: this.searchForm.studyId }).then(response => { if (response.data.toUrl) { this.toRead(response.data) } else { let params = caesarCipher(JSON.stringify({ url: this.$route.fullPath, studyId: this.searchForm.studyId, + studyFormType:5, formId: null })) this.$tab.openPage(this.$t('page.business.study.studyFormFill.xzbd'), '/nonTrial/formFillBj/' + params) @@ -421,14 +423,16 @@ export default { // this.$emit('showDetail', this.showEdit) // this.$refs.Bj.edit(row) this.$modal.loading() - studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { + studyMethod_getReadAllMethodStatus({ + studyType: 5, userId: this.id, studyId: this.searchForm.studyId }).then(response => { if (response.data.toUrl) { this.toRead(response.data) } else { let params = caesarCipher(JSON.stringify({ url: this.$route.fullPath, studyId: this.searchForm.studyId, - formId: row.id + formId: row.id, + studyFormType:5, })) this.$tab.openPage(row.bdmc, '/nonTrial/formFillBj/' + params) } diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue index 4d87a85..43eaff8 100644 --- a/src/views/business/form/nonTrial/comp/ytbdList.vue +++ b/src/views/business/form/nonTrial/comp/ytbdList.vue @@ -439,12 +439,14 @@ export default { studySn: this.searchForm.studySn, studyMc: this.searchForm.studyMc, studyId: this.searchForm.studyId, + studyType: 5, + studyFormType:1, permitForSecectUser: 'business:nonTrialFormPre:sh' }) }, edit(row) { this.$modal.loading() - studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { + studyMethod_getReadAllMethodStatus({ studyType: 5,userId: this.id, studyId: this.searchForm.studyId }).then(response => { if (response.data.toUrl) { this.toRead(response.data) } else { diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue index ce06221..f5ea6e7 100644 --- a/src/views/business/study/comp/jhbd/Bj.vue +++ b/src/views/business/study/comp/jhbd/Bj.vue @@ -41,7 +41,7 @@ - @@ -179,7 +179,9 @@ export default { }], }, - templateData: {} + templateData: {}, + studyType: null, + studyFormType:null } }, computed: { @@ -265,6 +267,8 @@ export default { }, edit(row) { this.reset() + this.studyType = row.studyType||null + this.studyFormType = row.studyFormType||null this.form.qmyy = this.$t('page.business.study.studyFormPlan.cjjl') if (row && row.id) { this.showIndex = 2 diff --git a/src/views/business/study/comp/jhbdList.vue b/src/views/business/study/comp/jhbdList.vue index 5d87cfc..b8a1a3c 100644 --- a/src/views/business/study/comp/jhbdList.vue +++ b/src/views/business/study/comp/jhbdList.vue @@ -254,7 +254,8 @@ export default { } else { this.showEdit = true this.$emit('showDetail', this.showEdit) - this.$refs.Bj.edit({ studySn: this.searchForm.studySn, studyMc: this.searchForm.studyMc, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }) + this.$refs.Bj.edit({ + studyFormType:10, studyType: 1,studySn: this.searchForm.studySn, studyMc: this.searchForm.studyMc, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }) } }).finally(() => { this.$modal.closeLoading() @@ -262,7 +263,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({ studyType: 1,userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => { if (response.data.toUrl) { this.toRead(response.data) } else { diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue index 1fa4afe..b9117eb 100644 --- a/src/views/business/study/comp/sqbd/Bj.vue +++ b/src/views/business/study/comp/sqbd/Bj.vue @@ -41,7 +41,7 @@ - @@ -179,7 +179,9 @@ export default { }], }, - templateData: {} + templateData: {}, + studyType: null, + studyFormType:null } }, computed: { @@ -268,6 +270,8 @@ export default { }, edit(row) { this.reset() + this.studyType = row.studyType||null + this.studyFormType = row.studyFormType||null if (row && row.id) { this.showIndex = 2 this.$modal.loading() diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue index b879217..1b7a9c0 100644 --- a/src/views/business/study/comp/tbbd/Bj.vue +++ b/src/views/business/study/comp/tbbd/Bj.vue @@ -44,7 +44,7 @@ + :name="form.templateMc" :studyType="studyType" :studyFormType="studyFormType" @change="selectTemplateChange" :needPre="1" /> @@ -459,7 +459,8 @@ export default { }] }, templateData: {}, - studyType: null + studyType: null, + studyFormType:null } }, computed: { @@ -531,6 +532,7 @@ export default { try { params = JSON.parse(caesarDecipher(this.$route.params.key)) this.studyType = params.studyType || null + this.studyFormType = params.studyFormType || null } catch (e) { console.log('参数错误') } diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue index 7687bed..f8b15ba 100644 --- a/src/views/business/study/comp/tbbdList.vue +++ b/src/views/business/study/comp/tbbdList.vue @@ -413,6 +413,8 @@ export default { let params = caesarCipher(JSON.stringify({ url: this.$route.fullPath, studyId: this.searchForm.studyId, + studyType: 1, + studyFormType:5, id: null })) this.$tab.openPage(this.$t('page.business.study.studyFormFill.xzbd'), '/study/formFillBj/' + params) @@ -426,13 +428,15 @@ export default { // this.$emit('showDetail', this.showEdit) // this.$refs.Bj.edit(row) this.$modal.loading() - studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => { + studyMethod_getReadAllMethodStatus({userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => { if (response.data.toUrl) { this.toRead(response.data) } else { let params = caesarCipher(JSON.stringify({ url: this.$route.fullPath, studyId: this.searchForm.studyId, + studyType: 1, + studyFormType:5, 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 d4cec22..ab8d40a 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" :studyFormType="studyFormType" @change="selectTemplateChange" /> @@ -186,7 +186,8 @@ export default { }, templateData: {}, - studyType:null + studyType:null, + studyFormType:null, } }, computed: { @@ -265,6 +266,7 @@ export default { this.reset() this.permitForSecectUser = row.permitForSecectUser this.studyType = row.studyType||null + this.studyFormType = row.studyFormType||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 84dcc11..bd12dfa 100644 --- a/src/views/business/study/comp/ytbdList.vue +++ b/src/views/business/study/comp/ytbdList.vue @@ -346,6 +346,7 @@ export default { studySn: this.searchForm.studySn, studyMc: this.searchForm.studyMc, studyId: this.searchForm.studyId, + studyType: 1, permitForSecectUser: 'business:studyFormPre:sh' }) }).finally(() => { @@ -438,6 +439,7 @@ export default { studySn: this.searchForm.studySn, studyMc: this.searchForm.studyMc, studyId: this.searchForm.studyId, + studyType: 1, studySubjectId: this.searchForm.studySubjectId, permitForSecectUser: 'business:studyFormPre:sh' }) @@ -450,7 +452,7 @@ export default { } else { this.showEdit = true this.$emit('showDetail', this.showEdit) - this.$refs.Bj.edit(_.merge({}, row, { permitForSecectUser: 'business:studyFormPre:sh' })) + this.$refs.Bj.edit(_.merge({}, row, { permitForSecectUser: 'business:studyFormPre:sh',studyType: 1 })) } }).finally(() => { this.$modal.closeLoading() diff --git a/src/views/business/template/list.vue b/src/views/business/template/list.vue index f3c9aa6..a2c15a2 100644 --- a/src/views/business/template/list.vue +++ b/src/views/business/template/list.vue @@ -45,7 +45,7 @@ 否 - + @@ -192,7 +211,7 @@ const EmptyDialogData = { name: '', sn: '', deptId: '', - status:10, + status: 10, needPre: 10, type: 10, @@ -212,6 +231,8 @@ export default { }, data() { return { + studyTypeArr: [], + studyFormTypeArr: [], searchForm: { pageNum: 1, pageSize: 10, @@ -225,9 +246,9 @@ export default { total: 0, list: [], - stepGroupList:[], - - stepGroupIdArr:[], + stepGroupList: [], + + stepGroupIdArr: [], infoDialog: { title: '', visible: false, @@ -236,37 +257,40 @@ export default { rules: { showGc: [ - { required: true, message:'请选择', trigger: "blur" } + { required: true, message: '请选择', trigger: "blur" } ], sn: [ - { required: true, message:'请输入', trigger: "blur" } + { required: true, message: '请输入', trigger: "blur" } ], name: [ - { required: true, message:'请输入', trigger: "blur" } + { required: true, message: '请输入', trigger: "blur" } ], deptId: [ - { required: true, message:'请选择', trigger: "change" } + { required: true, message: '请选择', trigger: "change" } ], status: [ - { required: true, message:'请选择', trigger: "change" } + { required: true, message: '请选择', trigger: "change" } ], product: [ - { required: true, message:'请选择', trigger: "change" } + { required: true, message: '请选择', trigger: "change" } ], needPre: [ - { required: true, message:'请选择', trigger: "change" } + { required: true, message: '请选择', trigger: "change" } ], type: [ - { required: true, message:'请选择', trigger: "change" } + { required: true, message: '请选择', trigger: "change" } ], pdfSize: [ - { required: true, message:'请选择', trigger: "change" } + { required: true, message: '请选择', trigger: "change" } ], showYjcc: [ - { required: true, message:'请选择', trigger: "change" } + { required: true, message: '请选择', trigger: "change" } ], studyType: [ - { required: true, message:'请选择', trigger: "change" } + { required: true, message: '请选择', trigger: "change" } + ], + studyFormType: [ + { required: true, message: '请选择', trigger: "change" } ], }, }, @@ -282,17 +306,17 @@ export default { this.getGroupList() }, methods: { - getGroupList(){ - stepGroup_list({ pageNum: 1, pageSize:9999}).then(response => { + getGroupList() { + stepGroup_list({ pageNum: 1, pageSize: 9999 }).then(response => { this.stepGroupList = response.rows; }); }, bdpz(row) { - this.saveSimpleLog({name:row.name+'('+row.showSn+')',nameEn:row.name+'('+row.showSn+')',jcmc:'模板详情',jcmcEn:'Function Detail'}) + this.saveSimpleLog({ name: row.name + '(' + row.showSn + ')', nameEn: row.name + '(' + row.showSn + ')', jcmc: '模板详情', jcmcEn: 'Function Detail' }) this.tableDialog.title = '表单配置' - this.tableDialog.sn=row.sn - this.tableDialog.visible=true + this.tableDialog.sn = row.sn + this.tableDialog.visible = true }, getList() { this.loading = true; @@ -326,7 +350,13 @@ export default { this.$modal.loading() template_info({ id: row.id }).then(({ data }) => { this.infoDialog.formData = data - this.stepGroupIdArr = this.infoDialog.formData.stepGroupIds ? _.map(this.infoDialog.formData.stepGroupIds.split(','),(o)=>{return parseInt(o)}): [] + if (this.infoDialog.formData.studyType && this.infoDialog.formData.studyType != '') { + this.studyTypeArr = this.infoDialog.formData.studyType.split(',') + } + if (this.infoDialog.formData.studyFormType && this.infoDialog.formData.studyFormType != '') { + this.studyFormTypeArr = this.infoDialog.formData.studyFormType.split(',') + } + this.stepGroupIdArr = this.infoDialog.formData.stepGroupIds ? _.map(this.infoDialog.formData.stepGroupIds.split(','), (o) => { return parseInt(o) }) : [] }).finally(() => { this.$modal.closeLoading() }) @@ -341,9 +371,23 @@ export default { // this.$modal.closeLoading() // }) }, - changeStepGroup(val){ + changeStepGroup(val) { this.infoDialog.formData.stepGroupIds = val.join(',') }, + studyTypeChange() { + if (this.studyTypeArr && this.studyTypeArr.length > 0) { + this.infoDialog.formData.studyType = this.studyTypeArr.join(',') + } else { + this.infoDialog.formData.studyType = '' + } + }, + studyFormTypeChange() { + if (this.studyFormTypeArr && this.studyFormTypeArr.length > 0) { + this.infoDialog.formData.studyFormType = this.studyFormTypeArr.join(',') + } else { + this.infoDialog.formData.studyFormType = '' + } + }, save() { this.$refs['infoDialogForm'].validate(valid => { if (valid) {