删除表格数据判断标记是否存在

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

@@ -496,6 +496,9 @@ 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'))
@@ -691,6 +694,7 @@ export default {
         }
       }
       if (isExistUnSaved) {
+        if (this.addOrEdit.type = 'add') {
           // 标记未保存是否确认关闭？ 
           const confirm = await this.$confirm(this.$t("dicom3D:CustomizeQuestionFormItem:confirm:markNoSaveAndclose"), {
             type: 'warning',
@@ -705,7 +709,11 @@ export default {
             this.$emit('unBindAnnotationToQuestion', obj)
           }
 
-        this.addOrEdit.visible = false
+          return this.addOrEdit.visible = false
+        }
+        // 标记未保存无法关闭？ 
+        return this.$alert(this.$t('dicom3D:CustomizeQuestionFormItem:alert:markNoSaveNoclose'))
+
       } else {
         this.addOrEdit.visible = false
       }
@@ -1185,6 +1193,7 @@ export default {
           }
         }
         if (isExistUnSaved) {
+          if (this.addOrEdit.type = 'add') {
             //标记未保存是否确认关闭？ 
             const confirm = await this.$confirm(this.$t("dicom3D:CustomizeQuestionFormItem:confirm:markNoSaveAndclose"), {
               type: 'warning',
@@ -1199,7 +1208,10 @@ export default {
               this.$emit('unBindAnnotationToQuestion', obj)
             }
 
-          done()
+            return done()
+          }
+          // 标记未保存无法关闭？ 
+          return this.$alert(this.$t('dicom3D:CustomizeQuestionFormItem:alert:markNoSaveNoclose'))
           // this.$alert('存在标记信息未保存！')
         } else {
           done()

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

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