src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue

@@ -189,22 +189,11 @@
       </template>
 
       <!-- 计算值 -->
-      <Questions 
+      <Questions ref="ecrf2" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        ref="ecrf2" 
+        :group-classify="4" style="margin-top:20px" />
-        :question-form-change-state="true" 
-        :question-form-change-num="0" 
-        :is-qulity-issues="false"
-        :group-classify="4" 
-        :question-type="12"
-        style="margin-top:20px" />
 
       <!-- 评估结果 -->
-      <Questions 
+      <Questions ref="ecrf3" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        ref="ecrf3" 
-        :question-form-change-state="true" 
-        :question-form-change-num="0" 
-        :is-qulity-issues="false"
-        :question-type="12"
         :group-classify="5" />
       <!-- 新增、编辑弹窗 -->
       <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
@@ -633,7 +622,7 @@ export default {
         return v
       }
     },
-    async handleSave(index, options = {}) {
+    async handleSave(index) {
       if (this.rowSaveLoadingMap[index]) return
       const refName = `questions${index}`
       this.$set(this.rowSaveLoadingMap, index, true)
@@ -651,13 +640,9 @@ export default {
           answers: answers
         }
         await saveTaskQuestion(12, params)
-        if (!options.silentSuccess) {
         this.$message.success(this.$t('common:message:savedSuccessfully'))
-        }
         DicomEvent.$emit('getReportInfo', true)
-        if (!options.skipRefresh) {
+        this.refreshQuestions()
-          await this.refreshQuestions()
-        }
         this.formChanged = false
       } catch (e) {
         console.log(e)
@@ -873,23 +858,9 @@ export default {
       }
     },
     async uploadDlgClose() {
-      try {
+      this.refreshQuestions()
-        await this.refreshQuestions()
+      DicomEvent.$emit('getReportInfo', true)
-        const saveTasks = []
-        for (let index = 0; index < this.questions.length; index++) {
-          const qs = this.questions[index]
-          if (qs.GroupClassify === 6) {
-            saveTasks.push(() => this.handleSave(index, { silentSuccess: true, skipRefresh: true }))
-          }
-        }
-        saveTasks.push(() => this.$refs['ecrf2'] && this.$refs['ecrf2'].handleSave({ silentSuccess: true, skipRefresh: true }))
-        saveTasks.push(() => this.$refs['ecrf3'] && this.$refs['ecrf3'].handleSave({ silentSuccess: true, skipRefresh: true }))
-        await Promise.allSettled(saveTasks.map(saveTask => saveTask()))
-      } catch (e) {
-        console.log(e)
-      } finally {
       this.upload.visible = false
-      }
     },
     renderHeader(h, { column, $index }) {
       const span = document.createElement('span')

src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue

@@ -189,22 +189,11 @@
       </template>
 
       <!-- 计算值 -->
-      <Questions 
+      <Questions ref="ecrf2" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        ref="ecrf2" 
+        :group-classify="4" style="margin-top:20px" />
-        :question-form-change-state="true" 
-        :question-form-change-num="0" 
-        :is-qulity-issues="false"
-        :group-classify="4" 
-        :question-type="12"
-        style="margin-top:20px" />
 
       <!-- 评估结果 -->
-      <Questions 
+      <Questions ref="ecrf3" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        ref="ecrf3" 
-        :question-form-change-state="true" 
-        :question-form-change-num="0" 
-        :is-qulity-issues="false"
-        :question-type="12"
         :group-classify="5" />
       <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
         :title="addOrEdit.title" width="500px">
@@ -628,7 +617,7 @@ export default {
         return v
       }
     },
-    async handleSave(index, options = {}) {
+    async handleSave(index) {
       if (this.rowSaveLoadingMap[index]) return
       const refName = `questions${index}`
       this.$set(this.rowSaveLoadingMap, index, true)
@@ -646,13 +635,9 @@ export default {
           answers: answers
         }
         await saveTaskQuestion(12, params)
-        if (!options.silentSuccess) {
         this.$message.success(this.$t('common:message:savedSuccessfully'))
-        }
         DicomEvent.$emit('getReportInfo', true)
-        if (!options.skipRefresh) {
+        this.refreshQuestions()
-          await this.refreshQuestions()
-        }
         this.formChanged = false
       } catch (e) {
         console.log(e)
@@ -899,23 +884,9 @@ export default {
       }
     },
     async uploadDlgClose() {
-      try {
+      this.refreshQuestions()
-        await this.refreshQuestions()
+      DicomEvent.$emit('getReportInfo', true)
-        const saveTasks = []
-        for (let index = 0; index < this.questions.length; index++) {
-          const qs = this.questions[index]
-          if (qs.GroupClassify === 6) {
-            saveTasks.push(() => this.handleSave(index, { silentSuccess: true, skipRefresh: true }))
-          }
-        }
-        saveTasks.push(() => this.$refs['ecrf2'] && this.$refs['ecrf2'].handleSave({ silentSuccess: true, skipRefresh: true }))
-        saveTasks.push(() => this.$refs['ecrf3'] && this.$refs['ecrf3'].handleSave({ silentSuccess: true, skipRefresh: true }))
-        await Promise.allSettled(saveTasks.map(saveTask => saveTask()))
-      } catch (e) {
-        console.log(e)
-      } finally {
       this.upload.visible = false
-      }
     },
     renderHeader(h, { column, $index }) {
       const span = document.createElement('span')

src/views/trials/trials-panel/reading/dicoms/components/Questions.vue

@@ -279,24 +279,22 @@ export default {
       })
     },
 
-    async handleSave(options = {}) {
+    handleSave() {
-      if (this.saveLoading) return false
+      if (this.saveLoading) return
       this.saveLoading = true
-      const valid = await new Promise(resolve => {
+      this.$refs['questions'].validate(async (valid) => {
-        this.$refs['questions'].validate(v => resolve(v))
-      })
         if (!valid) {
           this.saveLoading = false
-        return false
+          return
         }
         // lugano标准校验脾脏状态是否符合要求
         if ((this.criterionType === 2 || this.criterionType === 18) && this.groupClassify === 3) {
           // 是否有标记未保存
           var existUnSave = this.checkAnnotationStatus(this.questions)
           if (existUnSave) {
-          await this.$alert(this.$t('trials:lugano:message:saveWarning'), this.$t('trials:lugano:fusionDialog:warning'))
+            this.$alert(this.$t('trials:lugano:message:saveWarning'), this.$t('trials:lugano:fusionDialog:warning'))
             this.saveLoading = false
-          return false
+            return
           }
 
           var currentSpleenStatus = this.questionForm[this.spleenStatusId]
@@ -307,26 +305,24 @@ export default {
 
           if (currentSpleenLength && currentSpleenStatus === 5) {
             // '脾脏状态为不可评估，不需要添加标记!'
-          await this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
+            this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
               callback: _ => { }
             })
             this.saveLoading = false
-          return false
           } else if (currentSpleenStatus === 5 && ((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData))) {
             // 若有标记，状态不可为“无法评估”
-          await this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
+            this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
               callback: _ => { }
             })
             this.saveLoading = false
-          return false
           } else if (((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData)) && !currentSpleenLength) {
-          await this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
+            this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
               callback: _ => { }
             })
             this.saveLoading = false
-          return false
+          } else {
+            this.saveQuestionsList()
           }
-        return await this.saveQuestionsList(options)
         } else if ((this.criterionType === 2 || this.criterionType === 18) && this.groupClassify === 1 && this.questionForm[this.imageQualityIssuesId] && parseInt(this.questionForm[this.imageQualityIssuesId]) === 6) {
           // 保存影响质量问题分组，如果质量问题为PET-CT影像无法融合则验证是否可以保存
           let res = null
@@ -337,28 +333,30 @@ export default {
           }
 
           if (res.IsSuccess && !res.Result.IsCanChooseNotMerge) {
-          await this.$alert(this.$t('trials:lugano:saveQuestions:warning1'), this.$t('trials:lugano:fusionDialog:warning'), {
+            // this.$alert(this.$t('trials:lugano:saveQuestions:warning1'), this.$t('trials:lugano:fusionDialog:warning'), {showCancelButton: false})
+            this.$alert(this.$t('trials:lugano:saveQuestions:warning1'), this.$t('trials:lugano:fusionDialog:warning'), {
               showCancelButton: false,
               callback: action => { }
             })
             this.saveLoading = false
-          return false
+            return
-        }
+          } else {
             // 如果设置为PET-CT影像无法融合，则FDG-PET评估会被设置为NE。
-        const confirm = await this.$confirm(this.$t('trials:lugano:saveQuestions:warning2'), {
+            this.$confirm(this.$t('trials:lugano:saveQuestions:warning2'), {
               type: 'warning',
               distinguishCancelAndClose: true
-        }).then(() => true).catch(() => false)
+            })
-        if (!confirm) {
+              .then(() => {
-          this.saveLoading = false
+                this.saveQuestionsList()
-          return false
+              })
           }
-        return await this.saveQuestionsList(options)
         } else {
-        return await this.saveQuestionsList(options)
+          this.saveQuestionsList()
         }
+        // this.saveQuestionsList()
+      })
     },
