From babbda75a6310e66acafa4ca8ca67144889c8b81 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 22 Jan 2026 11:38:29 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E6=96=B9=E6=B3=95=E6=9C=AA=E9=98=85=E8=AF=BB?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/business/study/studyMethod.js | 3 +- src/lang/zh/business/study/studyMethod.js | 1 + src/views/business/form/nonTrial/comp/tbbdList.vue | 130 +++++++++++++------- src/views/business/form/nonTrial/comp/ytbdList.vue | 61 +++++++--- src/views/business/study/comp/jhbdList.vue | 55 ++++++--- src/views/business/study/comp/tbbdList.vue | 131 ++++++++++++++------- src/views/business/study/comp/ytbdList.vue | 84 +++++++++---- 7 files changed, 322 insertions(+), 143 deletions(-) diff --git a/src/lang/en/business/study/studyMethod.js b/src/lang/en/business/study/studyMethod.js index 002fcd6..1a024f6 100644 --- a/src/lang/en/business/study/studyMethod.js +++ b/src/lang/en/business/study/studyMethod.js @@ -16,5 +16,6 @@ export default { qmr: 'Signed By', qmsj: 'Date', qmyy: 'Meaning of Signature', - remark: 'Comment' + remark: 'Comment', + qyd:'Go Read' } diff --git a/src/lang/zh/business/study/studyMethod.js b/src/lang/zh/business/study/studyMethod.js index 2bfa44d..f78025a 100644 --- a/src/lang/zh/business/study/studyMethod.js +++ b/src/lang/zh/business/study/studyMethod.js @@ -17,4 +17,5 @@ export default { qmsj: '签名时间', qmyy: '签名意义', remark: '备注', + qyd:'去阅读' } \ No newline at end of file diff --git a/src/views/business/form/nonTrial/comp/tbbdList.vue b/src/views/business/form/nonTrial/comp/tbbdList.vue index d7debd4..3a30e11 100644 --- a/src/views/business/form/nonTrial/comp/tbbdList.vue +++ b/src/views/business/form/nonTrial/comp/tbbdList.vue @@ -7,13 +7,13 @@ + style="width: 200px" /> + style="width: 200px" /> @@ -42,22 +42,19 @@ + :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> + :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> - + @@ -83,19 +80,27 @@ @@ -111,7 +116,7 @@ @click="edit(scope.row)" v-hasPermi="['business:nonTrialFormFill:bj']">{{ $t('form.edit') }} - {{ $t('page.business.study.studyFormFill.fh') }} @@ -241,11 +246,11 @@ export default { userMc: '', templateMc: '', cjsjjs: '', - sfbl:null, + sfbl: null, cjsjks: '', tjsjjs: '', tjsjks: '', - sfbl:null + sfbl: null }, loading: false, total: 0, @@ -265,8 +270,12 @@ export default { ghgsr(row) { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - this.currentRow = row - this.$refs.selectDeptUserDialog.show(null, null) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.currentRow = row + this.$refs.selectDeptUserDialog.show(null, null) + } }).finally(() => { this.$modal.closeLoading() }) @@ -277,8 +286,11 @@ export default { jq(row) { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - this.$refs.Jq.show(row) - + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.$refs.Jq.show(row) + } }).finally(() => { this.$modal.closeLoading() }) @@ -286,7 +298,11 @@ export default { qrfz(row) { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - this.$refs.Qrfz.show(row) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.$refs.Qrfz.show(row) + } }).finally(() => { this.$modal.closeLoading() }) @@ -294,7 +310,11 @@ export default { gc(row) { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - this.$refs.Gc.show(row) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.$refs.Gc.show(row) + } }).finally(() => { this.$modal.closeLoading() }) @@ -302,11 +322,23 @@ export default { fz(row) { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - this.$refs.Fz.show(row) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.$refs.Fz.show(row) + } }).finally(() => { this.$modal.closeLoading() }) }, + toRead(data) { + this.$alert(data.ffmc, '', { + confirmButtonText: this.$t('page.business.study.studyMethod.qyd'), + callback: action => { + this.$tab.openPage("loading", data.toUrl) + } + }); + }, userChange(val) { this.searchForm.userId = val.id this.searchForm.userMc = val.name @@ -327,8 +359,8 @@ export default { this.searchForm.tjsjjs = '' this.searchForm.tjsjks = '' this.searchForm.sfbl = null - this.daterange=[] - this.daterangetj=[] + this.daterange = [] + this.daterangetj = [] this.search() }, getList() { @@ -359,12 +391,16 @@ export default { // 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 => { - let params = caesarCipher(JSON.stringify({ - url: this.$route.fullPath, - studyId: this.searchForm.studyId, - formId: null - })) - this.$tab.openPage(this.$t('page.business.study.studyFormFill.xzbd'), '/nonTrial/formFillBj/' + params) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + let params = caesarCipher(JSON.stringify({ + url: this.$route.fullPath, + studyId: this.searchForm.studyId, + formId: null + })) + this.$tab.openPage(this.$t('page.business.study.studyFormFill.xzbd'), '/nonTrial/formFillBj/' + params) + } }).finally(() => { this.$modal.closeLoading() }) @@ -375,12 +411,16 @@ export default { // this.$refs.Bj.edit(row) this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - let params = caesarCipher(JSON.stringify({ - url: this.$route.fullPath, - studyId: this.searchForm.studyId, - formId: row.id - })) - this.$tab.openPage(row.bdmc, '/nonTrial/formFillBj/' + params) + 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 + })) + this.$tab.openPage(row.bdmc, '/nonTrial/formFillBj/' + params) + } }).finally(() => { this.$modal.closeLoading() }) @@ -418,9 +458,13 @@ export default { fh(row) { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - this.showFh = true - this.$emit('showDetail', this.showFh) - this.$refs.Fh.show(row) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.showFh = true + this.$emit('showDetail', this.showFh) + this.$refs.Fh.show(row) + } }).finally(() => { this.$modal.closeLoading() }) diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue index 3dc7491..f15cdb8 100644 --- a/src/views/business/form/nonTrial/comp/ytbdList.vue +++ b/src/views/business/form/nonTrial/comp/ytbdList.vue @@ -40,8 +40,7 @@ + :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> @@ -69,11 +68,16 @@ @@ -97,13 +101,14 @@ @@ -243,7 +248,7 @@ export default { userMc: '', templateMc: '', cjsjjs: '', - sfbl:null, + sfbl: null, cjsjks: '', tjsjjs: '', tjsjks: '', @@ -271,8 +276,12 @@ export default { ghgsr(row) { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - this.currentRow = row - this.$refs.selectDeptUserDialog.show(null, null) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.currentRow = row + this.$refs.selectDeptUserDialog.show(null, null) + } }).finally(() => { this.$modal.closeLoading() }) @@ -283,7 +292,11 @@ export default { jq(row) { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - this.$refs.Jq.show(row) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.$refs.Jq.show(row) + } }).finally(() => { this.$modal.closeLoading() }) @@ -291,7 +304,11 @@ export default { qrfz(row) { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - this.$refs.Qrfz.show(row) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.$refs.Qrfz.show(row) + } }).finally(() => { this.$modal.closeLoading() }) @@ -299,7 +316,11 @@ export default { gc(row) { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - this.$refs.Gc.show(row) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.$refs.Gc.show(row) + } }).finally(() => { this.$modal.closeLoading() }) @@ -307,7 +328,11 @@ export default { fz(row) { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId }).then(response => { - this.$refs.Fz.show(row) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.$refs.Fz.show(row) + } }).finally(() => { this.$modal.closeLoading() }) @@ -331,8 +356,8 @@ export default { this.searchForm.tjsjjs = '' this.searchForm.tjsjks = '' this.searchForm.sfbl = null - this.daterange=[] - this.daterangetj=[] + this.daterange = [] + this.daterangetj = [] this.search() }, getList() { @@ -357,18 +382,30 @@ export default { this.loading = false }) }, + toRead(data) { + this.$alert(data.ffmc, '', { + confirmButtonText: this.$t('page.business.study.studyMethod.qyd'), + callback: action => { + this.$tab.openPage("loading", data.toUrl) + } + }); + }, 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, studySubjectId: this.searchForm.studySubjectId }) this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => { - let params = caesarCipher(JSON.stringify({ - url: this.$route.fullPath, - studyId: this.searchForm.studyId, - id: null - })) - this.$tab.openPage(this.$t('page.business.study.studyFormFill.xzbd'), '/study/formFillBj/' + params) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + let params = caesarCipher(JSON.stringify({ + url: this.$route.fullPath, + studyId: this.searchForm.studyId, + id: null + })) + this.$tab.openPage(this.$t('page.business.study.studyFormFill.xzbd'), '/study/formFillBj/' + params) + } }).finally(() => { this.$modal.closeLoading() }) @@ -379,12 +416,16 @@ export default { // this.$refs.Bj.edit(row) this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => { - let params = caesarCipher(JSON.stringify({ - url: this.$route.fullPath, - studyId: this.searchForm.studyId, - formId: row.id - })) - this.$tab.openPage(row.bdmc, '/study/formFillBj/' + params) + 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 + })) + this.$tab.openPage(row.bdmc, '/study/formFillBj/' + params) + } }).finally(() => { this.$modal.closeLoading() }) @@ -422,9 +463,13 @@ export default { fh(row) { this.$modal.loading() studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => { - this.showFh = true - this.$emit('showDetail', this.showFh) - this.$refs.Fh.show(row) + if (response.data.toUrl) { + this.toRead(response.data) + } else { + this.showFh = true + this.$emit('showDetail', this.showFh) + this.$refs.Fh.show(row) + } }).finally(() => { this.$modal.closeLoading() }) diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue index 60d16c4..397f1b0 100644 --- a/src/views/business/study/comp/ytbdList.vue +++ b/src/views/business/study/comp/ytbdList.vue @@ -5,15 +5,15 @@ - + + style="width: 200px" /> + style="width: 200px" /> @@ -33,15 +33,14 @@ + style="width: 200px" /> + :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" /> @@ -65,12 +64,18 @@ @@ -94,13 +99,16 @@