src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue

@@ -1540,7 +1540,7 @@ export default {
           if (this.isNumber(operateStateEnum)) {
             this.$refs[`ecrf_${series.TaskInfo.VisitTaskId}`][0].bindAnnotationToQuestion(annotation)
           } else {
-            setTimeout(()=>{this.saveCustomAnnotation(annotation)},500)
+            this.saveCustomAnnotation(annotation)
           }
         }
       }
@@ -1622,8 +1622,7 @@ export default {
         if (annotation.visitTaskId === this.taskInfo.VisitTaskId) {
           const isBound = this.$refs[`ecrf_${annotation.visitTaskId}`][0].verifyAnnotationIsBound(annotation)
           if (isBound && this.activeTool === 'Eraser') {
-            // '该标记已与问题进行绑定，不允许删除！'
+            this.$alert('该标记已与问题进行绑定，不允许删除！')
-            this.$alert(this.$t('dicom3D:ReadPage:alert:MarkToQuestionNoDel'))
             const errorMsg = { message: 'annotation Not allowed to operate' }
             throw errorMsg
           }
@@ -3168,7 +3167,7 @@ export default {
         })
         .catch(() => {})
     },
-    async uploadScreenshots(fileName, file) {
+        async uploadScreenshots(fileName, file) {
       try {
         file = this.convertBase64ToBlob(file)
         const trialId = this.$route.query.trialId

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue

@@ -496,9 +496,6 @@ export default {
       this.$emit('operateImageMarker', { operateStateEnum: 6, question })
     },
     async deleteTableCol(row, index) {
-      let data = row.TableQuestions.Answers[index]
-      let hasMark = Object.keys(data).some(key => this.questionsMarkStatus[`${data.RowId}_${key}`] && this.questionsMarkStatus[`${data.RowId}_${key}`].isMarked)
-      if (hasMark) return this.$alert(this.$t('dicom3D:ReadPage:alert:QuestionToMarkNoDel'))
       let loading = null
       try {
         let confirm = await this.$confirm(this.$t('trials:uploadNonDicoms:message:msg1'))
@@ -694,26 +691,21 @@ export default {
         }
       }
       if (isExistUnSaved) {
-        if (this.addOrEdit.type = 'add') {
+        // 标记未保存是否确认关闭？ 
-          // 标记未保存是否确认关闭？ 
+        const confirm = await this.$confirm(this.$t("dicom3D:CustomizeQuestionFormItem:confirm:markNoSaveAndclose"), {
-          const confirm = await this.$confirm(this.$t("dicom3D:CustomizeQuestionFormItem:confirm:markNoSaveAndclose"), {
+          type: 'warning',
-            type: 'warning',
+          distinguishCancelAndClose: true
-            distinguishCancelAndClose: true
+        })
-          })
+        if (confirm !== 'confirm') return
-          if (confirm !== 'confirm') return
+        // 清除绑定关系
-          // 清除绑定关系
+        let obj = {}
-          let obj = {}
+        if (!this.QuestionsForm.RowId) {
-          if (!this.QuestionsForm.RowId) {
+          obj.markTableQuestions = this.markTableQuestions
-            obj.markTableQuestions = this.markTableQuestions
+          obj.questionId = this.question.Id
-            obj.questionId = this.question.Id
+          this.$emit('unBindAnnotationToQuestion', obj)
-            this.$emit('unBindAnnotationToQuestion', obj)
-          }
-
-          return this.addOrEdit.visible = false
         }
-        // 标记未保存无法关闭？ 
-        return this.$alert(this.$t('dicom3D:CustomizeQuestionFormItem:alert:markNoSaveNoclose'))
 
+        this.addOrEdit.visible = false
       } else {
         this.addOrEdit.visible = false
       }
@@ -1193,25 +1185,21 @@ export default {
           }
         }
         if (isExistUnSaved) {
-          if (this.addOrEdit.type = 'add') {
+          //标记未保存是否确认关闭？ 
-            //标记未保存是否确认关闭？ 
+          const confirm = await this.$confirm(this.$t("dicom3D:CustomizeQuestionFormItem:confirm:markNoSaveAndclose"), {
-            const confirm = await this.$confirm(this.$t("dicom3D:CustomizeQuestionFormItem:confirm:markNoSaveAndclose"), {
+            type: 'warning',
-              type: 'warning',
+            distinguishCancelAndClose: true
-              distinguishCancelAndClose: true
+          })
-            })
+          if (confirm !== 'confirm') return
-            if (confirm !== 'confirm') return
+          // 清除绑定关系
-            // 清除绑定关系
+          let obj = {}
-            let obj = {}
+          if (!this.QuestionsForm.RowId) {
-            if (!this.QuestionsForm.RowId) {
+            obj.markTableQuestions = this.markTableQuestions
-              obj.markTableQuestions = this.markTableQuestions
+            obj.questionId = this.question.Id
-              obj.questionId = this.question.Id
+            this.$emit('unBindAnnotationToQuestion', obj)
-              this.$emit('unBindAnnotationToQuestion', obj)
-            }
-
-            return done()
           }
-          // 标记未保存无法关闭？ 
+
-          return this.$alert(this.$t('dicom3D:CustomizeQuestionFormItem:alert:markNoSaveNoclose'))
+          done()
           // this.$alert('存在标记信息未保存！')
         } else {
           done()

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue

@@ -922,15 +922,13 @@ export default {
         return
       }
       this.questionMarkInfoList = questionMarkInfoList.filter(item => {
-        const { TableQuestionId, QuestionId, RowId } = item || {}
+        const { TableQuestionId, QuestionId } = item || {}
-        if ((TableQuestionId && QuestionId === questionId && markTableQuestions.includes(TableQuestionId)) && !RowId) {
+        if ((TableQuestionId && QuestionId === questionId && markTableQuestions.includes(TableQuestionId))) {
           if (questionsMarkStatus && questionsMarkStatus[TableQuestionId]) {
             delete questionsMarkStatus[TableQuestionId]
-          }else {
-            return item
           }
         } else {
-          return item
+          return
         }
       })
     },