-    async saveQuestionsList(options = {}) {
+    async saveQuestionsList() {
       this.loading = true
       var answers = []
       var imageQuality = null
@@ -384,22 +382,18 @@ export default {
       //   })
       //   params.questionMarkInfoList = questionMarkInfoList
       // }
-      try {
+
-        const res = await saveTaskQuestion(this.questionType, params)
+      saveTaskQuestion(this.questionType, params).then(async res => {
         if (this.imageQualityIssuesId) {
           store.dispatch('reading/setImageQualityIssues', this.questionForm[this.imageQualityIssuesId])
           if (this.questionForm[this.imageQualityIssuesId] && parseInt(this.questionForm[this.imageQualityIssuesId]) === 6) {
             DicomEvent.$emit('closePetct')
           }
         }
-        if (!options.silentSuccess) {
         this.$message.success(this.$t('common:message:savedSuccessfully'))
-        }
-        if (!options.skipRefresh) {
         var trialId = this.$route.query.trialId
         await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: trialId, visitTaskId: this.visitTaskId })
         this.getQuestions(this.visitTaskId, true)
-        }
         this.loading = false
         if (this.isQulityIssues) {
           DicomEvent.$emit('questionFormChange', false)
@@ -423,12 +417,10 @@ export default {
         }
         this.formChanged = false
         this.saveLoading = false
-        return res
+      }).catch(() => {
-      } catch (e) {
         this.loading = false
         this.saveLoading = false
-        throw e
+      })
-      }
     },
     checkAnnotationStatus(obj) {
       for (let i = 0; i < obj.length; i++) {

src/views/trials/trials-panel/reading/dicoms/index.vue

@@ -147,7 +147,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <div style="text-align:right;margin-top: 10px;" v-if="!IsViewStudyPart">
+        <div style="text-align:right;margin-top: 10px;">
           <!-- 确认 -->
           <el-button type="primary" @click="handleConfirmBP">{{ $t('trials:reading:button:confirm')
           }}</el-button>
@@ -223,8 +223,7 @@ export default {
       readingVersionEnum: null,
       dialogBodyPartVisible: false,
       isReadKeyFile: true,
-      isHaveKeyFile: false,
+      isHaveKeyFile: false
-      IsViewStudyPart: true
     }
   },
   computed: {