阅片报告页修改

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

@@ -411,14 +411,16 @@ export default {
     getTableHeight() {
       this.height = window.innerHeight - 170
     },
-    getReportInfo(IsCalculate) {
+    async getReportInfo(IsCalculate) {
       this.loading = true
+      try {
         var params = {
           visitTaskId: this.visitTaskId,
           trialId: this.$router.currentRoute.query.trialId,
           IsCalculate: IsCalculate !== false
         }
-      getReadingReportEvaluation(params).then(res => {
+        const res = await getReadingReportEvaluation(params)
+        if (res.IsSuccess) {
           this.readingTaskState = res.Result.ReadingTaskState
           this.tumorEvaluate = res.Result.CalculateResult.TumorEvaluate ? parseInt(res.Result.CalculateResult.TumorEvaluate) : null
           this.isExistDisease = res.Result.CalculateResult.IsExistDisease ? parseInt(res.Result.CalculateResult.IsExistDisease) : null
@@ -435,8 +437,12 @@ export default {
           const ntLesion = res.Result.LesionCountList.find(i => i.LesionType === 1)
           this.ntLesionCount = ntLesion ? ntLesion.Count : 0
           this.setScrollTop()
+        }
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
     },
     setScrollTop(a) {
       setTimeout(() => {
@@ -608,12 +614,15 @@ export default {
       }
     },
     async handleConfirm() {
+      this.loading = true
+      try {
         await this.handleSave(false)
-      await this.verifyVisitTaskQuestions()
+        await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
         var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
         var isBaseline = this.visitTaskList[i].IsBaseLine
         if (isBaseline) {
-        this.assessmentQuestions = await this.getAdditionalAssessments()
+          const res = await getTaskAdditionalQuestion({ visitTaskId: this.visitTaskId })
+          this.assessmentQuestions = res.Result
           if (this.assessmentQuestions.length > 0) {
           // 打开附加评估框
             this.additionalAssessmentsDig.visible = true
@@ -627,6 +636,10 @@ export default {
           this.signCode = ImageAssessmentReportConfirmation
           this.signVisible = true
         }
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+      }
     },
     sign() {
       this.additionalAssessmentsDig.visible = false
@@ -636,31 +649,6 @@ export default {
         this.signVisible = true
       })
     },
-    // 附加评估
-    getAdditionalAssessments() {
-      return new Promise((resolve) => {
-        this.loading = true
-        getTaskAdditionalQuestion({ visitTaskId: this.visitTaskId }).then(res => {
-          this.loading = false
-          resolve(res.Result)
-        }).catch(() => {
-          this.loading = false
-          resolve()
-        })
-      })
-    },
-    verifyVisitTaskQuestions() {
-      return new Promise((resolve, reject) => {
-        this.loading = true
-        verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId }).then(res => {
-          this.loading = false
-          resolve()
-        }).catch(() => {
-          this.loading = false
-          reject()
-        })
-      })
-    },
     handleResize() {
       this.$nextTick(() => {
         this.$refs.reportList && this.$refs.reportList.doLayout()
@@ -675,15 +663,16 @@ export default {
       }
     },
     // 签名并确认
-    signConfirm(signInfo) {
+    async signConfirm(signInfo) {
       this.loading = true
+      try {
         var params = {
           data: {
             visitTaskId: this.visitTaskId
           },
           signInfo: signInfo
         }
-      submitDicomVisitTask(params).then(async res => {
+        const res = await submitDicomVisitTask(params)
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           if (this.$refs['signForm']) {
@@ -699,7 +688,8 @@ export default {
           await store.dispatch('reading/setVisitTaskReadingTaskState', { visitTaskId: this.visitTaskId, readingTaskState: 2 })
           // DicomEvent.$emit('setReadingState', 2)
           await store.dispatch('reading/setCurrentReadingTaskState', 2)
-          var isAutoTask = await this.getAutoTaskVal()
+          const res = await getAutoCutNextTask()
+          var isAutoTask = res.Result.AutoCutNextTask
           if (isAutoTask) {
             // DicomEvent.$emit('reload')
             // DicomEvent.$emit('getNextTask')
@@ -723,19 +713,12 @@ export default {
           // DicomEvent.$emit('readingPageStateUpdate', { readingTaskState: 2 })
         }
         this.loading = false
-      }).catch(() => {
+      } catch (e) {
         this.loading = false
         if (this.$refs['signForm'] && this.$refs['signForm'].btnLoading) {
           this.$refs['signForm'].btnLoading = false
         }
-      })
+      }
-    },
-    getAutoTaskVal() {
-      return new Promise((resolve, reject) => {
-        getAutoCutNextTask().then(res => {
-          resolve(res.Result.AutoCutNextTask)
-        }).catch(() => { reject() })
-      })
     },
     previewDicoms(task) {
       if (this.openWindow) {
@@ -755,7 +738,7 @@ export default {
       this.openWindow = window.open(routeData.href, '_blank')
     },
     handleSave(isPrompt) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async(resolve, reject) => {
         var isBeill
         var evaluateResult = ''
         var evaluateAjustReason = ''
@@ -805,20 +788,21 @@ export default {
           return
         }
         this.loading = true
+        try {
           var params = {
             visitTaskId: this.visitTaskId,
             answers: this.answers
           }
-        changeDicomReadingQuestionAnswer(params).then(res => {
+          const res = await changeDicomReadingQuestionAnswer(params)
-          if (isPrompt) {
+          if (res.IsSuccess && isPrompt) {
             this.$message.success(this.$t('common:message:savedSuccessfully'))
           }
           this.loading = false
           resolve()
-        }).catch(() => {
+        } catch (e) {
           this.loading = false
           reject()
-        })
+        }
       })
     },
     getWarningText() {