diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue index afa916ac..052c8563 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -497,6 +497,25 @@

Developing...

+ +
+ + + {{ $t('trials:readingReport:button:skip') }} + + + + {{ $t('common:button:submit') }} + +
@@ -809,6 +828,10 @@ export default { type: Boolean, required: true }, + iseCRFShowInDicomReading: { + type: Boolean, + required: true + }, questionFormChangeState: { type: Boolean, default() { @@ -2190,6 +2213,8 @@ export default { this.isFullscreen = false this.manualsDialog.visible = true }, + skipTask(){}, + submit(){}, handleFusion() { // https 或者 本地开发环境才是安全上下文 // if (!window.isSecureContext) { @@ -2522,6 +2547,7 @@ export default { width: 350px; height: 100%; border: 1px solid #727272; + position: relative; // overflow-y: auto; } .viewer-container{ diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue index d6563a17..5c593b76 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue @@ -657,11 +657,15 @@ export default { } const res = await submitTableQuestion(params) if (res.IsSuccess) { - // 保存成功! - this.$message.success(this.$t('common:message:savedSuccessfully')) - this.addOrEdit.visible = false - this.refreshQuestions() + // this.refreshQuestions() + await this.getReadingQuestionAndAnswer(this.visitTaskId) + this.$refs['ecrf'].getQuestions(this.visitTaskId, true) + this.$refs['ecrf2'].getQuestions(this.visitTaskId, true) + this.$refs['ecrf3'].getQuestions(this.visitTaskId, true) DicomEvent.$emit('getReportInfo', true) + // 保存成功! + this.addOrEdit.visible = false + this.$message.success(this.$t('common:message:savedSuccessfully')) } loading.close() } catch (e) { diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue index b37d43d3..f9475a87 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue @@ -664,11 +664,15 @@ export default { } const res = await submitTableQuestion(params) if (res.IsSuccess) { - // 保存成功! - this.$message.success(this.$t('common:message:savedSuccessfully')) - this.addOrEdit.visible = false - this.refreshQuestions() + // this.refreshQuestions() + await this.getReadingQuestionAndAnswer(this.visitTaskId) + this.$refs['ecrf'].getQuestions(this.visitTaskId, true) + this.$refs['ecrf2'].getQuestions(this.visitTaskId, true) + this.$refs['ecrf3'].getQuestions(this.visitTaskId, true) DicomEvent.$emit('getReportInfo', true) + // 保存成功! + this.addOrEdit.visible = false + this.$message.success(this.$t('common:message:savedSuccessfully')) } loading.close() } catch (e) { diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue index 8c39f055..e95766d2 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue @@ -57,6 +57,7 @@ :is-reading-show-subject-info="isReadingShowSubjectInfo" :is-reading-task-view-in-order="isReadingTaskViewInOrder" :is-exists-manual="isExistsManual" + :iseCRFShowInDicomReading="iseCRFShowInDicomReading" @previewCD="previewCD" /> @@ -136,6 +137,10 @@ export default { type: Boolean, required: true }, + iseCRFShowInDicomReading: { + type: Boolean, + required: true + }, questionFormChangeState: { type: Boolean, default() { diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue index 67269554..f9619d32 100644 --- a/src/views/trials/trials-panel/reading/dicoms/index.vue +++ b/src/views/trials/trials-panel/reading/dicoms/index.vue @@ -19,6 +19,7 @@ :is-exists-clinical-data="isExistsClinicalData" :is-exists-no-dicom-file="isExistsNoDicomFile" :is-exists-manual="isExistsManual" + :iseCRFShowInDicomReading="IseCRFShowInDicomReading" @previewCD="previewCD" />