diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue index 61d76bc6..830f44b1 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue @@ -486,6 +486,11 @@ export default { } } + }, + 'addOrEdit.visible': { + handler() { + DicomEvent.$emit('opentableCol', { visible: this.addOrEdit.visible }) + } } }, @@ -1077,7 +1082,7 @@ export default { } }) } - + } // this.$emit('formItemNumberChange') }, @@ -1336,7 +1341,7 @@ export default { } } const val = this.getAnnotationProp(item.MeasureData, item.ImageToolAttribute) - this.setFormTableItemData({key: item.TableQuestionId, val}) + this.setFormTableItemData({ key: item.TableQuestionId, val }) // this.$set(this.QuestionsForm, item.TableQuestionId, val) this.formItemTableNumberChange() }) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue index 1db2a526..0f12415a 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue @@ -26,13 +26,15 @@
- + {{ $t('trials:readingReport:button:skip') }} - + {{ $t('common:button:save') }} - + {{ $t('common:button:submit') }}
@@ -115,7 +117,8 @@ export default { questionsMarkStatus: {}, digitPlaces: 2, questionImageToolAttributeInfo: {}, - unSaveTargets: [] + unSaveTargets: [], + isTableVisible: false } }, mounted() { @@ -129,6 +132,10 @@ export default { this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces this.getQuestionCalculateRelation() this.getQuestions(true) + DicomEvent.$on('opentableCol', (data) => { + let { visible } = data + this.isTableVisible = visible + }) }, methods: { handleReadingChart(e) { @@ -241,6 +248,13 @@ export default { async handleSave(isMsg) { const valid = await this.$refs['questions'].validate() if (!valid) return + let isSaved = this.verifyAnnotationIsSave() + if (isSaved) { + let confirm = this.$confirm(this.$t('trials:reading:confirm:AnnotationNotSave'), this.$t('system:menu:confirm:title:warning'), { + type: 'warning' + }) + if (!confirm) return false + } this.loading = true try { var answers = [] @@ -271,6 +285,13 @@ export default { async handleSubmit() { const valid = await this.$refs['questions'].validate() if (!valid) return + let isSaved = this.verifyAnnotationIsSave() + if (isSaved) { + let confirm = this.$confirm(this.$t('trials:reading:confirm:AnnotationNotSave'), this.$t('system:menu:confirm:title:warning'), { + type: 'warning' + }) + if (!confirm) return false + } await this.handleSave(false) await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId }) const { ImageAssessmentReportConfirmation } = const_.processSignature @@ -334,6 +355,13 @@ export default { }, async skipTask() { try { + let isSaved = this.verifyAnnotationIsSave() + if (isSaved) { + let confirm = this.$confirm(this.$t('trials:reading:confirm:AnnotationNotSave'), this.$t('system:menu:confirm:title:warning'), { + type: 'warning' + }) + if (!confirm) return false + } // 是否确认跳过? const confirm = await this.$confirm( this.$t('trials:readingReport:message:skipConfirm'),