Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

src/views/dictionary/template/components/CriterionQuestionForm.vue

@@ -430,9 +430,26 @@
       <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
         <el-input-number v-model="form.ImageCount" controls-position="right" :min="1" :max="10" />
       </el-form-item>
-      <!--      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'summary'" label="注释">-->
+      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
-      <!--        <el-input v-model="form.Remark" />-->
+        <el-select v-model="form.HighlightAnswerList" clearable multiple>
-      <!--      </el-form-item>-->
+          <template v-if="form.TypeValue">
+            <el-option
+              v-for="item of form.TypeValue.split('|')"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </template>
+          <template v-else-if="form.DictionaryCode">
+            <el-option
+              v-for="item of $d[form.DictionaryCode]"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </template>
+        </el-select>
+      </el-form-item>
       <el-form-item label="序号" prop="ShowOrder">
         <el-input-number
           v-model="form.ShowOrder"
@@ -552,7 +569,8 @@ export default {
         LimitEdit: 0,
         GroupId: null,
         ConvertShowType: 0,
-        QuestionClassify: null
+        QuestionClassify: null,
+        HighlightAnswerList: []
       },
       rules: {
         Type: [

src/views/dictionary/template/components/TableQsForm.vue

@@ -315,7 +315,26 @@
           :max="10"
         />
       </el-form-item>
-
+      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
+        <el-select v-model="form.HighlightAnswerList" clearable multiple>
+          <template v-if="form.TypeValue">
+            <el-option
+              v-for="item of form.TypeValue.split('|')"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </template>
+          <template v-else-if="form.DictionaryCode">
+            <el-option
+              v-for="item of $d[form.DictionaryCode]"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </template>
+        </el-select>
+      </el-form-item>
       <el-form-item label="序号" prop="ShowOrder">
         <el-input-number
           v-model="form.ShowOrder"
@@ -427,7 +446,8 @@ export default {
         QuestionMark: null,
         LimitEdit: 0,
         GlobalReadingShowType: null,
-        QuestionClassify: null
+        QuestionClassify: null,
+        HighlightAnswerList: []
 
         // IsEnable: true
       },

src/views/trials/trials-panel/reading/ad-review/index.vue

@@ -203,7 +203,7 @@
           >
             <i slot="default" class="el-icon-plus" />
             <div slot="file" slot-scope="{file}">
-              <viewer :images="images" :ref="file.url">
+              <viewer :ref="file.url" :images="images">
                 <img
                   class="el-upload-list__item-thumbnail"
                   :src="OSSclientConfig.basePath + file.url"
@@ -229,7 +229,7 @@
               </viewer>
             </div>
           </el-upload>
-          
+
         </el-form-item>
         <el-form-item v-if="adInfo.ReadingTaskState < 2">
           <div style="text-align:center;">
@@ -317,7 +317,7 @@ import const_ from '@/const/sign-code'
 import { getToken } from '@/utils/auth'
 import SignForm from '@/views/trials/components/newSignForm'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
-import store from '@/store'
+// import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 import Viewer from 'v-viewer'
 export default {
@@ -424,48 +424,58 @@ export default {
     }
   },
   methods: {
-    getAdInfo() {
+    async getAdInfo() {
       this.loading = true
-      getJudgeReadingInfo({ visitTaskId: this.visitTaskId }).then(res => {
+      try {
-        var judgeQS = []
+        const res = await getJudgeReadingInfo({ visitTaskId: this.visitTaskId })
-        if (res.Result.VisitInfoList.length > 0) {
+        if (res.IsSuccess) {
-          res.Result.VisitInfoList[0].VisitTaskInfoList.map((v, index) => {
+          var judgeQS = []
-            var qsObj = { armEnum: v.ArmEnum, judgeQuestionList: [], index: index }
+          if (res.Result.VisitInfoList.length > 0) {
-            v.JudgeQuestionList.map(q => {
+            res.Result.VisitInfoList[0].VisitTaskInfoList.map((v, index) => {
-              if (q.QuestionType === 1) {
+              var qsObj = { armEnum: v.ArmEnum, judgeQuestionList: [], index: index }
-                qsObj.judgeQuestionList.push(q.QuestionName)
+              v.JudgeQuestionList.map(q => {
-              } else if (q.QuestionType === 3 && this.criterionType === 10) {
+                if (q.QuestionType === 1) {
-                qsObj.judgeQuestionList.push(this.$t('trials:globalReview:table:visitRemark'))
+                  qsObj.judgeQuestionList.push(q.QuestionName)
-              } else {
+                } else if (q.QuestionType === 3 && this.criterionType === 10) {
-                qsObj.judgeQuestionList.push(this.$fd('JudgeReadingQuestionType', q.QuestionType))
+                  qsObj.judgeQuestionList.push(this.$t('trials:globalReview:table:visitRemark'))
-              }
+                } else {
+                  qsObj.judgeQuestionList.push(this.$fd('JudgeReadingQuestionType', q.QuestionType))
+                }
+              })
+              judgeQS.push(qsObj)
             })
-            judgeQS.push(qsObj)
+          }
-          })
+          this.judgeQuestion = judgeQS
-        }
+          this.isFixed = this.judgeQuestion.length > 0 && this.judgeQuestion[0].judgeQuestionList.length > 4
-        this.judgeQuestion = judgeQS
+          this.adInfo = res.Result
-        this.isFixed = this.judgeQuestion.length > 0 && this.judgeQuestion[0].judgeQuestionList.length > 4
+          this.adForm.judgeResultTaskId = res.Result.JudgeResultTaskId
-        this.adInfo = res.Result
-        this.adForm.judgeResultTaskId = res.Result.JudgeResultTaskId
 
-        this.adForm.judgeResultRemark = res.Result.JudgeResultRemark
+          this.adForm.judgeResultRemark = res.Result.JudgeResultRemark
-        this.fileList = []
+          this.fileList = []
-        if (res.Result.JudgeResultImagePathList) {
+          if (res.Result.JudgeResultImagePathList) {
-          res.Result.JudgeResultImagePathList.map(url => {
+            res.Result.JudgeResultImagePathList.map(url => {
-            if (url) { this.fileList.push({ name: '', url: url }) }
+              if (url) { this.fileList.push({ name: '', url: url }) }
-          })
+            })
-          this.adForm.judgeResultImagePathList = res.Result.JudgeResultImagePathList
+            this.adForm.judgeResultImagePathList = res.Result.JudgeResultImagePathList
+          }
+          this.visitTaskArmList = res.Result.VisitTaskArmList
         }
-        this.visitTaskArmList = res.Result.VisitTaskArmList
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     },
-    getPriorAdList() {
+    async getPriorAdList() {
       this.priorLoading = true
-      getReadingPastResultList({ visitTaskId: this.visitTaskId }).then(res => {
+      try {
-        this.priorADList = res.Result
+        const res = await getReadingPastResultList({ visitTaskId: this.visitTaskId })
+        if (res.IsSuccess) {
+          this.priorADList = res.Result
+        }
         this.priorLoading = false
-      }).catch(() => { this.priorLoading = false })
+      } catch (e) {
+        this.priorLoading = false
+      }
     },
     handleVisitTaskArmChange(v) {
       var i = this.visitTaskArmList.findIndex(i => i.VisitTaskId === v)
@@ -491,33 +501,32 @@ export default {
       })
       window.open(routeData.href, '_blank')
     },
-    handleSave() {
+    async handleSave() {
-      this.$refs['adForm'].validate((valid) => {
+      const valid = await this.$refs['adForm'].validate()
-        if (!valid) return
+      if (!valid) return
-        this.loading = true
+      this.loading = true
-        var paths = []
+      var paths = []
-        this.fileList.map(file => {
+      this.fileList.map(file => {
-          if (file.url) {
+        if (file.url) {
-            paths.push(file.url)
+          paths.push(file.url)
-          }
+        }
-        })
-        this.adForm.judgeResultImagePathList = paths
-        this.adForm.visitTaskId = this.visitTaskId
-        saveJudgeVisitTaskResult(this.adForm).then(res => {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.loading = false
-        }).catch(() => {
-          this.loading = false
-        })
       })
+      this.adForm.judgeResultImagePathList = paths
+      this.adForm.visitTaskId = this.visitTaskId
+      try {
+        await saveJudgeVisitTaskResult(this.adForm)
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+      }
     },
-    handleSubmit() {
+    async handleSubmit() {
-      this.$refs['adForm'].validate((valid) => {
+      const valid = await this.$refs['adForm'].validate()
-        if (!valid) return
+      if (!valid) return
-        const { ImageAssessmentReportConfirmation } = const_.processSignature
+      const { ImageAssessmentReportConfirmation } = const_.processSignature
-        this.signCode = ImageAssessmentReportConfirmation
+      this.signCode = ImageAssessmentReportConfirmation
-        this.signVisible = true
+      this.signVisible = true
-      })
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
@@ -528,7 +537,7 @@ export default {
       }
     },
     // 签名并确认
-    signConfirm(signInfo) {
+    async signConfirm(signInfo) {
       this.loading = true
       var paths = []
       this.fileList.map(file => {
@@ -543,7 +552,8 @@ export default {
         },
         signInfo: signInfo
       }
-      submitJudgeVisitTaskResult(params).then(async res => {
+      try {
+        const res = await submitJudgeVisitTaskResult(params)
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.isEdit = false
@@ -553,38 +563,35 @@ export default {
           // window.opener.postMessage('refreshTaskList', window.location)
           // 设置当前任务阅片状态为已读
           this.adInfo.ReadingTaskState = 2
-          var isAutoTask = await this.getAutoTaskVal()
+          const res = await getAutoCutNextTask()
+          var isAutoTask = res.Result.AutoCutNextTask
           if (isAutoTask) {
-            store.dispatch('reading/resetVisitTasks')
+            // store.dispatch('reading/resetVisitTasks')
-            DicomEvent.$emit('getNextTask')
+            window.location.reload()
           } else {
           // '当前阅片任务已完成，是否进入下一个阅片任务？'
-            this.$confirm(this.$t('trials:adReview:title:msg2'), {
+            const confirm = await this.$confirm(
-              type: 'warning',
+              this.$t('trials:adReview:title:msg2'),
-              distinguishCancelAndClose: true
+              {
-            })
+                type: 'warning',
-              .then(() => {
+                distinguishCancelAndClose: true
-                store.dispatch('reading/resetVisitTasks')
+              }
-                DicomEvent.$emit('getNextTask')
+            )
-              })
+            if (confirm === 'confirm') {
-              .catch(action => {
+              // store.dispatch('reading/resetVisitTasks')
-                changeURLStatic('visitTaskId', this.visitTaskId)
+              // DicomEvent.$emit('getNextTask')
-              })
+              window.location.reload()
+            } else {
+              changeURLStatic('visitTaskId', this.visitTaskId)
+            }
           }
           window.opener.postMessage('refreshTaskList', window.location)
         }
         this.loading = false
-      }).catch(_ => {
+      } catch (e) {
         this.loading = false
         this.$refs['signForm'].btnLoading = false
-      })
+      }
-    },
-    getAutoTaskVal() {
-      return new Promise((resolve, reject) => {
-        getAutoCutNextTask().then(res => {
-          resolve(res.Result.AutoCutNextTask)
-        }).catch(() => { reject() })
-      })
     },
     handleViewDetail(visitTaskId) {
       if (this.openWindow) {

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

@@ -111,10 +111,11 @@ export default {
     this.isRender = true
   },
   methods: {
-    handleSave() {
+    async handleSave() {
-      this.$refs.assessmentForm.validate(async valid => {
+      const valid = await this.$refs.assessmentForm.validate()
-        if (!valid) return
+      if (!valid) return
-        const loading = this.$loading({ fullscreen: true })
+      const loading = this.$loading({ fullscreen: true })
+      try {
         var answers = []
         for (const k in this.form) {
           answers.push({ questionId: k, answer: this.form[k] })
@@ -123,13 +124,15 @@ export default {
           visitTaskId: this.visitTaskId,
           answerList: answers
         }
-        submitTaskAdditionalQuestion(params).then(res => {
+        const res = await submitTaskAdditionalQuestion(params)
+        if (res.IsSuccess) {
           this.$emit('sign')
-          loading.close()
+        }
-        }).catch(() => {
+        loading.close()
-          loading.close()
+      } catch (e) {
-        })
+        console.log(e)
-      })
+        loading.close()
+      }
     },
     handleCancel() {
       this.$emit('close')

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

@@ -1,6 +1,6 @@
 <template>
   <el-form
-    ref="subjectForm"
+    ref="customWWWC"
     v-loading="loading"
     :model="form"
     :rules="rules"
@@ -67,11 +67,10 @@ export default {
     }
   },
   methods: {
-    handleSave() {
+    async handleSave() {
-      this.$refs.subjectForm.validate(valid => {
+      const valid = await this.$refs.customWWWC.validate()
-        if (!valid) return
+      if (!valid) return
-        this.$emit('setWwwc', this.form)
+      this.$emit('setWwwc', this.form)
-      })
     },
     handleCancel() {
       this.$emit('close')

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

@@ -1021,6 +1021,10 @@ export default {
       if (!this.petctWindow) return
       this.petctWindow.postMessage({ type: 'readingPageUpdate', data: data }, window.location)
     })
+    DicomEvent.$on('resetPage', () => {
+      if (!this.petctWindow) return
+      this.petctWindow.postMessage({ type: 'resetPage' }, window.location)
+    })
     DicomEvent.$on('setReadingState', (data) => {
       if (!this.petctWindow) return
       this.petctWindow.postMessage({ type: 'setReadingState', data: data }, window.location)
@@ -1058,28 +1062,30 @@ export default {
     })
   },
   methods: {
-    getWwcTpl() {
+    async getWwcTpl() {
-      const loading = this.$loading({ fullscreen: true })
+      // const loading = this.$loading({ fullscreen: true })
-      getUserWLTemplateList().then(res => {
+      try {
+        const res = await getUserWLTemplateList()
         this.customWwcTpl = []
         res.Result.map(i => {
           this.customWwcTpl.push({ label: i.TemplateName, wc: i.WL, ww: i.WW })
         })
         this.wwwcArr = [...this.defaultWwwc, ...this.customWwcTpl]
-        loading.close()
+      } catch (e) {
-      }).catch(() => { loading.close() })
+        console.log(e)
+      }
     },
-    getHotKeys() {
+    async getHotKeys() {
-      const loading = this.$loading({ fullscreen: true })
+      // const loading = this.$loading({ fullscreen: true })
-      getDoctorShortcutKey({ imageToolType: 0 }).then(res => {
+      try {
+        const res = await getDoctorShortcutKey({ imageToolType: 0 })
         res.Result.map(item => {
           this.hotKeyList.push({ id: item.Id, altKey: item.AltKey, ctrlKey: item.CtrlKey, shiftKey: item.ShiftKey, metaKey: item.MetaKey, key: item.Keyboardkey, code: item.Code, text: item.Text, shortcutKeyEnum: item.ShortcutKeyEnum })
         })
         this.bindHotKey()
-        loading.close()
+      } catch (e) {
-      }).catch(() => {
+        console.log(e)
-        loading.close()
+      }
-      })
     },
     resetHotkeyList(arr) {
       this.hotKeyList = []

src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue

@@ -798,17 +798,17 @@ export default {
           var imageIds = []
           var instanceList = []
           series.InstanceInfoList.forEach(instance => {
-              if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
+            if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
-                for (let i = 0; i < instance.NumberOfFrames; i++) {
+              for (let i = 0; i < instance.NumberOfFrames; i++) {
-                  const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?frame=${i}`
+                const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?frame=${i}`
-                  imageIds.push(imageId)
-                }
-              } else {
-                const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}`
                 imageIds.push(imageId)
               }
-              instanceList.push(instance.Id)
+            } else {
-            })
+              const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}`
+              imageIds.push(imageId)
+            }
+            instanceList.push(instance.Id)
+          })
           resolve({
             imageIds: imageIds,
             instanceList: instanceList,
@@ -2149,7 +2149,49 @@ export default {
         this.screenshotWindow.close()
       }
     },
+    async clearAnnotations() {
+      const viewportIds = ['PT_AXIAL', 'CT_AXIAL', 'FUSION_AXIAL']
+      viewportIds.map(v => {
+        const viewport = renderingEngine.getViewport(v)
+        if (viewport) {
+          var annotations = annotation.state.getAnnotations('CircleROI', viewport.element)
+
+          if (annotations && annotations.length > 0) {
+            annotations.map(i => {
+              if (i.metadata.toolName === 'CircleROI') {
+                annotation.state.removeAnnotation(i.annotationUID)
+              }
+            })
+          }
+        }
+        viewport.render()
+      })
+      try {
+        const visitTaskId = this.$route.query.visitTaskId
+        const res = await getTableAnswerRowInfoList(visitTaskId)
+        if (res.IsSuccess) {
+          var arr = []
+          res.Result.forEach(el => {
+            if (el.OtherMeasureData) {
+              el.OtherMeasureData = JSON.parse(el.OtherMeasureData)
+              el.OtherMeasureData.invalidated = false
+              if (this.readingTaskState === 2) {
+                el.OtherMeasureData.isLocked = true
+              }
+              el.OtherMeasureData.data.remark = el.OrderMarkName
+              const viewport = renderingEngine.getViewport('PT_AXIAL')
+              annotation.state.addAnnotation(el.OtherMeasureData, viewport.element)
+            }
+            arr.push(el)
+          })
+          this.measureDatas = arr
+        }
+      } catch (e) {
+
+      }
+    },
     async receiveMsg(event) {
+      console.log(event.data.type)
       if (event.data.type === 'readingPageUpdate') {
         // this.$refs['questions'].initList()
         this.$refs['tableQuestions'].initList(true)
@@ -2171,6 +2213,14 @@ export default {
           FusionEvent.$emit('closeHistoryScreenshot')
           window.close()
         }
+      } else if (event.data.type === 'resetPage') {
+        if (this.screenshotWindow) {
+          this.screenshotWindow.close()
+        }
+        this.$refs['tableQuestions'].initList(true)
+        this.$refs['questions'].initList(true)
+        this.isLocate = true
+        this.clearAnnotations()
       }
     },
     startTimer() {

src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue

@@ -66,6 +66,27 @@
             </template>
           </el-input>
         </template>
+        <template v-else-if="question.QuestionType === 55">
+          <el-select
+            v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2 "
+            clearable
+            @change="((val)=>{formItemChange(val, question)})"
+          >
+            <el-option-group
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
+            >
+              <template>
+                <el-option
+                  v-for="item of $d[question.DictionaryCode]"
+                  :key="item.id"
+                  :value="String(item.value)"
+                  :label="item.label"
+                />
+              </template>
+            </el-option-group>
+          </el-select>
+        </template>
         <template v-else-if="question.QuestionType === 56">
           <el-select
             v-model="questionForm[question.Id]"
@@ -73,23 +94,27 @@
             clearable
             @change="((val)=>{formItemChange(val, question)})"
           >
-            <template v-if="pet5PS*1=== -1">
+            <el-option-group
-              <el-option
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${parseFloat(question.LastTaskAnswer) === 5 ? 'NA' : $fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
-                v-for="item of $d[question.DictionaryCode]"
+            >
-                v-show="item.value !== 4"
+              <template v-if="pet5PS*1=== -1">
-                :key="item.id"
+                <el-option
-                :value="String(item.value)"
+                  v-for="item of $d[question.DictionaryCode]"
-                :label="item.label"
+                  v-show="item.value !== 4"
-              />
+                  :key="item.id"
-            </template>
+                  :value="String(item.value)"
-            <template v-else>
+                  :label="item.label"
-              <el-option
+                />
-                v-for="item of $d[question.DictionaryCode]"
+              </template>
-                :key="item.id"
+              <template v-else>
-                :value="String(item.value)"
+                <el-option
-                :label="item.label"
+                  v-for="item of $d[question.DictionaryCode]"
-              />
+                  :key="item.id"
-            </template>
+                  :value="String(item.value)"
+                  :label="item.label"
+                />
+              </template>
+            </el-option-group>
           </el-select>
         </template>
         <template v-else-if="question.QuestionType === 57">
@@ -99,23 +124,27 @@
             clearable
             @change="((val)=>{formItemChange(val, question)})"
           >
-            <template v-if="pet5PS*1=== -1">
+            <el-option-group
-              <el-option
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
-                v-for="item of $d[question.DictionaryCode]"
+            >
-                v-show="item.value !== 1"
+              <template v-if="pet5PS*1=== -1">
-                :key="item.id"
+                <el-option
-                :value="String(item.value)"
+                  v-for="item of $d[question.DictionaryCode]"
-                :label="item.label"
+                  v-show="item.value !== 1"
-              />
+                  :key="item.id"
-            </template>
+                  :value="String(item.value)"
-            <template v-else>
+                  :label="item.label"
-              <el-option
+                />
-                v-for="item of $d[question.DictionaryCode]"
+              </template>
-                :key="item.id"
+              <template v-else>
-                :value="String(item.value)"
+                <el-option
-                :label="item.label"
+                  v-for="item of $d[question.DictionaryCode]"
-              />
+                  :key="item.id"
-            </template>
+                  :value="String(item.value)"
+                  :label="item.label"
+                />
+              </template>
+            </el-option-group>
           </el-select>
         </template>
         <!-- 输入框 -->

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

@@ -14,7 +14,7 @@
           :question-form="questionForm"
           :reading-task-state="readingTaskState"
           :visit-task-id="visitTaskId"
-          :pet5PS="questionForm[pet5PSId]"
+          :pet5p-s="questionForm[pet5PSId]"
           :lung-is-inside-volume="lungIsInsideVolume"
           :liver-is-inside-volume="liverIsInsideVolume"
           @setFormItemData="setFormItemData"
@@ -163,42 +163,49 @@ export default {
       }
       this.initList(true)
     },
-    initList(isInit) {
+    async initList(isInit) {
       this.loading = true
-      var params = {
+      try {
-        trialId: this.trialId,
+        const params = {
-        visitTaskId: this.visitTaskId,
+          trialId: this.trialId,
-        questionClassify: 0
+          visitTaskId: this.visitTaskId,
-      }
+          questionClassify: 0
-      getDicomReadingQuestionAnswer(params).then(res => {
+        }
-        var questions = res.Result
+        const res = await getDicomReadingQuestionAnswer(params)
+        if (res.IsSuccess) {
+          const questions = res.Result
 
-        questions.map((v) => {
+          questions.map((v) => {
-          v.IsBaseLineTask = this.isBaseLineTask
+            v.IsBaseLineTask = this.isBaseLineTask
-          if (v.Type === 'group' && v.Childrens.length === 0) return
+            if (v.Type === 'group' && v.Childrens.length === 0) return
-          if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
+            if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
-            this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
+              this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
-          }
-          if (v.Childrens.length > 0) {
-            this.setChild(v.Childrens)
-          }
-        })
-        this.questions = questions
-        this.setPet5PSCommentDisplay()
-        this.measurements = []
-        res.OtherInfo.QuestionMarkInfoList.forEach(i => {
-          if (i.OtherMeasureData) {
-            i.OtherMeasureData = JSON.parse(i.OtherMeasureData)
-            if (i.QuestionType === 51 && isInit) {
-              this.liverRender = false
-            } else if (i.QuestionType === 52 && isInit) {
-              this.lungRender = false
             }
-          }
+            if (v.Childrens.length > 0) {
-          this.measurements.push(i)
+              this.setChild(v.Childrens)
-        })
+            }
+          })
+          console.log(this.questionForm,questions)
+          this.questions = questions
+          this.setPet5PSCommentDisplay()
+          this.measurements = []
+          res.OtherInfo.QuestionMarkInfoList.forEach(i => {
+            if (i.OtherMeasureData) {
+              i.OtherMeasureData = JSON.parse(i.OtherMeasureData)
+              if (i.QuestionType === 51 && isInit) {
+                this.liverRender = false
+              } else if (i.QuestionType === 52 && isInit) {
+                this.lungRender = false
+              }
+            }
+            this.measurements.push(i)
+          })
+        }
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
     },
     setChild(obj) {
       obj.forEach(i => {
@@ -263,37 +270,28 @@ export default {
         // }
       })
     },
-    saveQuestionsForm() {
+    async saveQuestionsForm() {
       this.loading = true
-      var answers = []
+      try {
-      for (const k in this.questionForm) {
+        var answers = []
-        answers.push({ id: k, answer: this.questionForm[k] })
+        for (const k in this.questionForm) {
-      }
+          answers.push({ id: k, answer: this.questionForm[k] })
-      // var questionMarkInfoList = []
+        }
-      // this.measurements.forEach(item => {
+        var params = {
-      //   var i = Object.assign({}, item)
+          visitTaskId: this.visitTaskId,
-      //   if (i.OtherMeasureData) {
+          answers: answers
-      //     for (const k in i.OtherMeasureData.data.cachedStats) {
+        }
-      //       i.OtherMeasureData.data.cachedStats[k].pointsInShape = []
+        const res = await saveTaskQuestion(1, params)
-      //     }
+        if (res.IsSuccess) {
-      //     i.OtherMeasureData = JSON.stringify(i.OtherMeasureData)
+          window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
-      //   }
+          this.loading = false
-
+          this.questionFormChangeState = false
-      //   questionMarkInfoList.push(i)
+          this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
-      // })
+        }
-      var params = {
+      } catch (e) {
-        visitTaskId: this.visitTaskId,
+        console.log(e)
-        answers: answers
-        // questionMarkInfoList
-      }
-      saveTaskQuestion(1, params).then(async res => {
-        window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
         this.loading = false
-        this.questionFormChangeState = false
+      }
-        this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
-      }).catch(() => {
-        this.loading = false
-      })
     },
     checkAnnotationStatus(obj) {
       for (let i = 0; i < obj.length; i++) {
@@ -422,21 +420,27 @@ export default {
             break
           }
         }
-        var params = {
+        try {
-          visitTaskId: this.visitTaskId,
+          var params = {
-          answers,
+            visitTaskId: this.visitTaskId,
-          questionMarkInfoList
+            answers,
+            questionMarkInfoList
+          }
+          const qsType = question.QuestionType === 51 ? 2 : question.QuestionType === 52 ? 3 : null
+
+          const res = await saveTaskQuestion(qsType, params)
+          if (res.IsSuccess) {
+            this.$set(question, 'SaveEnum', 0)
+            window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
+            loading.close()
+            this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
+            this.resetSuvQuestions(1)
+          }
+          loading.close()
+        } catch (e) {
+          console.log(e)
+          loading.close()
         }
-        const qsType = question.QuestionType === 51 ? 2 : question.QuestionType === 52 ? 3 : null
-        saveTaskQuestion(qsType, params).then(async res => {
-          this.$set(question, 'SaveEnum', 0)
-          window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
-          loading.close()
-          this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
-          this.resetSuvQuestions(1)
-        }).catch(() => {
-          loading.close()
-        })
       })
     },
     viewAnnotations(question) {
@@ -622,7 +626,7 @@ export default {
       console.log('setfocalFDG')
       if (this.questionForm[this.pet5PSId] !== '-1' && this.questionForm[this.focalFDGId] === '1') {
         this.questionForm[this.focalFDGId] = ''
-      } 
+      }
     },
     setpet5PS() {
       console.log('setpet5PS')
@@ -654,40 +658,38 @@ export default {
         return ''
       }
     },
-    resetSuvQuestions(type = 0) {
+    async resetSuvQuestions(type = 0) {
       this.loading = true
-      var params = {
+      try {
-        trialId: this.trialId,
+        const params = {
-        visitTaskId: this.visitTaskId,
+          trialId: this.trialId,
-        questionClassify: 0
+          visitTaskId: this.visitTaskId,
-      }
+          questionClassify: 0
-      getDicomReadingQuestionAnswer(params).then(res => {
+        }
-        var questions = res.Result
+        const res = await getDicomReadingQuestionAnswer(params)
-        questions.map((v) => {
+        if (res.IsSuccess) {
-          if (v.Type === 'group' && v.Childrens.length === 0) return
+          const questions = res.Result
-          // if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
+          questions.map((v) => {
-          //   this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
+            if (v.Type === 'group' && v.Childrens.length === 0) return
-          // }
+            if (v.Childrens.length > 0) {
-          if (v.Childrens.length > 0) {
+              this.setSuvChild(v.Childrens, type)
-            this.setSuvChild(v.Childrens, type)
+            }
-          }
+          })
-          // var pet5PS = this.setpet5PS()
+          for (let i = 0; i < this.questions[0].Childrens[0].Childrens.length; i++) {
-          // this.questionForm[this.pet5PSId] = pet5PS
+            if (this.questions[0].Childrens[0].Childrens[i].QuestionType === 59) {
-          // this.calculatePet5PS = pet5PS
+              this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 2
-          // this.setPet5PSCommentDisplay()
+              this.questions[0].Childrens[0].Childrens[i].IsRequired = 3
-          // this.setUptakeFormBaseline()
+              this.questionForm[this.pet5PSCommentsId] = ''
-        })
+              break
-        for (let i = 0; i < this.questions[0].Childrens[0].Childrens.length; i++) {
+            }
-          if (this.questions[0].Childrens[0].Childrens[i].QuestionType === 59) {
+          }
-            this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 2
+          this.questionFormChangeState = true
-            this.questions[0].Childrens[0].Childrens[i].IsRequired = 3
-            this.questionForm[this.pet5PSCommentsId] = ''
-            break
-          }
         }
-        this.questionFormChangeState = true
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
     },
     setSuvChild(obj, type) {
       obj.forEach(i => {

src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue

@@ -316,7 +316,7 @@ export default {
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
 
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
-      var lesionState = this.getQuestionVal(7)
+      // var lesionState = this.getQuestionVal(7)
       if (!isRerender) {
         if (this.questionForm.RowId) {
           this.$set(this.questionForm, 'saveTypeEnum', 2)
@@ -625,7 +625,7 @@ export default {
                   }
                 }
               }
-              var lesionState = this.getQuestionVal(7)
+              // var lesionState = this.getQuestionVal(7)
               if (this.firstRenderAnnotation) {
                 this.$set(this.questionForm, 'saveTypeEnum', 2)
               } else {
@@ -871,75 +871,79 @@ export default {
             this.deleteInfo = null
             params.rowId = ''
           }
-          submitTableQuestion(params).then(async res => {
+          try {
-            this.currentMarkTool = otherMeasureData ? otherMeasureData.type : ''
+            const res = await submitTableQuestion(params)
-            // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
+            if (res.IsSuccess) {
+              this.currentMarkTool = otherMeasureData ? otherMeasureData.type : ''
+              this.$set(this.questionForm, 'saveTypeEnum', 2)
+              this.originalQuestionForm = { ...this.questionForm }
+              var isLymphLesion = this.getQuestionVal(2)
+              isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
+              var lesionOrgan = this.getQuestionVal(6)
+              this.$set(this.questionForm, 'RowId', res.Result.RowId)
+              const lesionPart = this.getQuestionVal(8)
+              const suvMax = this.getQuestionVal(20)
+              this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
 
-            this.$set(this.questionForm, 'saveTypeEnum', 2)
+              FusionEvent.$emit('resetSuvQuestions')
-            this.originalQuestionForm = { ...this.questionForm }
+              window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
-            loading.close()
+              this.$emit('close')
-            var isLymphLesion = this.getQuestionVal(2)
-            isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
-            var lesionOrgan = this.getQuestionVal(6)
-            this.$set(this.questionForm, 'RowId', res.Result.RowId)
-            const lesionPart = this.getQuestionVal(8)
-            const suvMax = this.getQuestionVal(20)
-            this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
 
-            // FusionEvent.$emit('getAnnotations')
+              this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
-            FusionEvent.$emit('resetSuvQuestions')
+            }
-            window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
-            this.$emit('close')
             loading.close()
-            this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
+          } catch (e) {
-          }).catch(() => { loading.close() })
+            console.log(e)
+            loading.close()
+          }
         })
       })
     },
-    handleDeleteMeasureData() {
+    async handleDeleteMeasureData() {
       // 是否确认清除标记？
-      this.$confirm(this.$t('trials:reading:warnning:msg47'), {
+      const confirm = await this.$confirm(
-        type: 'warning',
+        this.$t('trials:reading:warnning:msg47'),
-        distinguishCancelAndClose: true
+        {
-      })
+          type: 'warning',
-        .then(async() => {
+          distinguishCancelAndClose: true
-          this.organList = []
+        }
-          await this.getOrganInfoList()
+      )
-          // 重置SUV
+      if (confirm !== 'confirm') return
-          var suvId = this.getQuestionId(20)
+      this.organList = []
-          this.$set(this.questionForm, suvId, '')
+      await this.getOrganInfoList()
-          // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
+      // 重置SUV
-          if (this.questionForm.RowId) {
+      var suvId = this.getQuestionId(20)
-            this.$set(this.questionForm, 'saveTypeEnum', 1)
+      this.$set(this.questionForm, suvId, '')
-          } else {
+      // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
-            this.$set(this.questionForm, 'saveTypeEnum', 0)
+      if (this.questionForm.RowId) {
-          }
+        this.$set(this.questionForm, 'saveTypeEnum', 1)
-          FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData, type: 'clear' })
+      } else {
-          // await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
+        this.$set(this.questionForm, 'saveTypeEnum', 0)
+      }
+      FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData, type: 'clear' })
+      // await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
 
-          // Store.$emit('updateImage', this.questionForm.MeasureData.instanceId)
+      // Store.$emit('updateImage', this.questionForm.MeasureData.instanceId)
-          var isLymphLesion = this.getQuestionVal(2)
+      var isLymphLesion = this.getQuestionVal(2)
-          isLymphLesion = !isNaN(parseInt(isLymphLesion)) ? parseInt(isLymphLesion) : null
+      isLymphLesion = !isNaN(parseInt(isLymphLesion)) ? parseInt(isLymphLesion) : null
-          const lesionPart = this.getQuestionVal(8)
+      const lesionPart = this.getQuestionVal(8)
-          const lesionOrgan = this.getQuestionVal(6)
+      const lesionOrgan = this.getQuestionVal(6)
 
-          if (!this.questionForm.IsDicomReading) {
+      if (!this.questionForm.IsDicomReading) {
 
-          }
+      }
-          this.$set(this.questionForm, 'IsDicomReading', true)
+      this.$set(this.questionForm, 'IsDicomReading', true)
 
-          this.$set(this.questionForm, 'OtherMeasureData', '')
+      this.$set(this.questionForm, 'OtherMeasureData', '')
-          let anwsers = null
+      let anwsers = null
-          if (this.answers.measureObj) {
+      if (this.answers.measureObj) {
-            anwsers = Object.assign({ measureObj: '' }, this.questionForm)
+        anwsers = Object.assign({ measureObj: '' }, this.questionForm)
-          } else {
+      } else {
-            anwsers = Object.assign({}, this.questionForm)
+        anwsers = Object.assign({}, this.questionForm)
-          }
+      }
-          var suvMax = this.getQuestionVal(20)
+      var suvMax = this.getQuestionVal(20)
-          this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
+      this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
-          this.isInsideVolume = true
+      this.isInsideVolume = true
-        })
-        .catch(() => {})
     },
     async clearMeasurement() {
       this.organList = []
@@ -975,65 +979,63 @@ export default {
       this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
       this.isInsideVolume = true
     },
-    handleDelete() {
+    async handleDelete() {
-      // 是否确认删除？
+      const confirm = await this.$confirm(
-      this.$confirm(this.$t('trials:reading:warnning:msg48'), {
+        this.$t('trials:reading:warnning:msg48'),
-        type: 'warning',
+        {
-        distinguishCancelAndClose: true
-      })
-        .then(async() => {
-          if (this.questionForm.RowId) {
-            const loading = this.$loading({ fullscreen: true })
-            var param = {
-              visitTaskId: this.visitTaskId,
-              questionId: this.parentQsId,
-              rowId: this.questionForm.RowId
-            }
-            deleteReadingRowAnswer(param)
-              .then(async res => {
-                loading.close()
-                if (res.IsSuccess) {
-                // this.$emit('getReadingQuestionAndAnswer')
-                  if (this.questionForm.IsDicomReading && this.questionForm.OtherMeasureData) {
-                    // await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
-                    FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData, type: 'delete' })
-                  }
-                  this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
-
-                  // '删除成功！'
-                  this.$message.success(this.$t('common:message:deletedSuccessfully'))
-                  loading.close()
-                  window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
-                }
-              }).catch(() => { loading.close() })
-          } else {
-            // const loading = this.$loading({ fullscreen: true })
-            // 移除新建病灶并关闭窗口
-            if (this.questionForm.OtherMeasureData && this.questionForm.IsDicomReading) {
-              // await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
-              FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData })
-            }
-            this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
-            // loading.close()
-          }
-        })
-    },
-    handleClose() {
-      if (!this.questionForm.RowId) {
-        // '当前病灶为新建病灶，未保存。如果关闭窗口，将会删除病灶信息，是否继续？'
-        this.$confirm(this.$t('trials:reading:warnning:msg49'), {
           type: 'warning',
           distinguishCancelAndClose: true
-        })
+        }
-          .then(async() => {
+      )
-            // 移除新建病灶并关闭窗口
+      if (confirm !== 'confirm') return
-            if (this.questionForm.OtherMeasureData) {
+      if (this.questionForm.RowId) {
-              FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData })
+        const loading = this.$loading({ fullscreen: true })
-              // await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
+        try {
+          var param = {
+            visitTaskId: this.visitTaskId,
+            questionId: this.parentQsId,
+            rowId: this.questionForm.RowId
+          }
+          const res = await deleteReadingRowAnswer(param)
+          if (res.IsSuccess) {
+            if (this.questionForm.IsDicomReading && this.questionForm.OtherMeasureData) {
+              FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData, type: 'delete' })
             }
             this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
-          })
+            // '删除成功！'
-          .catch(() => {})
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
+            loading.close()
+            window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
+          }
+          loading.close()
+        } catch (e) {
+          console.log(e)
+          loading.close()
+        }
+      } else {
+        // 移除新建病灶并关闭窗口
+        if (this.questionForm.OtherMeasureData && this.questionForm.IsDicomReading) {
+          FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData })
+        }
+        this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
+      }
+    },
+    async handleClose() {
+      if (!this.questionForm.RowId) {
+        // '当前病灶为新建病灶，未保存。如果关闭窗口，将会删除病灶信息，是否继续？'
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg49'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        // 移除新建病灶并关闭窗口
+        if (this.questionForm.OtherMeasureData) {
+          FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData })
+        }
+        this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
       } else {
         if (this.questionForm.saveTypeEnum === 1) {
           this.$emit('close')

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

@@ -56,22 +56,25 @@ export default {
     this.getHotkeys()
   },
   methods: {
-    getHotkeys(isReset = false) {
+    async getHotkeys(isReset = false) {
       this.loading = true
       this.hotKeyList = []
-      getDoctorShortcutKey({ imageToolType: this.readingTool }).then(res => {
+      try {
-        res.Result.map(item => {
+        const res = await getDoctorShortcutKey({ imageToolType: this.readingTool })
-          this.hotKeyList.push({ id: item.Id, keys: { controlKey: { altKey: item.AltKey, ctrlKey: item.CtrlKey, shiftKey: item.ShiftKey, metaKey: item.MetaKey, key: item.Keyboardkey, code: item.Code }, text: item.Text }, label: item.ShortcutKeyEnum })
+        if (res.IsSuccess) {
-        })
+          res.Result.map(item => {
-        if (isReset) {
+            this.hotKeyList.push({ id: item.Id, keys: { controlKey: { altKey: item.AltKey, ctrlKey: item.CtrlKey, shiftKey: item.ShiftKey, metaKey: item.MetaKey, key: item.Keyboardkey, code: item.Code }, text: item.Text }, label: item.ShortcutKeyEnum })
-          this.$emit('reset', this.hotKeyList)
+          })
+          if (isReset) {
+            this.$emit('reset', this.hotKeyList)
+          }
         }
         this.loading = false
-      }).catch(() => {
+      } catch (e) {
         this.loading = false
-      })
+      }
     },
-    handleSave() {
+    async handleSave() {
       var params = {
         imageToolType: this.readingTool,
         shortcutKeyList: []
@@ -86,17 +89,15 @@ export default {
           emptyLabel = item.label
           break
         } else {
-          shortcutKeyList.push(
+          shortcutKeyList.push({
-            {
+            shortcutKeyEnum: item.label,
-              shortcutKeyEnum: item.label,
+            keyboardkey: item.keys.controlKey.key,
-              keyboardkey: item.keys.controlKey.key,
+            code: item.keys.controlKey.code,
-              code: item.keys.controlKey.code,
+            text: item.keys.text,
-              text: item.keys.text,
+            altKey: item.keys.controlKey.altKey,
-              altKey: item.keys.controlKey.altKey,
+            ctrlKey: item.keys.controlKey.ctrlKey,
-              ctrlKey: item.keys.controlKey.ctrlKey,
+            shiftKey: item.keys.controlKey.shiftKey,
-              shiftKey: item.keys.controlKey.shiftKey,
+            metaKey: item.keys.controlKey.metaKey })
-              metaKey: item.keys.controlKey.metaKey }
-          )
         }
       }
       if (isExistEmptyText) {
@@ -112,43 +113,40 @@ export default {
         })
       } else {
         this.loading = true
-        // this.hotKeyList.map(item => {
-        //   shortcutKeyList.push(
-        //     {
-        //       shortcutKeyEnum: item.label,
-        //       keyboardkey: item.keys.controlKey.key,
-        //       code: item.keys.controlKey.code,
-        //       text: item.keys.text,
-        //       altKey: item.keys.controlKey.altKey,
-        //       ctrlKey: item.keys.controlKey.ctrlKey,
-        //       shiftKey: item.keys.controlKey.shiftKey,
-        //       metaKey: item.keys.controlKey.metaKey }
-        //   )
-        // })
         params.shortcutKeyList = shortcutKeyList
-        setShortcutKey(params).then(res => {
+        try {
-          this.$emit('reset', this.hotKeyList)
+          const res = await setShortcutKey(params)
-          // this.$emit('close')
+          if (res.IsSuccess) {
+            this.$emit('reset', this.hotKeyList)
+          }
           this.loading = false
-        }).catch(() => {
+        } catch (e) {
           this.loading = false
-        })
+        }
       }
     },
-    handleReset() {
+    async handleReset() {
       // '是否确认重置？'
-      this.$confirm(this.$t('trials:hotkeys:message:confirmReset'), {
+      const confirm = await this.$confirm(
-        type: 'warning',
+        this.$t('trials:hotkeys:message:confirmReset'),
-        distinguishCancelAndClose: true
+        {
-      })
+          type: 'warning',
-        .then(() => {
+          distinguishCancelAndClose: true
-          this.loading = true
+        }
-          restoreDefaultShortcutKey({ imageToolType: this.readingTool }).then(res => {
+      )
-            this.$message.success(this.$t('trials:hotkeys:message:resetSuccessfully')) // '重置成功！'
+      if (confirm !== 'confirm') return
-            this.getHotkeys(true)
+
-          }).catch(() => { this.loading = false })
+      this.loading = true
-        })
+      try {
-        .catch(action => {})
+        const res = await restoreDefaultShortcutKey({ imageToolType: this.readingTool })
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('trials:hotkeys:message:resetSuccessfully')) // '重置成功！'
+          this.getHotkeys(true)
+        }
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+      }
     },
     handleHotkeyVerify(hotkey) {
       for (const item of this.hotKeyList) {

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

@@ -1080,17 +1080,17 @@ export default {
       this.$refs['ecrf'].getQuestions(obj.visitTaskId)
     },
     async resetMeasuredData() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
       try {
-        const confirm = await this.$confirm(
-          this.$t('trials:dicomReading:message:confirmReset1'),
-          this.$t('trials:dicomReading:message:confirmReset2'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
         const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
         this.loading = false
         if (res.IsSuccess) {
@@ -1099,13 +1099,16 @@ export default {
           this.activeItem.activeRowIndex = null
           this.activeItem.activeCollapseId = null
           await this.getReadingQuestionAndAnswer(this.visitTaskId)
-          this.$refs['ecrf'].resetQSForm()
+          const triald = this.$router.currentRoute.query.trialId
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
           DicomEvent.$emit('getMeasureData')
           DicomEvent.$emit('getReportInfo', true)
           DicomEvent.$emit('refreshStudyListMeasureData')
         }
+        loading.close()
       } catch (e) {
-        this.loading = false
+        loading.close()
         console.log(e)
       }
     },

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

@@ -2,10 +2,20 @@
   <div class="measurement-wrapper" :style="{'height':height+10+'px'}">
 
     <div class="container" :style="{'height':height+'px'}">
-      <h3 v-if="isReadingShowSubjectInfo" style="color: #ddd;padding: 5px 0px;margin: 0;">
+      <div class="basic-info">
-        <span v-if="subjectCode">{{ subjectCode }} </span>
+        <h3 v-if="isReadingShowSubjectInfo">
-        <span style="margin-left:5px;">{{ taskBlindName }}</span>
+          <span v-if="subjectCode">{{ subjectCode }} </span>
-      </h3>
+          <span style="margin-left:5px;">{{ taskBlindName }}</span>
+        </h3>
+        <div v-if="readingTaskState < 2">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+            <i
+              class="el-icon-refresh-left"
+              @click="resetMeasuredData"
+            />
+          </el-tooltip>
+        </div>
+      </div>
       <!-- 非测量问题 -->
       <div class="lesions">
         <!-- 影像质量问题 -->
@@ -216,6 +226,7 @@
 </template>
 <script>
 import { splitLesion, getSplitPPdSum, getCanMergeLesion, mergeLesion } from '@/api/trials'
+import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
 import { mapGetters } from 'vuex'
@@ -333,7 +344,8 @@ export default {
       })
     })
     DicomEvent.$on('refreshSplitTargetLesionPDD', async(callback) => {
-      this.splitTargetLesions = await this.getSplitTargetLesionPDD()
+      const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
+      this.splitTargetLesions = res.Result
       if (this.splitTargetLesions && this.splitTargetLesions.length > 0) {
         this.splitTargetLesions.map(i => {
           var refName = `${this.lesionTypeQuestionId}_${i.RowIndex}`
@@ -388,7 +400,8 @@ export default {
           loading.close()
         }
         if (!this.isBaseLineTask) {
-          this.splitTargetLesions = await this.getSplitTargetLesionPDD()
+          const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
+          this.splitTargetLesions = res.Result
         }
         this.questions = this.visitTaskList[i].ReadingQuestions
         this.$nextTick(() => {
@@ -530,7 +543,8 @@ export default {
               this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
             }
             if (!this.isBaseLineTask) {
-              this.splitTargetLesions = await this.getSplitTargetLesionPDD()
+              const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
+              this.splitTargetLesions = res.Result
             }
             this.getTableQuestions()
             this.$nextTick(() => {
@@ -559,13 +573,6 @@ export default {
         } catch (e) { console.log(e) }
       })
     },
-    getSplitTargetLesionPDD() {
-      return new Promise(resolve => {
-        getSplitPPdSum({ visitTaskId: this.visitTaskId }).then(res => {
-          resolve(res.Result)
-        }).catch(() => { resolve() })
-      })
-    },
     setHeight() {
       this.height = window.innerHeight - 140
     },
@@ -688,7 +695,7 @@ export default {
       })
     },
     // 融合
-    handleMerge(answers, questionId, orderMark) {
+    async handleMerge(answers, questionId, orderMark) {
       this.lesionData = []
       this.mergeList = []
       this.merge.visible = true
@@ -697,10 +704,16 @@ export default {
       this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
       this.mergeInfo.lesionPart = answers.lesionPart
       this.merge.loading = true
-      getCanMergeLesion({ rowId: answers.RowId }).then(res => {
+      try {
-        this.lesionData = res.Result
+        const res = await getCanMergeLesion({ rowId: answers.RowId })
+        if (res.IsSuccess) {
+          this.lesionData = res.Result
+        }
         this.merge.loading = false
-      }).catch(() => { this.merge.loading = false })
+      } catch (e) {
+        console.log(e)
+        this.merge.loading = false
+      }
     },
     handleSelectionChange(val) {
       this.mergeList = []
@@ -718,23 +731,28 @@ export default {
 
       })
     },
-    lesionMerge() {
+    async lesionMerge() {
       this.merge.loading = true
-      var params = {
+      try {
-        visitTaskId: this.visitTaskId,
+        var params = {
-        questionId: this.mergeInfo.questionId,
+          visitTaskId: this.visitTaskId,
-        mergeMainRowId: this.mergeInfo.mergeRowId,
+          questionId: this.mergeInfo.questionId,
-        mergeRowIdList: this.mergeList
+          mergeMainRowId: this.mergeInfo.mergeRowId,
-      }
+          mergeRowIdList: this.mergeList
-      mergeLesion(params).then(res => {
+        }
+        const res = await mergeLesion(params)
+        if (res.IsSuccess) {
+          this.merge.visible = false
+          DicomEvent.$emit('readingPageUpdate', {})
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setMeasuredToolsPassive')
+          this.getReadingQuestionAndAnswer()
+        }
         this.merge.loading = false
-        this.merge.visible = false
+      } catch (e) {
-        DicomEvent.$emit('readingPageUpdate', {})
+        this.merge.loading = false
-        DicomEvent.$emit('getReportInfo', true)
+        console.log(e)
-        DicomEvent.$emit('setMeasuredToolsPassive')
+      }
-        this.getReadingQuestionAndAnswer()
-        // 刷新病灶列表及标记
-      }).catch(() => { this.merge.loading = false })
     },
     isCanActiveTool(toolName) {
       this.isNonTargetMeasurement = false
@@ -1284,6 +1302,41 @@ export default {
       })
       DicomEvent.$emit('getReportInfo', true)
       loading.close()
+    },
+    async resetMeasuredData() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
+        if (res.IsSuccess) {
+          // 刷新标注、表单、报告页信息、融合页表单及标注
+          this.activeName = ''
+          this.activeItem.activeRowIndex = null
+          this.activeItem.activeCollapseId = null
+          await this.getReadingQuestionAndAnswer(this.visitTaskId)
+          const triald = this.$router.currentRoute.query.trialId
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+          DicomEvent.$emit('getMeasureData')
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('refreshStudyListMeasureData')
+          DicomEvent.$emit('resetPage', {})
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
     }
 
   }
@@ -1296,6 +1349,22 @@ export default {
 
   .container{
     padding: 10px;
+    .basic-info{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      h3{
+        color: #ddd;
+        padding: 5px 0px;
+        margin: 0;
+      }
+      i{
+        color: #fff;
+        font-size: 22px;
+        font-weight: bold;
+        cursor: pointer;
+      }
+    }
   }
   .title{
     padding: 5px;

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

@@ -51,19 +51,23 @@ export default {
     this.getList()
   },
   methods: {
-    getList() {
+    async getList() {
       this.loading = true
-      var param = {
+      try {
-        trialId: this.trialId
+        var param = {
-      }
+          trialId: this.trialId
-      getManualList(param).then(res => {
+        }
-        this.fileList = res.Result
+        const res = await getManualList(param)
-
+        if (res.IsSuccess) {
-        if (this.fileList.length > 0) {
+          this.fileList = res.Result
-          this.preview(this.fileList[0])
+          if (this.fileList.length > 0) {
+            this.preview(this.fileList[0])
+          }
         }
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     },
     preview(file) {
       this.$set(this.selected, 'filePath', file.Path)

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

@@ -79,7 +79,7 @@
 import { getTableAnswerRowInfoList } from '@/api/trials'
 import { on, off } from 'element-ui/src/utils/dom'
 import { rafThrottle, isFirefox } from 'element-ui/src/utils/util'
-import store from '@/store'
+// import store from '@/store'
 const mousewheelEventName = isFirefox() ? 'DOMMouseScroll' : 'mousewheel'
 var ctx = '' // 画布上下文
 export default {
@@ -223,16 +223,16 @@ export default {
     getCanvasData() {
       return new Promise(async resolve => {
         this.visitTaskId = this.$router.currentRoute.query.visitTaskId
-        this.canvasData = [] 
+        this.canvasData = []
-        let res = await getTableAnswerRowInfoList(this.visitTaskId)
+        const res = await getTableAnswerRowInfoList(this.visitTaskId)
         res.Result.forEach(el => {
-          if (!el.IsDicomReading){
+          if (!el.IsDicomReading) {
             if (el.MeasureData) {
               el.MeasureData = JSON.parse(el.MeasureData)
               el.MeasureData.data.remark = el.OrderMarkName
               this.canvasData.push(el.MeasureData)
             }
-          }  
+          }
         })
         sessionStorage.setItem('measureData', this.canvasData)
         // await store.dispatch('reading/getMeasuredData', this.visitTaskId)

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

@@ -31,7 +31,7 @@
           />
           <div ref="imagesWrapper" class="images">
             <div v-if="noData" class="empty-text">
-              <slot name="empty">暂无数据</slot>
+              <slot name="empty">{{ $t('trial:reading:noneDicoms:noData') }}</slot>
             </div>
             <div v-show="!noData" class="items" :style="itemsStyle">
               <div

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

@@ -36,27 +36,31 @@ export default {
     this.initForm()
   },
   methods: {
-    initForm() {
+    async initForm() {
       this.loading = true
-      getAutoCutNextTask().then(async res => {
+      try {
-        this.form.AutoCutNextTask = res.Result.AutoCutNextTask
+        const res = await getAutoCutNextTask()
-        this.loading = false
+        if (res.IsSuccess) {
-      }).catch(() => {
+          this.form.AutoCutNextTask = res.Result.AutoCutNextTask
-        this.loading = false
-      })
-    },
-    handleSave() {
-      this.$refs.otherForm.validate((valid) => {
-        if (valid) {
-          this.loading = true
-          setAutoCutNextTask(this.form).then((res) => {
-            this.loading = false
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-          }).catch(() => {
-            this.loading = false
-          })
         }
-      })
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    async handleSave() {
+      const valid = await this.$refs.otherForm.validate()
+      if (!valid) return
+      this.loading = true
+      try {
+        const res = await setAutoCutNextTask(this.form)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+      }
     }
   }
 }

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

@@ -704,17 +704,17 @@ export default {
       this.$refs['ecrf'].getQuestions(obj.visitTaskId)
     },
     async resetMeasuredData() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
       try {
-        const confirm = await this.$confirm(
-          this.$t('trials:dicomReading:message:confirmReset1'),
-          this.$t('trials:dicomReading:message:confirmReset2'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
         const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
         this.loading = false
         if (res.IsSuccess) {
@@ -723,13 +723,16 @@ export default {
           this.activeItem.activeRowIndex = null
           this.activeItem.activeCollapseId = null
           await this.getReadingQuestionAndAnswer(this.visitTaskId)
-          this.$refs['ecrf'].resetQSForm()
+          const triald = this.$router.currentRoute.query.trialId
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
           DicomEvent.$emit('getMeasureData')
           DicomEvent.$emit('getReportInfo', true)
           DicomEvent.$emit('refreshStudyListMeasureData')
         }
+        loading.close()
       } catch (e) {
-        this.loading = false
+        loading.close()
         console.log(e)
       }
     },

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

@@ -111,13 +111,17 @@
             />
           </template>
           <template v-else-if="question.QuestionGenre === 3 && question.QuestionType === 47 && !question.IsBaseLineTask">
-            <el-option
+            <el-option-group
-              v-for="item of $d[question.DictionaryCode]"
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
-              v-show="item.value === 1 ||item.value === 3|| item.value === 4 || item.value === 5"
+            >
-              :key="item.id"
+              <el-option
-              :value="String(item.value)"
+                v-for="item of $d[question.DictionaryCode]"
-              :label="item.label"
+                v-show="item.value === 1 ||item.value === 3|| item.value === 4 || item.value === 5"
-            />
+                :key="item.id"
+                :value="String(item.value)"
+                :label="item.label"
+              />
+            </el-option-group>
           </template>
           <template v-else-if="question.QuestionGenre === 3 && question.QuestionType === 49 && question.IsBaseLineTask">
             <el-option
@@ -129,13 +133,17 @@
             />
           </template>
           <template v-else-if="question.QuestionGenre === 3 && question.QuestionType === 49 && !question.IsBaseLineTask">
-            <el-option
+            <el-option-group
-              v-for="item of $d[question.DictionaryCode]"
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
-              v-show="item.value === 1 ||item.value === 2 || item.value === 3 || item.value === 4 || item.value === 5"
+            >
-              :key="item.id"
+              <el-option
-              :value="String(item.value)"
+                v-for="item of $d[question.DictionaryCode]"
-              :label="item.label"
+                v-show="item.value === 1 ||item.value === 2 || item.value === 3 || item.value === 4 || item.value === 5"
-            />
+                :key="item.id"
+                :value="String(item.value)"
+                :label="item.label"
+              />
+            </el-option-group>
           </template>
           <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
             <el-option

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

@@ -390,18 +390,6 @@ export default {
         this.loading = false
       })
     },
-    async resetQSForm() {
-      try {
-        this.loading = true
-        var trialId = this.$route.query.trialId
-        await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: trialId, visitTaskId: this.visitTaskId })
-        this.getQuestions(this.visitTaskId, true)
-        this.loading = false
-      } catch(e) {
-        this.loading = false
-      }
-      
-    },
     checkAnnotationStatus(obj) {
       for (let i = 0; i < obj.length; i++) {
         if (obj[i].SaveEnum === 1) {

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

@@ -956,17 +956,17 @@ export default {
       this.$refs['ecrf'].getQuestions(obj.visitTaskId)
     },
     async resetMeasuredData() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
       try {
-        const confirm = await this.$confirm(
-          this.$t('trials:dicomReading:message:confirmReset1'),
-          this.$t('trials:dicomReading:message:confirmReset2'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
         const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
         this.loading = false
         if (res.IsSuccess) {
@@ -975,13 +975,16 @@ export default {
           this.activeItem.activeRowIndex = null
           this.activeItem.activeCollapseId = null
           await this.getReadingQuestionAndAnswer(this.visitTaskId)
-          this.$refs['ecrf'].resetQSForm()
+          const triald = this.$router.currentRoute.query.trialId
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
           DicomEvent.$emit('getMeasureData')
           DicomEvent.$emit('getReportInfo', true)
           DicomEvent.$emit('refreshStudyListMeasureData')
         }
+        loading.close()
       } catch (e) {
-        this.loading = false
+        loading.close()
         console.log(e)
       }
     },

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

@@ -509,25 +509,31 @@ export default {
         }
       }
     },
-    split(rowId, questionId) {
+    async split(rowId, questionId) {
       const loading = this.$loading({ fullscreen: true })
-      var params = {
+      try {
-        visitTaskId: this.visitTaskId,
+        var params = {
-        questionId: questionId,
+          visitTaskId: this.visitTaskId,
-        rowId: rowId
+          questionId: questionId,
-      }
+          rowId: rowId
-      splitLesion(params).then(async res => {
+        }
-        loading.close()
+        const res = await splitLesion(params)
-        await this.getReadingQuestionAndAnswer()
+        if (res.IsSuccess) {
-        this.$nextTick(() => {
+          await this.getReadingQuestionAndAnswer()
-          this.tableQuestions.forEach(item => {
+          this.$nextTick(() => {
-            item.TableQuestions.Answers.forEach(i => {
+            this.tableQuestions.forEach(item => {
-              var refName = `${item.Id}_${i.RowIndex}`
+              item.TableQuestions.Answers.forEach(i => {
-              this.$refs[refName] && this.$refs[refName][0].initForm()
+                var refName = `${item.Id}_${i.RowIndex}`
+                this.$refs[refName] && this.$refs[refName][0].initForm()
+              })
             })
           })
-        })
+        }
-      })
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
     },
     isCanActiveTool(toolName) {
       this.getUnSaveTarget()
@@ -892,17 +898,17 @@ export default {
       this.$refs['ecrf'].getQuestions(obj.visitTaskId)
     },
     async resetMeasuredData() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
       try {
-        const confirm = await this.$confirm(
-          this.$t('trials:dicomReading:message:confirmReset1'),
-          this.$t('trials:dicomReading:message:confirmReset2'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
         const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
         this.loading = false
         if (res.IsSuccess) {
@@ -911,13 +917,16 @@ export default {
           this.activeItem.activeRowIndex = null
           this.activeItem.activeCollapseId = null
           await this.getReadingQuestionAndAnswer(this.visitTaskId)
-          this.$refs['ecrf'].resetQSForm()
+          const triald = this.$router.currentRoute.query.trialId
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
           DicomEvent.$emit('getMeasureData')
           DicomEvent.$emit('getReportInfo', true)
           DicomEvent.$emit('refreshStudyListMeasureData')
         }
+        loading.close()
       } catch (e) {
-        this.loading = false
+        loading.close()
         console.log(e)
       }
     },

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

@@ -411,32 +411,38 @@ export default {
     getTableHeight() {
       this.height = window.innerHeight - 170
     },
-    getReportInfo(IsCalculate) {
+    async getReportInfo(IsCalculate) {
       this.loading = true
-      var params = {
+      try {
-        visitTaskId: this.visitTaskId,
+        var params = {
-        trialId: this.$router.currentRoute.query.trialId,
+          visitTaskId: this.visitTaskId,
-        IsCalculate: IsCalculate !== false
+          trialId: this.$router.currentRoute.query.trialId,
-      }
+          IsCalculate: IsCalculate !== false
-      getReadingReportEvaluation(params).then(res => {
+        }
-        this.readingTaskState = res.Result.ReadingTaskState
+        const res = await getReadingReportEvaluation(params)
-        this.tumorEvaluate = res.Result.CalculateResult.TumorEvaluate ? parseInt(res.Result.CalculateResult.TumorEvaluate) : null
+        if (res.IsSuccess) {
-        this.isExistDisease = res.Result.CalculateResult.IsExistDisease ? parseInt(res.Result.CalculateResult.IsExistDisease) : null
+          this.readingTaskState = res.Result.ReadingTaskState
-        this.answerArr = []
+          this.tumorEvaluate = res.Result.CalculateResult.TumorEvaluate ? parseInt(res.Result.CalculateResult.TumorEvaluate) : null
-        this.questions = res.Result.TaskQuestions.concat()
+          this.isExistDisease = res.Result.CalculateResult.IsExistDisease ? parseInt(res.Result.CalculateResult.IsExistDisease) : null
-        this.visitTaskList = res.Result.VisitTaskList
+          this.answerArr = []
-        var taskQuestions = this.getQuestions(res.Result.TaskQuestions, !this.isShowDetail, null, null)
+          this.questions = res.Result.TaskQuestions.concat()
-        this.taskQuestions = []
+          this.visitTaskList = res.Result.VisitTaskList
-        taskQuestions.forEach(item => {
+          var taskQuestions = this.getQuestions(res.Result.TaskQuestions, !this.isShowDetail, null, null)
-          this.$set(this.taskQuestions, this.taskQuestions.length, item)
+          this.taskQuestions = []
-        })
+          taskQuestions.forEach(item => {
-        const tLesion = res.Result.LesionCountList.find(i => i.LesionType === 0)
+            this.$set(this.taskQuestions, this.taskQuestions.length, item)
-        this.tLesionCount = tLesion ? tLesion.Count : 0
+          })
-        const ntLesion = res.Result.LesionCountList.find(i => i.LesionType === 1)
+          const tLesion = res.Result.LesionCountList.find(i => i.LesionType === 0)
-        this.ntLesionCount = ntLesion ? ntLesion.Count : 0
+          this.tLesionCount = tLesion ? tLesion.Count : 0
-        this.setScrollTop()
+          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(() => {
@@ -444,7 +450,6 @@ export default {
           if (this.$refs.reportList) {
             this.getTableHeight()
             this.$refs.reportList.bodyWrapper.scrollTop = this.$refs.reportList.bodyWrapper.scrollHeight
-            this.$refs.reportList.bodyWrapper.scrollTop = this.$refs.reportList.bodyWrapper.scrollHeight
           }
         })
       }, 50)
@@ -608,24 +613,31 @@ export default {
       }
     },
     async handleConfirm() {
-      await this.handleSave(false)
+      this.loading = true
-      await this.verifyVisitTaskQuestions()
+      try {
-      var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+        await this.handleSave(false)
-      var isBaseline = this.visitTaskList[i].IsBaseLine
+        await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
-      if (isBaseline) {
+        var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
-        this.assessmentQuestions = await this.getAdditionalAssessments()
+        var isBaseline = this.visitTaskList[i].IsBaseLine
-        if (this.assessmentQuestions.length > 0) {
+        if (isBaseline) {
+          const res = await getTaskAdditionalQuestion({ visitTaskId: this.visitTaskId })
+          this.assessmentQuestions = res.Result
+          if (this.assessmentQuestions.length > 0) {
           // 打开附加评估框
-          this.additionalAssessmentsDig.visible = true
+            this.additionalAssessmentsDig.visible = true
+          } else {
+            const { ImageAssessmentReportConfirmation } = const_.processSignature
+            this.signCode = ImageAssessmentReportConfirmation
+            this.signVisible = true
+          }
         } else {
           const { ImageAssessmentReportConfirmation } = const_.processSignature
           this.signCode = ImageAssessmentReportConfirmation
           this.signVisible = true
         }
-      } else {
+        this.loading = false
-        const { ImageAssessmentReportConfirmation } = const_.processSignature
+      } catch (e) {
-        this.signCode = ImageAssessmentReportConfirmation
+        this.loading = false
-        this.signVisible = true
       }
     },
     sign() {
@@ -636,31 +648,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 +662,16 @@ export default {
       }
     },
     // 签名并确认
-    signConfirm(signInfo) {
+    async signConfirm(signInfo) {
       this.loading = true
-      var params = {
+      try {
-        data: {
+        var params = {
-          visitTaskId: this.visitTaskId
+          data: {
-        },
+            visitTaskId: this.visitTaskId
-        signInfo: signInfo
+          },
-      }
+          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 +687,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 +712,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 +737,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 +787,21 @@ export default {
           return
         }
         this.loading = true
-        var params = {
+        try {
-          visitTaskId: this.visitTaskId,
+          var params = {
-          answers: this.answers
+            visitTaskId: this.visitTaskId,
-        }
+            answers: this.answers
-        changeDicomReadingQuestionAnswer(params).then(res => {
+          }
-          if (isPrompt) {
+          const res = await changeDicomReadingQuestionAnswer(params)
+          if (res.IsSuccess && isPrompt) {
             this.$message.success(this.$t('common:message:savedSuccessfully'))
           }
           this.loading = false
           resolve()
-        }).catch(() => {
+        } catch (e) {
           this.loading = false
           reject()
-        })
+        }
       })
     },
     getWarningText() {

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

@@ -83,13 +83,16 @@ export default {
     this.getWL()
   },
   methods: {
-    getWL() {
+    async getWL() {
       this.loading = true
-      getUserWLTemplateList().then(res => {
+      try {
+        const res = await getUserWLTemplateList()
         this.tableData = res.Result
         this.loading = false
         this.$emit('getWwcTpl')
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     },
     handleAdd() {
       this.customWwc.title = this.$t('common:button:new')
@@ -101,22 +104,27 @@ export default {
       this.row = Object.assign({}, row)
       this.customWwc.visible = true
     },
-    handleDelete(row) {
+    async handleDelete(row) {
       // '是否确认删除？'
       var msg = this.$t('trials:reading:wlTemplate:delete')
-
+      const confirm = await this.$confirm(
-      this.$confirm(msg, {
+        msg,
-        type: 'warning',
+        {
-        distinguishCancelAndClose: true
+          type: 'warning',
-      }).then(() => {
+          distinguishCancelAndClose: true
-        this.loading = true
+        }
-        deleteUserWLTemplate(row.Id).then(res => {
+      )
-          this.loading = false
+      if (confirm !== 'confirm') return
-          // 删除成功
+      this.loading = true
-          this.$message.success(this.$t('common:message:deletedSuccessfully'))
+      try {
-          this.getWL()
+        await deleteUserWLTemplate(row.Id)
-        }).catch(() => { this.loading = false })
+        this.loading = false
-      })
+        // 删除成功
+        this.$message.success(this.$t('common:message:deletedSuccessfully'))
+        this.getWL()
+      } catch (e) {
+        this.loading = false
+      }
     }
   }
 }

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

@@ -83,24 +83,23 @@ export default {
     }
   },
   methods: {
-    handleSave() {
+    async handleSave() {
-      this.$refs.wlForm.validate((valid) => {
+      const valid = await this.$refs.wlForm.validate()
-        if (valid) {
+      if (!valid) return
-          this.loading = true
+      this.loading = true
-          addOrUpdateUserWLTemplate(this.form).then((res) => {
+      try {
-            this.loading = false
+        await addOrUpdateUserWLTemplate(this.form)
-            this.$emit('getWL')
+        this.loading = false
-            this.$emit('close')
+        this.$emit('getWL')
-            if (this.form.Id) {
+        this.$emit('close')
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
+        if (this.form.Id) {
-            } else {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
-              this.$message.success(this.$t('common:message:addedSuccessfully'))
+        } else {
-            }
+          this.$message.success(this.$t('common:message:addedSuccessfully'))
-          }).catch(() => {
-            this.loading = false
-          })
         }
-      })
+      } catch (e) {
+        this.loading = false
+      }
     },
     handleCancel() {
       this.$emit('close')

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue

@@ -670,7 +670,7 @@ export default {
       this.sliderInfo.isMove = false
     },
     getMeasureData() {
-      console.log('getMeasureData')
+      console.log('getMeasureData') 
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
       this.measureData = this.visitTaskList[idx].MeasureData
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue

@@ -993,6 +993,7 @@ export default {
       }
       console.log('getMeasureData')
     })
+    
     DicomEvent.$on('getScreenshots', (callback) => {
       var base64Str =
         this.$refs[
@@ -1051,11 +1052,11 @@ export default {
       this.uploadStatus = status
       this.uploadImageVisible = true
     },
-    getWwcTpl() {
+    async getWwcTpl() {
-      const loading = this.$loading({ fullscreen: true })
+      // const loading = this.$loading({ fullscreen: true })
-      getUserWLTemplateList()
+      try {
-        .then((res) => {
+        let res = await getUserWLTemplateList()
-          this.customWwcTpl = []
+        this.customWwcTpl = []
           res.Result.map((i) => {
             this.customWwcTpl.push({
               label: i.TemplateName,
@@ -1064,35 +1065,32 @@ export default {
             })
           })
           this.wwwcArr = [...this.defaultWwwc, ...this.customWwcTpl]
-          loading.close()
+      } catch(e) {
-        })
+        console.log(e)
-        .catch(() => {
+      }
-          loading.close()
+      
-        })
     },
-    getHotKeys() {
+    async getHotKeys() {
-      const loading = this.$loading({ fullscreen: true })
+      // const loading = this.$loading({ fullscreen: true })
-      getDoctorShortcutKey({ imageToolType: 0 })
+      try {
-        .then((res) => {
+        let res = await getDoctorShortcutKey({ imageToolType: 0 })
-          res.Result.map((item) => {
+        res.Result.map((item) => {
-            this.hotKeyList.push({
+          this.hotKeyList.push({
-              id: item.Id,
+            id: item.Id,
-              altKey: item.AltKey,
+            altKey: item.AltKey,
-              ctrlKey: item.CtrlKey,
+            ctrlKey: item.CtrlKey,
-              shiftKey: item.ShiftKey,
+            shiftKey: item.ShiftKey,
-              metaKey: item.MetaKey,
+            metaKey: item.MetaKey,
-              key: item.Keyboardkey,
+            key: item.Keyboardkey,
-              code: item.Code,
+            code: item.Code,
-              text: item.Text,
+            text: item.Text,
-              shortcutKeyEnum: item.ShortcutKeyEnum
+            shortcutKeyEnum: item.ShortcutKeyEnum
-            })
           })
-          this.bindHotKey()
-          loading.close()
-        })
-        .catch(() => {
-          loading.close()
         })
+        this.bindHotKey()
+      } catch(e) {
+        console.log(e)
+      }
     },
     resetHotkeyList(arr) {
       this.hotKeyList = []

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue

@@ -2,10 +2,20 @@
   <div class="measurement-wrapper" :style="{'height':height+10+'px'}" style="position: relative">
 
     <div class="container" :style="{'height':height+'px'}" style="padding-bottom: 50px;overflow-y: auto;">
-      <h3 style="color: #ddd;padding: 5px 0px;margin: 0;" v-if="isReadingShowSubjectInfo">
+      <div class="basic-info">
-        <span v-if="subjectCode">{{ subjectCode }} </span>
+        <h3 v-if="isReadingShowSubjectInfo">
-        <span style="margin-left:5px;">{{ taskBlindName }}</span>
+          <span v-if="subjectCode">{{ subjectCode }} </span>
-      </h3>
+          <span style="margin-left:5px;">{{ taskBlindName }}</span>
+        </h3>
+        <div v-if="readingTaskState < 2">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+            <i
+              class="el-icon-refresh-left"
+              @click="resetMeasuredData"
+            />
+          </el-tooltip>
+        </div>
+      </div>
       <QuestionsPreview
         ref="QuestionsPreview"
         v-if="ecrfShow"
@@ -77,7 +87,7 @@
 </template>
 <script>
 import { submitDicomVisitTask } from '@/api/trials'
-import { getCustomTag, submitCustomTag, deleteCustomTag } from '@/api/reading'
+import { getCustomTag, submitCustomTag, resetReadingTask } from '@/api/reading'
 import DicomEvent from './../components/DicomEvent'
 import SignForm from '@/views/trials/components/newSignForm'
 import QuestionsPreview from './CustomizeQuestionsPreview'
@@ -169,7 +179,6 @@ export default {
   methods: {
    async initList(){
       if (this.visitTaskId !== this.lastCanvasTaskId) {
-        this.activeName = ''
         this.ecrfShow = true
         var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
         console.log(i)
@@ -320,7 +329,7 @@ export default {
               distinguishCancelAndClose: true
             })
               .then(() => {
-                try {DicomEvent.$emit('getNextTask')} catch (e) {console.log(e)}
+                window.location.reload()
               })
               .catch(action => {
               })
@@ -354,10 +363,37 @@ export default {
       if (this.visitTaskId !== obj.visitTaskId) {
         this.visitTaskId = obj.visitTaskId
         this.taskBlindName = obj.taskBlindName
-        this.activeName = ''
         this.ecrfShow = true
       }
-    }
+    },
+    async resetMeasuredData() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
+        this.loading = false
+        if (res.IsSuccess) {
+          // 刷新标注、表单、报告页信息
+          this.$refs['QuestionsPreview'].getCustomTableQuestionAnswer(this.visitTaskId )
+          await store.dispatch('reading/refreshCustomizeMeasuredData', this.visitTaskId)
+          DicomEvent.$emit('getMeasureData')
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('refreshStudyListMeasureData')
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
   }
 }
 </script>
@@ -368,6 +404,22 @@ export default {
 
   .container{
     padding: 10px;
+    .basic-info{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      h3{
+        color: #ddd;
+        padding: 5px 0px;
+        margin: 0;
+      }
+      i{
+        color: #fff;
+        font-size: 22px;
+        font-weight: bold;
+        cursor: pointer;
+      }
+    }
   }
   .title{
     padding: 5px;

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue

@@ -257,7 +257,10 @@ export default {
     this.subjectCode = localStorage.getItem('subjectCode')
     var digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
-
+    DicomEvent.$on('refreshStudyListMeasureData', () => {
+      var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+      this.measureData = this.visitTaskList[idx].MeasureData
+    })
     // DicomEvent.$on('setReadingState', readingTaskState => {
     //   var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
     //   if (idx > -1) {
@@ -271,6 +274,7 @@ export default {
     window.addEventListener('beforeunload', e => {
       cornerstone.imageCache.purgeCache()
     })
+
   },
   beforeDestroy() {
     cornerstone.imageCache.purgeCache()

src/views/trials/trials-panel/reading/dicoms/customize/Hotkeys.vue

@@ -57,10 +57,11 @@ export default {
     this.getHotkeys()
   },
   methods: {
-    getHotkeys(isReset = false) {
+    async getHotkeys(isReset = false) {
       this.loading = true
       this.hotKeyList = []
-      getDoctorShortcutKey({ imageToolType: this.readingTool }).then(res => {
+      try{
+        let res = await getDoctorShortcutKey({ imageToolType: this.readingTool })
         res.Result.map(item => {
           this.hotKeyList.push({ id: item.Id, keys: { controlKey: { altKey: item.AltKey, ctrlKey: item.CtrlKey, shiftKey: item.ShiftKey, metaKey: item.MetaKey, key: item.Keyboardkey, code: item.Code }, text: item.Text }, label: item.ShortcutKeyEnum })
         })
@@ -68,11 +69,12 @@ export default {
           this.$emit('reset', this.hotKeyList)
         }
         this.loading = false
-      }).catch(() => {
+      }catch(e){
         this.loading = false
-      })
+      }
+      
     },
-    handleSave() {
+    async handleSave() {
       this.loading = true
       var params = {
         imageToolType: this.readingTool,
@@ -93,28 +95,34 @@ export default {
         )
       })
       params.shortcutKeyList = shortcutKeyList
-      setShortcutKey(params).then(res => {
+      try {
+        await setShortcutKey(params)
         this.$emit('reset', this.hotKeyList)
         this.$emit('close')
         this.loading = false
-      }).catch(() => {
+      }catch(e){
         this.loading = false
-      })
+      }
     },
-    handleReset() {
+    async handleReset() {
       // '是否确认重置？'
-      this.$confirm(this.$t('trials:hotkeys:message:confirmReset'), {
+      const confirm = await this.$confirm(
-        type: 'warning',
+        this.$t('trials:hotkeys:message:confirmReset'),
-        distinguishCancelAndClose: true
+        {
-      })
+          type: 'warning',
-        .then(() => {
+          distinguishCancelAndClose: true
-          this.loading = true
+        }
-          restoreDefaultShortcutKey({ imageToolType: this.readingTool }).then(res => {
+      )
-            this.$message.success(this.$t('trials:hotkeys:message:resetSuccessfully')) // '重置成功！'
+      if (confirm !== 'confirm') return
-            this.getHotkeys(true)
+      this.loading = true
-          }).catch(() => { this.loading = false })
+      try{
-        })
+        await restoreDefaultShortcutKey({ imageToolType: this.readingTool })
-        .catch(action => {})
+        this.$message.success(this.$t('trials:hotkeys:message:resetSuccessfully')) // '重置成功！'
+        this.getHotkeys(true)
+        this.loading = false
+      }catch(e){
+        this.loading = false
+      }
     },
     handleHotkeyVerify(hotkey) {
       for (const item of this.hotKeyList) {

src/views/trials/trials-panel/reading/dicoms/customize/Manuals.vue

@@ -51,19 +51,22 @@ export default {
     this.getList()
   },
   methods: {
-    getList() {
+    async getList() {
       this.loading = true
       var param = {
         trialId: this.trialId
       }
-      getManualList(param).then(res => {
+      try{
+        let res = await getManualList(param)
         this.fileList = res.Result
 
         if (this.fileList.length > 0) {
           this.preview(this.fileList[0])
         }
         this.loading = false
-      }).catch(() => { this.loading = false })
+      }catch(e){
+        this.loading = false
+      }
     },
     preview(file) {
       this.$set(this.selected, 'filePath', file.Path)

src/views/trials/trials-panel/reading/dicoms/customize/Others.vue

@@ -3,7 +3,7 @@
     <div class="base-dialog-body" style="height:380px;overflow-y: auto;">
       <el-form ref="otherForm" :model="form">
         <el-form-item
-          label="是否自动切换到下一任务"
+          :label="$t('trials:reading:label:autoSwitch')"
           prop="AutoCutNextTask"
           :rules="[
             { required: true, message: $t('common:ruleMessage:select')}
@@ -35,27 +35,27 @@ export default {
     this.initForm()
   },
   methods: {
-    initForm() {
+    async initForm() {
       this.loading = true
-      getAutoCutNextTask().then(async res => {
+      try{
+        await getAutoCutNextTask()
         this.form.AutoCutNextTask = res.Result.AutoCutNextTask
         this.loading = false
-      }).catch(() => {
+      }catch(e){
         this.loading = false
-      })
+      }
     },
-    handleSave() {
+    async handleSave() {
-      this.$refs.otherForm.validate((valid) => {
+      let valid = await this.$refs.otherForm.validate()
-        if (valid) {
+      if (!valid) return
-          this.loading = true
+      this.loading = true
-          setAutoCutNextTask(this.form).then((res) => {
+      try{
-            this.loading = false
+        await setAutoCutNextTask(this.form)
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
+        this.loading = false
-          }).catch(() => {
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.loading = false
+      }catch(e){
-          })
+        this.loading = false
-        }
+      }
-      })
     }
   }
 }

src/views/trials/trials-panel/reading/dicoms/customize/WL.vue

@@ -7,16 +7,19 @@
           style="width: 100%"
           class="wl-table"
         >
+          <!-- 名称 -->
           <el-table-column
-            label="名称"
+            :label="$t('trials:reading:label:wlTplName')"
             prop="TemplateName"
           />
+          <!-- 窗宽 -->
           <el-table-column
-            label="窗宽"
+            :label="$t('trials:reading:label:wlTplWW')"
             prop="WW"
           />
+          <!-- 窗位 -->
           <el-table-column
-            label="窗位"
+            :label="$t('trials:reading:label:wlTplWL')"
             prop="WL"
           />
           <el-table-column
@@ -24,22 +27,25 @@
             width="200"
           >
             <template slot="header">
+              <!-- 新增 -->
               <el-button
                 size="mini"
                 @click="handleAdd"
-              >Add</el-button>
+              >{{ $t('common:button:new') }}</el-button>
             </template>
             <template slot-scope="scope">
+              <!-- 编辑 -->
               <el-button
                 type="text"
                 size="mini"
                 @click="handleEdit(scope.row)"
-              >Edit</el-button>
+              >{{ $t('common:button:edit') }}</el-button>
+              <!-- 删除 -->
               <el-button
                 type="text"
                 size="mini"
                 @click="handleDelete(scope.row)"
-              >Delete</el-button>
+              >{{ $t('common:button:delete') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -77,16 +83,19 @@ export default {
     this.getWL()
   },
   methods: {
-    getWL() {
+    async getWL() {
       this.loading = true
-      getUserWLTemplateList().then(res => {
+      try {
+        const res = await getUserWLTemplateList()
         this.tableData = res.Result
         this.loading = false
         this.$emit('getWwcTpl')
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     },
     handleAdd() {
-      this.customWwc.title = this.$t('common:button:add')
+      this.customWwc.title = this.$t('common:button:new')
       this.row = {}
       this.customWwc.visible = true
     },
@@ -95,20 +104,27 @@ export default {
       this.row = Object.assign({}, row)
       this.customWwc.visible = true
     },
-    handleDelete(row) {
+    async handleDelete(row) {
-      var msg = this.$t('trials:staffResearch:message:confirmDel')
+      // '是否确认删除？'
-      this.$confirm(msg, {
+      var msg = this.$t('trials:reading:wlTemplate:delete')
-        type: 'warning',
+      const confirm = await this.$confirm(
-        distinguishCancelAndClose: true
+        msg,
-      }).then(() => {
+        {
-        this.loading = true
+          type: 'warning',
-        deleteUserWLTemplate(row.Id).then(res => {
+          distinguishCancelAndClose: true
-          this.loading = false
+        }
-          // 删除成功
+      )
-          this.$message.success(this.$t('common:message:deletedSuccessfully'))
+      if (confirm !== 'confirm') return
-          this.getWL()
+      this.loading = true
-        }).catch(() => { this.loading = false })
+      try {
-      })
+        await deleteUserWLTemplate(row.Id)
+        this.loading = false
+        // 删除成功
+        this.$message.success(this.$t('common:message:deletedSuccessfully'))
+        this.getWL()
+      } catch (e) {
+        this.loading = false
+      }
     }
   }
 }

src/views/trials/trials-panel/reading/dicoms/customize/WLForm.vue

@@ -8,14 +8,16 @@
     size="small"
   >
     <!-- 名称 -->
-    <el-form-item label="名称" prop="TemplateName">
+    <el-form-item :label="$t('trials:reading:label:wlTplName')" prop="TemplateName">
       <el-input v-model="form.TemplateName" />
     </el-form-item>
-    <el-form-item :label="$t('CustomWwwcForm:form:label:ww')" prop="WW">
+    <!-- 窗宽 -->
-      <el-input-number v-model="form.WW" controls-position="right" :min="1" :precision="0" :step="1" />
+    <el-form-item :label="$t('trials:reading:label:wlTplWW')" prop="WW">
+      <el-input-number v-model="form.WW" controls-position="right" :min="1" :max="100000" :precision="0" :step="1" />
     </el-form-item>
-    <el-form-item :label="$t('CustomWwwcForm:form:label:wl')" prop="WL">
+    <!-- 窗位 -->
-      <el-input-number v-model="form.WL" controls-position="right" :precision="0" :step="1" />
+    <el-form-item :label="$t('trials:reading:label:wlTplWL')" prop="WL">
+      <el-input-number v-model="form.WL" controls-position="right" :min="-100000" :max="100000" :precision="0" :step="1" />
     </el-form-item>
     <el-form-item style="text-align:right;">
       <!-- Cancel -->
@@ -81,24 +83,23 @@ export default {
     }
   },
   methods: {
-    handleSave() {
+    async handleSave() {
-      this.$refs.wlForm.validate((valid) => {
+      const valid = await this.$refs.wlForm.validate()
-        if (valid) {
+      if (!valid) return
-          this.loading = true
+      this.loading = true
-          addOrUpdateUserWLTemplate(this.form).then((res) => {
+      try {
-            this.loading = false
+        await addOrUpdateUserWLTemplate(this.form)
-            this.$emit('getWL')
+        this.loading = false
-            this.$emit('close')
+        this.$emit('getWL')
-            if (this.form.Id) {
+        this.$emit('close')
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
+        if (this.form.Id) {
-            } else {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
-              this.$message.success(this.$t('common:message:addedSuccessfully'))
+        } else {
-            }
+          this.$message.success(this.$t('common:message:addedSuccessfully'))
-          }).catch(() => {
-            this.loading = false
-          })
         }
-      })
+      } catch (e) {
+        this.loading = false
+      }
     },
     handleCancel() {
       this.$emit('close')

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

@@ -475,14 +475,17 @@ export default {
         })
       })
     },
-    handleConfirmCD() {
+    async handleConfirmCD() {
       this.loading = true
       var visitTaskId = this.visitTaskId
-      readClinicalData({ visitTaskId }).then(res => {
+      try {
+        await readClinicalData({ visitTaskId })
         this.loading = false
         this.dialogVisible = false
         this.isReadClinicalData = true
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     },
     previewCD() {
       this.closeCDVisible = true

src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue

@@ -372,9 +372,10 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
-        this.$refs['globalRuleForm'].validate(valid => {
+        let valid = await this.$refs['globalRuleForm'].validate()
-          if (valid) {
+
+        if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
@@ -403,7 +404,8 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            batchSubmitGlobalReadingInfo(params).then(res => {
+            try {
+              await batchSubmitGlobalReadingInfo(params)
               this.loading = false
               if (isPrompt) {
                 console.log(isPrompt)
@@ -411,14 +413,13 @@ export default {
               }
               this.$emit('getGlInfo')
               resolve()
-            }).catch(() => {
+            } catch (e) {
               this.loading = false
               reject()
-            })
+            }
           } else {
             reject()
           }
-        })
       })
     },
     getBeforeAnswer(qsId, row) {

src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue

@@ -376,9 +376,9 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
-        this.$refs['globalRuleForm'].validate(valid => {
+        let valid  = await this.$refs['globalRuleForm'].validate()
-          if (valid) {
+        if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
@@ -407,7 +407,8 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            batchSubmitGlobalReadingInfo(params).then(res => {
+            try {
+              await batchSubmitGlobalReadingInfo(params)
               this.loading = false
               if (isPrompt) {
                 console.log(isPrompt)
@@ -415,14 +416,14 @@ export default {
               }
               this.$emit('getGlInfo')
               resolve()
-            }).catch(() => {
+            } catch (e) {
               this.loading = false
               reject()
-            })
+            }
           } else {
             reject()
           }
-        })
+        
       })
     },
     getBeforeAnswer(qsId, row) {

src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue

@@ -219,9 +219,9 @@ export default {
       this.$emit('handleView', row)
     },
     handleSave(isPrompt = true) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
-        this.$refs['globalRuleForm'].validate(valid => {
+        let valid = await this.$refs['globalRuleForm'].validate()
-          if (valid) {
+        if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
@@ -247,21 +247,21 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            batchSubmitGlobalReadingInfo(params).then(res => {
+            try {
+              await batchSubmitGlobalReadingInfo(params)
               this.loading = false
               if (isPrompt) {
                 this.$message.success(this.$t('common:message:savedSuccessfully'))
               }
               this.$emit('getGlInfo')
               resolve()
-            }).catch(() => {
+            } catch (e) {
               this.loading = false
               reject()
-            })
+            }
           } else {
             reject()
           }
-        })
       })
     }
   }

src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue

@@ -369,9 +369,9 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async(resolve, reject) => {
-        this.$refs['globalRuleForm'].validate(valid => {
+        let valid = await this.$refs['globalRuleForm'].validate()
-          if (valid) {
+        if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
@@ -400,7 +400,8 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            batchSubmitGlobalReadingInfo(params).then(res => {
+            try {
+              await batchSubmitGlobalReadingInfo(params)
               this.loading = false
               if (isPrompt) {
                 console.log(isPrompt)
@@ -408,14 +409,13 @@ export default {
               }
               this.$emit('getGlInfo')
               resolve()
-            }).catch(() => {
+            } catch (e) {
               this.loading = false
               reject()
-            })
+            }
           } else {
             reject()
           }
-        })
       })
     },
     getBeforeAnswer(qsId, row) {

src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue

@@ -363,9 +363,9 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
-        this.$refs['globalRuleForm'].validate(valid => {
+        let valid = await this.$refs['globalRuleForm'].validate()
-          if (valid) {
+        if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
@@ -394,7 +394,8 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            batchSubmitGlobalReadingInfo(params).then(res => {
+            try {
+              await batchSubmitGlobalReadingInfo(params)
               this.loading = false
               if (isPrompt) {
                 console.log(isPrompt)
@@ -402,14 +403,14 @@ export default {
               }
               this.$emit('getGlInfo')
               resolve()
-            }).catch(() => {
+            } catch (e) {
               this.loading = false
               reject()
-            })
+            }
           } else {
             reject()
           }
-        })
+        
       })
     },
     getBeforeAnswer(qsId, row) {

src/views/trials/trials-panel/reading/global-review/index.vue

@@ -256,10 +256,10 @@ export default {
     }
   },
   methods: {
-    getGlInfo() {
+    async getGlInfo() {
       this.loading = true
-      getGlobalReadingInfo({ visitTaskId: this.visitTaskId }).then(res => {
+      try {
-        console.log('getGlobalReadingInfo')
+        let res = await getGlobalReadingInfo({ visitTaskId: this.visitTaskId })
         var evaluationQsList = []
         var adjustedQsList = []
         var agreeOrNotList = []
@@ -322,66 +322,20 @@ export default {
           trialId: this.trialId, subjectId: this.subjectId, subjectCode: this.subjectCode, visitTaskId: res.Result.GlobalTaskId, globalForm, globalUpdateType, evaluationQsList, adjustedQsList, agreeOrNotList, readingTaskState: this.readingTaskState, assessTypeList: res.Result.AssessTypeList
         }
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     },
-    getHistoryGlobalInfo() {
+    async getHistoryGlobalInfo() {
       this.historyLoading = true
-      getReadingPastResultList({ visitTaskId: this.visitTaskId }).then(res => {
+      try {
+        let res = await getReadingPastResultList({ visitTaskId: this.visitTaskId })
         this.historyTaskList = res.Result
         this.historyLoading = false
-      }).catch(() => { this.historyLoading = false })
+      } catch (e) {
-    },
+        this.historyLoading = false 
-    changeAgreeOrNotList(callback, row, visitTaskId) {
-      var message = ''
-      if (parseInt(callback) === 1) {
-        message = '是否确认更改？'
-        row.Answer = '0'
-      } else {
-        message = '是否确认更改？'
-        row.Answer = '1'
       }
-      this.$confirm(message, {
-        distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        this.loading = true
-        var params = {
-          globalTaskId: this.visitTaskId,
-          subjectId: this.subjectId,
-          trialId: this.trialId,
-          questionList: [
-            {
-              questionId: row.QuestionId ? row.QuestionId : '',
-              visitTaskId: visitTaskId,
-              globalAnswerType: row.GlobalAnswerType,
-              answer: row.Answer === '1' ? '0' : '1'
-            }
-          ]
-        }
-        saveGlobalReadingInfo(params).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.getGlInfo()
-          }
-        }).catch(() => { this.loading = false })
-      }).catch(() => {})
     },
-    // handleEdit(row) {
-    //   this.rowData = { ...row }
-    //   if (this.CriterionType === 1) {
-    //     this.rowData.AfterQuestionList.forEach(item => {
-    //       if (item.GlobalAnswerType === 1) {
-    //         // 全局阅片备注
-    //         item.QuestionName = this.$t('trials:globalReview:table:globalRemark')
-    //       } else if (item.GlobalAnswerType === 3) {
-    //         // 评估更新类型
-    //         item.QuestionName = this.$t('trials:globalReview:table:updateType')
-    //       }
-    //     })
-    //   }
-    //   // this.editVisible = true
-    // },
     handleSave() {
       this.$refs['globalTbl'].handleSave(true)
     },
@@ -435,53 +389,51 @@ export default {
       }
     },
     // 签名并确认
-    signConfirm(signInfo) {
+    async signConfirm(signInfo) {
       this.loading = true
-
       var params = {
         data: {
           globalTaskId: this.visitTaskId
         },
         signInfo: signInfo
       }
-      submitGlobalReadingInfo(params).then(async res => {
+      try{
+        let res = await submitGlobalReadingInfo(params)
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.$refs['signForm'].btnLoading = false
           this.signVisible = false
           // 设置当前任务阅片状态为已读
           this.readingTaskState = 2
-          var isAutoTask = await this.getAutoTaskVal()
+          const res = await getAutoCutNextTask()
+          var isAutoTask = res.Result.AutoCutNextTask
           if (isAutoTask) {
-            DicomEvent.$emit('getNextTask')
+            // DicomEvent.$emit('getNextTask')
+            window.location.reload()
           } else {
-          // 当前阅片任务已完成，是否进入下一个阅片任务
+            // 当前阅片任务已完成，是否进入下一个阅片任务
-            this.$confirm(this.$t('trials:globalReview:message:msg2'), {
+            const confirm = await this.$confirm(
-              type: 'warning',
+              this.$t('trials:globalReview:message:msg2'),
-              distinguishCancelAndClose: true
+              {
-            })
+                type: 'warning',
-              .then(() => {
+                distinguishCancelAndClose: true
-                store.dispatch('reading/resetVisitTasks')
+              }
-                DicomEvent.$emit('getNextTask')
+            )
-              })
+            if (confirm === 'confirm') {
-              .catch(action => {
+              // store.dispatch('reading/resetVisitTasks')
-                changeURLStatic('visitTaskId', this.visitTaskId)
+              // DicomEvent.$emit('getNextTask')
-              })
+              window.location.reload()
+            } else {
+              changeURLStatic('visitTaskId', this.visitTaskId)
+            }
           }
           window.opener.postMessage('refreshTaskList', window.location)
         }
         this.loading = false
-      }).catch(_ => {
+      } catch (e) {
         this.loading = false
         this.$refs['signForm'].btnLoading = false
-      })
+      }
-    },
-    getAutoTaskVal() {
-      return new Promise((resolve, reject) => {
-        getAutoCutNextTask().then(res => {
-          resolve(res.Result.AutoCutNextTask)
-        }).catch(() => { reject() })
-      })
     },
     handleView(row) {
       if (this.openWindow) {

src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue

@@ -92,7 +92,7 @@
         >
           <i slot="default" class="el-icon-plus" />
           <div slot="file" slot-scope="{file}">
-            <viewer :images="images" :ref="file.url">
+            <viewer :ref="file.url" :images="images">
               <img
                 class="el-upload-list__item-thumbnail"
                 :src="OSSclientConfig.basePath + file.url"
@@ -225,7 +225,7 @@ export default {
       isClosedDialog: false,
       isSendMessage: false,
       closeQuestionVisible: false,
-      images:[]
+      images: []
     }
   },
   mounted() {
@@ -397,7 +397,7 @@ export default {
     },
     initializeViewer() {
       Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true}
+        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
       })
     }
   }

src/views/trials/trials-panel/reading/none-dicoms/components/AdEcrf.vue

@@ -1,237 +0,0 @@
-<template>
-  <div v-loading="loading" style="min-height:400px;">
-    <el-card v-if="isRender" shadow="never" :body-style="{ padding: '10px' }">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;">历史评判结果</span>
-      </div>
-      <div v-for="task in visitTaskInfoList" :key="task.visitTaskId">
-        <el-form
-          ref="questions"
-          size="small"
-          :model="task.questionForm"
-        >
-          <FormItem
-            v-for="qs in task.questions"
-            :key="qs.ReadingQuestionTrialId"
-            :question="qs"
-            :question-form="task.questionForm"
-            :reading-task-state="2"
-            @resetFormItemData="resetFormItemData"
-          />
-        </el-form>
-      </div>
-    </el-card>
-
-    <el-card v-if="isRender" shadow="never" :body-style="{ padding: '10px' }" class="box-mr">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;">裁判结果</span>
-      </div>
-      <el-form ref="adForm" :model="adForm">
-        <el-form-item
-          label=""
-          prop="judgeResultTaskId"
-          :rules="[
-            { required: true, message: '请选择'},
-          ]"
-        >
-          <el-radio-group v-model="adForm.judgeResultTaskId" :disabled="readingTaskState >= 2">
-            <el-radio v-for="t in visitTaskInfoList" :key="t.visitTaskId" :label="t.visitTaskId">{{ t.armEnum }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          label="备注"
-          prop="judgeResultRemark"
-          :rules="[
-            { required: true, message: '请注明'},
-          ]"
-        >
-          <el-input
-            v-model="adForm.judgeResultRemark"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4}"
-            :disabled="readingTaskState >= 2"
-          />
-        </el-form-item>
-        <el-form-item v-if="readingTaskState < 2">
-          <div style="text-align:center;">
-            <el-button type="primary" @click="handleSave">保存</el-button>
-            <el-button type="primary" @click="handleSubmit">提交</el-button>
-          </div>
-
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <!-- 签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
-      <div slot="title">
-        <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
-      </div>
-      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
-    </el-dialog>
-  </div>
-
-</template>
-
-<script>
-
-import { getJudgeReadingInfo, saveJudgeVisitTaskResult, submitJudgeVisitTaskResult } from '@/api/trials'
-import const_ from '@/const/sign-code'
-import FormItem from './FormItem'
-import SignForm from '@/views/trials/components/newSignForm'
-export default {
-  name: 'ECRF',
-  components: {
-    FormItem,
-    SignForm
-  },
-  props: {
-    trialId: {
-      type: String,
-      required: true
-    },
-    visitTaskId: {
-      type: String,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      isRender: false,
-      signVisible: false,
-      signCode: null,
-      currentUser: zzSessionStorage.getItem('userName'),
-      readingTaskState: 0,
-      visitTasks: [],
-      adForm: {
-        visitTaskId: '',
-        judgeResultTaskId: '',
-        judgeResultRemark: ''
-      },
-      visitTaskInfoList: []
-    }
-  },
-  mounted() {
-    this.getQuestions()
-  },
-  methods: {
-    getQuestions() {
-      this.loading = true
-      var param = {
-        visitTaskId: this.visitTaskId
-      }
-      getJudgeReadingInfo(param).then(res => {
-        this.adForm.judgeResultTaskId = res.Result.JudgeResultTaskId
-        this.adForm.judgeResultRemark = res.Result.JudgeResultRemark
-        this.readingTaskState = res.Result.ReadingTaskState
-        res.Result.VisitTaskInfoList.forEach(task => {
-          var obj = {
-            visitTaskId: task.VisitTaskId,
-            armEnum: this.$fd('ArmEnum', task.ArmEnum),
-            questions: [],
-            questionForm: {}
-          }
-          task.TaskReadingQuestionList.map((v) => {
-            if (v.Type === 'group' && v.Childrens.length === 0) return
-            obj.questions.push(v)
-            if (v.Type !== 'group' && v.Type !== 'summary') {
-              this.$set(obj.questionForm, v.ReadingQuestionTrialId, v.Answer)
-            }
-            if (v.Childrens.length > 0) {
-              this.setChild(obj.questionForm, v.Childrens)
-            }
-          })
-          this.visitTaskInfoList.push(obj)
-        })
-        this.isRender = true
-        this.loading = false
-      }).catch(() => { this.loading = false })
-    },
-    setChild(obj, question) {
-      question.forEach(i => {
-        // this.$set(obj, i.ReadingQuestionTrialId, i.Answer)
-        if (i.Type !== 'group' && i.Type !== 'summary') {
-          this.$set(obj, i.ReadingQuestionTrialId, i.Answer)
-        }
-        if (i.Childrens && i.Childrens.length > 0) {
-          this.setChild(obj, i.Childrens)
-        }
-      })
-    },
-
-    handleSave() {
-      this.$refs['adForm'].validate((valid) => {
-        if (!valid) return
-        this.loading = true
-
-        this.adForm.visitTaskId = this.visitTaskId
-        saveJudgeVisitTaskResult(this.adForm).then(res => {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.loading = false
-        }).catch(() => {
-          this.loading = false
-        })
-      })
-    },
-    handleSubmit() {
-      this.$refs['questions'].validate((valid) => {
-        if (!valid) return
-        const { ImageAssessmentReportConfirmation } = const_.processSignature
-        this.signCode = ImageAssessmentReportConfirmation
-        this.signVisible = true
-      })
-    },
-    // 关闭签名框
-    closeSignDialog(isSign, signInfo) {
-      if (isSign) {
-        this.signConfirm(signInfo)
-      } else {
-        this.signVisible = false
-      }
-    },
-    // 签名并确认
-    signConfirm(signInfo) {
-      this.loading = true
-      var answers = []
-      for (const k in this.questionForm) {
-        answers.push({ readingQuestionTrialId: k, answer: this.questionForm[k] })
-      }
-      var params = {
-        data: {
-          visitTaskId: this.visitTaskId,
-          judgeResultTaskId: this.adForm.judgeResultTaskId,
-          judgeResultRemark: this.adForm.judgeResultRemark
-        },
-        signInfo: signInfo
-      }
-      submitJudgeVisitTaskResult(params).then(res => {
-        this.loading = false
-        if (res.IsSuccess) {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.isEdit = false
-          this.$refs['signForm'].btnLoading = false
-          this.signVisible = false
-          window.location.reload()
-          window.opener.postMessage('refreshTaskList', window.location)
-        }
-      }).catch(_ => {
-        this.loading = false
-        this.$refs['signForm'].btnLoading = false
-      })
-    },
-    resetFormItemData() {}
-  }
-}
-</script>
-<style lang="scss" scoped>
-.box-mr{
-  margin:10px 0;
-}
-</style>

src/views/trials/trials-panel/reading/none-dicoms/components/AdReview.vue

@@ -1,543 +0,0 @@
-<template>
-  <div class="adReview_wrapper">
-    <el-card shadow="never" :body-style="{ padding: '10px' }" style="margin-bottom:10px">
-      <h4 v-if="isReadingShowSubjectInfo">
-        受试者：
-        <span style="font-weight:normal">{{ subjectCode }} </span>
-        <span style="font-weight:normal">({{ taskBlindName }})</span>
-      </h4>
-    </el-card>
-    <el-card :body-style="{ padding: '10px' }" shadow="never">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;">评估结果</span>
-      </div>
-      <!-- <el-table
-        :data="adInfo.VisitTaskInfoList"
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="ArmEnum"
-          label="角色"
-          show-overflow-tooltip
-          width="150"
-        >
-          <template slot-scope="scope">
-            {{ $fd('ArmEnum', scope.row.ArmEnum) }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          v-for="(qs,index) in judgeQuestion"
-          :key="qs"
-          prop=""
-          :label="qs"
-          show-overflow-tooltip
-          width="150"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.JudgeQuestionAnswerInfoList[index].Answer }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          :label="$t('common:action:action')"
-          width="200"
-        >
-          <template slot-scope="scope">
-            <el-button
-              circle
-              title="查看详情"
-              icon="el-icon-view"
-              @click="handleView(scope.row,1)"
-            />
-          </template>
-        </el-table-column>
-      </el-table> -->
-
-      <el-table
-        :data="adInfo.VisitInfoList"
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="VisitName"
-          label="访视名称"
-          show-overflow-tooltip
-          width="150"
-        />
-
-        <!-- 评估结果 -->
-        <el-table-column
-          v-for="j in judgeQuestion"
-          :key="j.armEnum"
-          :label="$fd('ArmEnum', j.armEnum)"
-          align="center"
-          prop=""
-        >
-          <template>
-            <el-table-column
-              v-for="(qs,i) in j.judgeQuestionList"
-              :key="i"
-              prop=""
-              :label="qs"
-              show-overflow-tooltip
-              width="150"
-            >
-              <template slot-scope="scope">
-                <div v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].QuestionType===2">
-                  <div v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer">
-                    <span>{{ $fd('YesOrNo', scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer ) }}</span>
-                    <el-button
-                      type="text"
-                      style="margin-left:5px;"
-                      @click="handleViewDetail(scope.row.VisitTaskInfoList[j.index].GlobalVisitTaskId)"
-                    >
-                      查看详情
-                    </el-button>
-                  </div>
-                  <div v-else>
-                    {{ $fd('YesOrNo', scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer ) }}
-                  </div>
-                </div>
-                <div v-else>{{ scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer }}</div>
-              </template>
-            </el-table-column>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          label="查看详情"
-          width="200"
-        >
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              title="查看R1详情"
-              @click="handleView(scope.row,1)"
-            >
-              R1
-            </el-button>
-            <el-button
-              type="text"
-              title="查看R2详情"
-              @click="handleView(scope.row,2)"
-            >
-              R2
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <el-card :body-style="{ padding: '10px' }" class="box-mr">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;">裁判结果</span>
-      </div>
-      <el-form
-        ref="adForm"
-        v-loading="loading"
-        :model="adForm"
-        style="width:600px"
-        label-width="100px"
-      >
-        <el-form-item
-          label="选择阅片人"
-          prop="judgeResultTaskId"
-          :rules="[
-            { required: true, message: '请选择'},
-          ]"
-        >
-          <el-radio-group
-            v-model="adForm.judgeResultTaskId"
-            :disabled="adInfo.ReadingTaskState >= 2"
-          >
-            <el-radio
-              v-for="t in visitTaskArmList"
-              :key="t.VisitTaskId"
-              :label="t.VisitTaskId"
-            >
-              {{ $fd('ArmEnum', t.ArmEnum) }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          label="裁判原因"
-          prop="judgeResultRemark"
-          :rules="[
-            { required: true, message: '请注明'},
-          ]"
-        >
-          <el-input
-            v-model="adForm.judgeResultRemark"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4}"
-            :disabled="adInfo.ReadingTaskState >= 2"
-          />
-        </el-form-item>
-        <el-form-item
-          label="截图说明"
-        >
-          <el-upload
-            :action="accept"
-            :limit="1"
-            :on-preview="handlePictureCardPreview"
-            :before-upload="handleBeforeUpload"
-            :http-request="uploadScreenshot"
-            list-type="picture-card"
-            :on-remove="handleRemove"
-            :file-list="fileList"
-            :class="{disabled:uploadDisabled}"
-            :disabled="adInfo.ReadingTaskState >= 2"
-          >
-            <i slot="default" class="el-icon-plus" />
-            <div slot="file" slot-scope="{file}">
-              <img
-                class="el-upload-list__item-thumbnail"
-                :src="OSSclientConfig.basePath + file.url"
-                alt=""
-              >
-              <span class="el-upload-list__item-actions">
-                <span
-                  class="el-upload-list__item-preview"
-                  @click="handlePictureCardPreview(file)"
-                >
-                  <i class="el-icon-zoom-in" />
-                </span>
-
-                <span
-                  v-if="adInfo.ReadingTaskState < 2"
-                  class="el-upload-list__item-delete"
-                  @click="handleRemove(file)"
-                >
-                  <i class="el-icon-delete" />
-                </span>
-              </span>
-            </div>
-          </el-upload>
-          <el-dialog
-            append-to-body
-            :visible.sync="imgVisible"
-            width="600px"
-          >
-            <!-- <img width="100%" :src="imageUrl" alt="图片未找到"> -->
-            <el-image :src="OSSclientConfig.basePath + imageUrl" width="100%">
-              <div slot="placeholder" class="image-slot">
-                加载中<span class="dot">...</span>
-              </div>
-            </el-image>
-          </el-dialog>
-        </el-form-item>
-        <el-form-item v-if="adInfo.ReadingTaskState < 2">
-          <div style="text-align:center;">
-            <el-button type="primary" @click="handleSave">保存</el-button>
-            <el-button type="primary" @click="handleSubmit">提交</el-button>
-          </div>
-
-        </el-form-item>
-      </el-form>
-    </el-card>
-
-    <el-card v-if="isReadingShowPreviousResults" :body-style="{ padding: '10px' }">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;">既往裁判评估</span>
-      </div>
-
-      <el-table
-        v-loading="priorLoading"
-        :data="priorADList"
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="TaskBlindName"
-          label="裁判阅片"
-          show-overflow-tooltip
-          width="200"
-        />
-        <el-table-column
-          :label="$t('common:action:action')"
-          width="200"
-        >
-          <template slot-scope="scope">
-            <el-button
-              circle
-              title="查看详情"
-              icon="el-icon-view"
-              @click="handleViewDetail(scope.row.VisitTaskId)"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <!-- 签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
-      <div slot="title">
-        <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
-      </div>
-      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { getJudgeReadingInfo, uploadJudgeTaskImage, saveJudgeVisitTaskResult, submitJudgeVisitTaskResult, getReadingPastResultList } from '@/api/trials'
-import const_ from '@/const/sign-code'
-import { getToken } from '@/utils/auth'
-import SignForm from '@/views/trials/components/newSignForm'
-export default {
-  name: 'AdReview',
-  components: { SignForm },
-  props: {
-    trialId: {
-      type: String,
-      required: true
-    },
-    subjectId: {
-      type: String,
-      required: true
-    },
-    visitTaskId: {
-      type: String,
-      required: true
-    },
-    readingCategory: {
-      type: Number,
-      required: true
-    },
-    subjectCode: {
-      type: String,
-      required: true
-    },
-    taskBlindName: {
-      type: String,
-      required: true
-    },
-    isReadingShowSubjectInfo: {
-      type: Boolean,
-      required: true
-    },
-    isReadingShowPreviousResults: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      adInfo: {},
-      judgeQuestion: [],
-      adForm: {
-        visitTaskId: '',
-        judgeResultTaskId: '',
-        judgeResultRemark: '',
-        judgeResultImagePath: ''
-      },
-      currentUser: zzSessionStorage.getItem('userName'),
-      signVisible: false,
-      signCode: null,
-      accept: '.png,.jpg,.jpeg',
-      imgVisible: false,
-      imageUrl: '',
-      uploadDisabled: false,
-      fileList: [],
-      loading: false,
-      visitTaskArmList: [],
-      priorADList: [],
-      priorLoading: false
-    }
-  },
-  mounted() {
-    this.getAdInfo()
-    if (this.isReadingShowPreviousResults) {
-      this.getPriorAdList()
-    }
-  },
-  methods: {
-    getAdInfo() {
-      this.loading = true
-      getJudgeReadingInfo({ visitTaskId: this.visitTaskId }).then(res => {
-        var judgeQS = []
-        if (res.Result.VisitInfoList.length > 0) {
-          res.Result.VisitInfoList[0].VisitTaskInfoList.map((v, index) => {
-            var qsObj = { armEnum: v.ArmEnum, judgeQuestionList: [], index: index }
-            v.JudgeQuestionList.map(q => {
-              if (q.QuestionType === 1) {
-                qsObj.judgeQuestionList.push(q.QuestionName)
-              } else {
-                qsObj.judgeQuestionList.push(this.$fd('JudgeReadingQuestionType', q.QuestionType))
-              }
-            })
-            judgeQS.push(qsObj)
-          })
-        }
-        this.judgeQuestion = judgeQS
-
-        this.adInfo = res.Result
-        this.adForm.judgeResultTaskId = res.Result.JudgeResultTaskId
-        this.adForm.judgeResultRemark = res.Result.JudgeResultRemark
-
-        if (res.Result.JudgeResultImagePath) {
-          this.adForm.judgeResultImagePath = res.Result.JudgeResultImagePath
-          this.fileList = [{ name: '', url: `/api/${res.Result.JudgeResultImagePath}` }]
-          this.imageUrl = `/api/${res.Result.JudgeResultImagePath}`
-          this.uploadDisabled = true
-        }
-        this.visitTaskArmList = res.Result.VisitTaskArmList
-        this.loading = false
-      }).catch(() => { this.loading = false })
-    },
-    getPriorAdList() {
-      this.priorLoading = true
-      getReadingPastResultList({ visitTaskId: this.visitTaskId }).then(res => {
-        this.priorADList = res.Result
-        this.priorLoading = false
-      }).catch(() => { this.priorLoading = false })
-    },
-    handleSave() {
-      this.$refs['adForm'].validate((valid) => {
-        if (!valid) return
-        this.loading = true
-
-        this.adForm.visitTaskId = this.visitTaskId
-        saveJudgeVisitTaskResult(this.adForm).then(res => {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.loading = false
-        }).catch(() => {
-          this.loading = false
-        })
-      })
-    },
-    handleSubmit() {
-      this.$refs['adForm'].validate((valid) => {
-        if (!valid) return
-        const { ImageAssessmentReportConfirmation } = const_.processSignature
-        this.signCode = ImageAssessmentReportConfirmation
-        this.signVisible = true
-      })
-    },
-    // 关闭签名框
-    closeSignDialog(isSign, signInfo) {
-      if (isSign) {
-        this.signConfirm(signInfo)
-      } else {
-        this.signVisible = false
-      }
-    },
-    // 签名并确认
-    signConfirm(signInfo) {
-      this.loading = true
-      var params = {
-        data: {
-          visitTaskId: this.visitTaskId,
-          judgeResultTaskId: this.adForm.judgeResultTaskId,
-          judgeResultRemark: this.adForm.judgeResultRemark,
-          judgeResultImagePath: this.adForm.judgeResultImagePath
-        },
-        signInfo: signInfo
-      }
-      submitJudgeVisitTaskResult(params).then(res => {
-        if (res.IsSuccess) {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.isEdit = false
-          this.$refs['signForm'].btnLoading = false
-          this.signVisible = false
-          window.location.reload()
-          window.opener.postMessage('refreshTaskList', window.location)
-        }
-        this.loading = false
-      }).catch(_ => {
-        this.loading = false
-        this.$refs['signForm'].btnLoading = false
-      })
-    },
-    handleViewDetail(visitTaskId) {
-      var token = getToken()
-      const routeData = this.$router.resolve({
-        path: `/readingPage?trialId=${this.trialId}&visitTaskId=${visitTaskId}&TokenKey=${token}&isReadingShowPreviousResults=false`
-      })
-      window.open(routeData.href, '_blank')
-    },
-    handleView(row, armEnum) {
-      var token = getToken()
-      var task = row.VisitTaskInfoList.find(item => item.ArmEnum === armEnum)
-      const routeData = this.$router.resolve({
-        path: `/readingPage?trialId=${this.trialId}&visitTaskId=${task.VisitTaskId}&TokenKey=${token}&isReadingShowPreviousResults=false`
-      })
-      window.open(routeData.href, '_blank')
-    },
-    uploadScreenshot(param) {
-      this.loading = true
-      this.uploadDisabled = false
-      const formData = new FormData()
-      formData.append('file', param.file)
-      uploadJudgeTaskImage(this.$route.query.trialId, this.visitTaskId, formData).then(res => {
-        this.loading = false
-        if (res.IsSuccess) {
-          this.fileList.push({ name: res.Result.FileName, url: `${res.Result.Path}` })
-          this.imageUrl = `${res.Result.Path}`
-          this.adForm.judgeResultImagePath = res.Result.Path
-        }
-        this.uploadDisabled = true
-      }).catch(() => {
-        this.loading = false
-      })
-    },
-    handleBeforeUpload(file) {
-      // 检测文件类型是否符合要求
-      if (this.checkFileSuffix(file.name)) {
-        this.fileList = []
-        return true
-      } else {
-        this.$alert(`必须是 ${this.accept} 格式`)
-        return false
-      }
-    },
-    checkFileSuffix(fileName) {
-      var index = fileName.lastIndexOf('.')
-      var suffix = fileName.substring(index + 1, fileName.length)
-      if (this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 图片清空
-    removeImage() {
-      this.imageUrl = ''
-      this.fileList = []
-      this.adForm.judgeResultImagePath = ''
-    },
-    // 预览图片
-    handlePictureCardPreview() {
-      this.imgVisible = true
-      this.uploadDisabled = true
-    },
-    // 删除图片
-    handleRemove(file, fileList) {
-      this.uploadDisabled = false
-      this.imageUrl = ''
-      this.fileList = []
-      this.adForm.judgeResultImagePath = ''
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.adReview_wrapper{
-  flex: 1;
-  padding: 10px;
-  width: 100%;
-  height: 100%;
-  overflow-y: auto;
-  .box-mr{
-    margin:10px 0;
-  }
-  .disabled{
-  /deep/ .el-upload--picture-card {
-    display: none;
-  }
-}
-}
-</style>

src/views/trials/trials-panel/reading/none-dicoms/components/ECRF.vue

@@ -77,8 +77,15 @@
 
       <el-form-item v-if="readingTaskState < 2">
         <div style="text-align:center;">
-          <el-button type="primary" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+          <el-button type="primary" @click="skipTask">
-          <el-button type="primary" @click="handleSubmit">{{ $t('common:button:submit') }}</el-button>
+            {{ $t('trials:readingReport:button:skip') }}
+          </el-button>
+          <el-button type="primary" @click="handleSave">
+            {{ $t('common:button:save') }}
+          </el-button>
+          <el-button type="primary" @click="handleSubmit">
+            {{ $t('common:button:submit') }}
+          </el-button>
         </div>
       </el-form-item>
     </el-form>
@@ -104,11 +111,12 @@
 <script>
 
 import { getTrialReadingQuestion, saveVisitTaskQuestions, submitVisitTaskQuestionsInDto } from '@/api/trials'
+import { setSkipReadingCache } from '@/api/reading'
 import const_ from '@/const/sign-code'
 import FormItem from './FormItem'
 import SignForm from '@/views/trials/components/newSignForm'
 // import { getToken } from '@/utils/auth'
-import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
+// import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 export default {
   name: 'ECRF',
   components: {
@@ -152,56 +160,61 @@ export default {
     this.getQuestions()
   },
   methods: {
-    getQuestions() {
+    async getQuestions() {
       this.loading = true
-      var param = {
+      try {
-        readingQuestionCriterionTrialId: this.criterionId,
+        const param = {
-        visitTaskId: this.visitTaskId
+          readingQuestionCriterionTrialId: this.criterionId,
-      }
+          visitTaskId: this.visitTaskId
-      getTrialReadingQuestion(param).then(res => {
+        }
-        this.readingTaskState = res.OtherInfo.readingTaskState
+        const res = await getTrialReadingQuestion(param)
-        this.formType = res.OtherInfo.FormType
+        if (res.IsSuccess) {
-        if (res.OtherInfo.FormType === 2) {
+          this.readingTaskState = res.OtherInfo.readingTaskState
-          if (res.Result.MultiPage.length > 0) {
+          this.formType = res.OtherInfo.FormType
-            res.Result.MultiPage.map((v) => {
+          if (res.OtherInfo.FormType === 2) {
-              if (v.Type === 'group' && v.Childrens.length === 0) return
+            if (res.Result.MultiPage.length > 0) {
-              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
+              res.Result.MultiPage.map((v) => {
-                this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
+                if (v.Type === 'group' && v.Childrens.length === 0) return
-              }
+                if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
-              if (v.Childrens.length > 0) {
+                  this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
-                this.setChild(v.Childrens)
+                }
-              }
+                if (v.Childrens.length > 0) {
-            })
+                  this.setChild(v.Childrens)
-            this.questions = res.Result.MultiPage
+                }
-            this.activeName = res.Result.MultiPage[0].PageName
+              })
-          }
+              this.questions = res.Result.MultiPage
-          if (res.Result.PublicPage.length > 0) {
+              this.activeName = res.Result.MultiPage[0].PageName
-            res.Result.PublicPage.map((v) => {
+            }
-              if (v.Type === 'group' && v.Childrens.length === 0) return
+            if (res.Result.PublicPage.length > 0) {
-              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
+              res.Result.PublicPage.map((v) => {
-                this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
+                if (v.Type === 'group' && v.Childrens.length === 0) return
-              }
+                if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
-              if (v.Childrens.length > 0) {
+                  this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
-                this.setChild(v.Childrens)
+                }
-              }
+                if (v.Childrens.length > 0) {
-            })
+                  this.setChild(v.Childrens)
-            this.publicQuestions = res.Result.PublicPage
+                }
-          }
+              })
-        } else {
+              this.publicQuestions = res.Result.PublicPage
-          res.Result.SinglePage.map((v) => {
+            }
-            if (v.Type === 'group' && v.Childrens.length === 0) return
+          } else {
-            if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
+            res.Result.SinglePage.map((v) => {
-              this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
+              if (v.Type === 'group' && v.Childrens.length === 0) return
-            }
+              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
-            if (v.Childrens.length > 0) {
+                this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
-              this.setChild(v.Childrens)
+              }
-            }
+              if (v.Childrens.length > 0) {
-          })
+                this.setChild(v.Childrens)
-          this.questions = res.Result.SinglePage
+              }
+            })
+            this.questions = res.Result.SinglePage
+          }
+          this.isRender = true
         }
-        this.isRender = true
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     },
     setChild(obj) {
       obj.forEach(i => {
@@ -213,36 +226,36 @@ export default {
         }
       })
     },
-    handleSave() {
+    async handleSave() {
-      this.$refs['questions'].validate((valid) => {
+      const valid = await this.$refs['questions'].validate()
-        if (!valid) return
+      if (!valid) return
-        this.loading = true
+      this.loading = true
-        var answers = []
+      const answers = []
-        for (const k in this.questionForm) {
+      for (const k in this.questionForm) {
-          answers.push({ readingQuestionTrialId: k, answer: this.questionForm[k] })
+        answers.push({ readingQuestionTrialId: k, answer: this.questionForm[k] })
-        }
+      }
-        var params = {
+      const params = {
-          trialId: this.trialId,
+        trialId: this.trialId,
-          visitTaskId: this.visitTaskId,
+        visitTaskId: this.visitTaskId,
-          readingQuestionCriterionTrialId: this.criterionId,
+        readingQuestionCriterionTrialId: this.criterionId,
-          answerList: answers
+        answerList: answers
-
+      }
-        }
+      try {
-        saveVisitTaskQuestions(params).then(res => {
+        const res = await saveVisitTaskQuestions(params)
+        if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.loading = false
+        }
-        }).catch(() => {
+        this.loading = false
-          this.loading = false
+      } catch (e) {
-        })
+        this.loading = false
-      })
+      }
     },
-    handleSubmit() {
+    async handleSubmit() {
-      this.$refs['questions'].validate((valid) => {
+      const valid = await this.$refs['questions'].validate()
-        if (!valid) return
+      if (!valid) return
-        const { ImageAssessmentReportConfirmation } = const_.processSignature
+      const { ImageAssessmentReportConfirmation } = const_.processSignature
-        this.signCode = ImageAssessmentReportConfirmation
+      this.signCode = ImageAssessmentReportConfirmation
-        this.signVisible = true
+      this.signVisible = true
-      })
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
@@ -253,7 +266,7 @@ export default {
       }
     },
     // 签名并确认
-    signConfirm(signInfo) {
+    async signConfirm(signInfo) {
       this.loading = true
       var answers = []
       for (const k in this.questionForm) {
@@ -268,7 +281,9 @@ export default {
         },
         signInfo: signInfo
       }
-      submitVisitTaskQuestionsInDto(params).then(res => {
+      try {
+        const res = await submitVisitTaskQuestionsInDto(params)
+        this.loading = false
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.isEdit = false
@@ -276,35 +291,42 @@ export default {
           this.signVisible = false
           this.readingTaskState = 2
           window.opener.postMessage('refreshTaskList', window.location)
-          this.$confirm(this.$t('trials:globalReview:message:msg2'), {
+          const confirm = await this.$confirm(
-            type: 'warning',
+            this.$t('trials:noneDicoms:message:msg1'),
-            distinguishCancelAndClose: true
+            {
-          })
+              type: 'warning',
-            .then(() => {
+              distinguishCancelAndClose: true
-              DicomEvent.$emit('getNextTask')
+            }
-            })
+          )
-            .catch(action => {
+          if (confirm !== 'confirm') return
-
+          window.location.reload()
-            })
-          // window.location.reload()
-          // window.opener.postMessage('refreshTaskList', window.location)
-          // var token = getToken()
-          // var subjectCode = this.$router.currentRoute.query.subjectCode
-          // var criterionType = this.$router.currentRoute.query.criterionType
-          // var readingTool = this.$router.currentRoute.query.readingTool
-          // var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
-          // var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
-          // const routeData = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${subjectCode}&subjectId=${this.subjectId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
-          // this.$router.push({ path: routeData })
-          // this.$router.push({
-          //   path: `/readingPage?subjectCode=${subjectCode}&subjectId=${this.subjectId}&trialId=${this.trialId}&TokenKey=${token}`
-          // })
         }
-        this.loading = false
+      } catch (e) {
-      }).catch(_ => {
         this.loading = false
         this.$refs['signForm'].btnLoading = false
-      })
+      }
+    },
+    async skipTask() {
+      try {
+        // 是否确认跳过？
+        const confirm = await this.$confirm(
+          this.$t('trials:readingReport:message:skipConfirm'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        this.loading = true
+        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
+        this.loading = false
+        if (res.IsSuccess) {
+          window.location.reload()
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
     },
     resetFormItemData(v) {
       this.questionForm[v] = null

src/views/trials/trials-panel/reading/none-dicoms/components/EditGlobalForm.vue

@@ -1,155 +0,0 @@
-<template>
-  <el-form
-    v-if="questions.length>0"
-    ref="globalReviewForm"
-    v-loading="loading"
-    :model="form"
-    size="small"
-  >
-    <div class="base-dialog-body">
-      <el-form-item
-        v-for="qs in questions"
-        :key="`${qs.QuestionId}${qs.QuestionName}`"
-        :label="qs.QuestionName"
-      >
-        <!-- 下拉框 -->
-        <el-select
-          v-if="qs.Type==='select'"
-          v-model="form[!qs.QuestionId?'Reason':qs.QuestionId]"
-        >
-          <el-option
-            v-for="val in qs.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-            :value="val"
-            :disabled="getBeforeAnswer(qs.QuestionName) === val"
-          />
-        </el-select>
-        <!-- 单选 -->
-        <el-radio-group
-          v-if="qs.Type==='radio'"
-          v-model="form[!qs.QuestionId?'Reason':qs.QuestionId]"
-        >
-          <el-radio
-            v-for="val in qs.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-            :disabled="getBeforeAnswer(qs.QuestionName) === val"
-          >
-            {{ val }}
-          </el-radio>
-        </el-radio-group>
-        <el-input
-          v-if="qs.Type==='input'"
-          v-model="form[!qs.QuestionId?'Reason':qs.QuestionId]"
-          type="textarea"
-          :autosize="{ minRows: 2, maxRows: 4}"
-        />
-      </el-form-item>
-    </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-      <el-form-item style="text-align:right;">
-        <el-button size="small" type="primary" @click="handleClose">
-          {{ $t('common:button:cancel') }}
-        </el-button>
-        <el-button size="small" type="primary" @click="handleSave">
-          {{ $t('common:button:save') }}
-        </el-button>
-      </el-form-item>
-    </div>
-  </el-form>
-</template>
-<script>
-import { saveGlobalReadingInfo } from '@/api/trials'
-export default {
-  name: 'EditGlobalForm',
-  props: {
-    globalTaskId: {
-      type: String,
-      required: true
-    },
-    visitTaskId: {
-      type: String,
-      required: true
-    },
-    questionList: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    subjectId: {
-      type: String,
-      required: true
-    },
-    trialId: {
-      type: String,
-      required: true
-    },
-    beforeQuestionList: {
-      type: Array,
-      default() {
-        return []
-      }
-    }
-  },
-  data() {
-    return {
-      questions: [],
-      form: {},
-      loading: false
-    }
-  },
-  mounted() {
-    this.questionList.map(v => {
-      if (!v.QuestionId) {
-        this.$set(this.form, 'Reason', v.Answer)
-      } else {
-        this.$set(this.form, v.QuestionId, v.Answer)
-      }
-    })
-    this.questions = this.questionList
-  },
-  methods: {
-    handleSave() {
-      this.loading = true
-      var questionList = []
-      for (const i in this.form) {
-        questionList.push(
-          {
-            questionId: i === 'Reason' ? null : i,
-            visitTaskId: this.visitTaskId,
-            answer: this.form[i]
-          }
-        )
-      }
-      var param = {
-        globalTaskId: this.globalTaskId,
-        subjectId: this.subjectId,
-        trialId: this.trialId,
-        questionList: questionList
-      }
-      saveGlobalReadingInfo(param).then(res => {
-        this.loading = false
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-        this.$emit('getList')
-        this.$emit('close')
-      }).catch(() => {
-        this.loading = false
-      })
-    },
-    handleClose() {
-      this.$emit('close')
-    },
-    getBeforeAnswer(qs) {
-      var i = this.beforeQuestionList.findIndex(item => item.QuestionName === qs)
-      if (i > -1) {
-        return this.beforeQuestionList[i].Answer
-      } else {
-        return ''
-      }
-    }
-
-  }
-}
-</script>

src/views/trials/trials-panel/reading/none-dicoms/components/FormItem.vue

@@ -39,27 +39,27 @@
           :disabled="readingTaskState >= 2"
         />
         <!-- 下拉框 -->
-<!--        <el-select-->
+        <!--        <el-select-->
-<!--          v-if="question.Type==='select'"-->
+        <!--          v-if="question.Type==='select'"-->
-<!--          v-model="questionForm[question.Id]"-->
+        <!--          v-model="questionForm[question.Id]"-->
-<!--          :disabled="readingTaskState >= 2"-->
+        <!--          :disabled="readingTaskState >= 2"-->
-<!--          clearable-->
+        <!--          clearable-->
-<!--          @change="((val)=>{formItemChange(val, question)})"-->
+        <!--          @change="((val)=>{formItemChange(val, question)})"-->
-<!--        >-->
+        <!--        >-->
-<!--          <el-option-->
+        <!--          <el-option-->
-<!--            v-for="val in question.TypeValue.split('|')"-->
+        <!--            v-for="val in question.TypeValue.split('|')"-->
-<!--            :key="val"-->
+        <!--            :key="val"-->
-<!--            :label="val"-->
+        <!--            :label="val"-->
-<!--            :value="val"-->
+        <!--            :value="val"-->
-<!--          />-->
+        <!--          />-->
-<!--        </el-select>-->
+        <!--        </el-select>-->
         <el-select
           v-if="question.Type==='select'"
           v-model="questionForm[question.Id]"
           filterable
           :placeholder="$t('common:placeholder:select')"
           :disabled="readingTaskState >= 2"
-          @change="((val)=>{formItemChange(val, qs)})"
+          @change="((val)=>{formItemChange(val, question)})"
         >
           <template v-if="question.DictionaryCode">
             <el-option
@@ -91,7 +91,7 @@
               :key="item.id"
               :label="item.value.toString()"
             >
-              {{item.label}}
+              {{ item.label }}
             </el-radio>
           </template>
           <template v-else-if="question.TypeValue">
@@ -191,7 +191,7 @@
   </div>
 </template>
 <script>
-import { uploadReadingAnswerImage } from '@/api/trials'
+// import { uploadReadingAnswerImage } from '@/api/trials'
 export default {
   name: 'FormItem',
   props: {

src/views/trials/trials-panel/reading/none-dicoms/components/GlobalReview.vue

@@ -1,324 +0,0 @@
-<template>
-  <div class="glReview_wrapper">
-    <el-card shadow="never" :body-style="{ padding: '10px' }" style="margin-bottom:10px">
-      <h4 v-if="isReadingShowSubjectInfo">
-        {{ $t('trials:auditRecord:table:subject') }}：
-        <span style="font-weight:normal">{{ subjectCode }} </span>
-        <span style="font-weight:normal">({{ taskBlindName }})</span>
-      </h4>
-    </el-card>
-
-    <el-card :body-style="{ padding: '10px' }" shadow="never">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;">{{ $t('trials:globalReview:table:evaluationRes') }}</span>
-      </div>
-
-      <div v-if="taskList.length > 0 && readingTaskState < 2" style="text-align:right;margin:5px 0;">
-        <el-button size="small" type="primary" @click="handleConfirm">
-          {{ $t('common:button:confirm') }}
-        </el-button>
-      </div>
-      <el-table
-        v-loading="loading"
-        :data="taskList"
-      >
-        <el-table-column
-          prop="VisitName"
-          label="访视名称"
-          show-overflow-tooltip
-          width="150"
-        />
-        <!-- 评估结果 -->
-        <el-table-column
-          label="评估结果"
-          align="center"
-          prop=""
-        >
-          <template>
-            <el-table-column
-              v-for="(qs,index) in evaluationQsList"
-              :key="index"
-              prop=""
-              :label="qs"
-              show-overflow-tooltip
-              width="150"
-            >
-              <template slot-scope="scope">
-                {{ scope.row.BeforeQuestionList.length>index?scope.row.BeforeQuestionList[index].Answer:'' }}
-              </template>
-            </el-table-column>
-          </template>
-        </el-table-column>
-
-        <!-- 评估结果 -->
-        <el-table-column
-          label="调整后结果"
-          align="center"
-          prop=""
-        >
-          <template>
-            <el-table-column
-              v-for="(qs,index) in adjustedQsList"
-              :key="index"
-              prop=""
-              :label="qs"
-              show-overflow-tooltip
-              width="150"
-            >
-              <template slot-scope="scope">
-                {{ scope.row.AfterQuestionList.length>index?scope.row.AfterQuestionList[index].Answer:'' }}
-              </template>
-            </el-table-column>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          :label="$t('common:action:action')"
-          width="200"
-        >
-          <template slot-scope="scope">
-            <el-button
-              circle
-              title="查看详情"
-              icon="el-icon-view"
-              @click="handleView(scope.row)"
-            />
-            <el-button
-              v-if="readingTaskState < 2"
-              circle
-              title="调整"
-              icon="el-icon-edit"
-              @click="handleEdit(scope.row)"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-
-    <el-card v-if="isReadingShowPreviousResults" :body-style="{ padding: '10px' }" shadow="never">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;">既往全局阅片结果</span>
-      </div>
-      <el-table
-        v-loading="historyLoading"
-        :data="historyTaskList"
-      >
-        <el-table-column
-          prop="TaskBlindName"
-          label="全局"
-          show-overflow-tooltip
-          width="200"
-        />
-        <el-table-column
-          :label="$t('common:action:action')"
-          width="200"
-        >
-          <template slot-scope="scope">
-            <el-button
-              circle
-              title="查看详情"
-              icon="el-icon-view"
-              @click="handleView(scope.row)"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-
-    <!-- 签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
-      <div slot="title">
-        <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
-      </div>
-      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
-    </el-dialog>
-
-    <!-- 签名框 -->
-    <el-dialog
-      v-if="editVisible"
-      :visible.sync="editVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-      title="调整"
-    >
-
-      <EditGlobalForm
-        :global-task-id="visitTaskId"
-        :visit-task-id="rowData.VisitTaskId"
-        :question-list="rowData.AfterQuestionList"
-        :subject-id="subjectId"
-        :trial-id="trialId"
-        :before-question-list="rowData.BeforeQuestionList"
-        @getList="getGlInfo"
-        @close="editVisible = false"
-      />
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { getGlobalReadingInfo, getReadingPastResultList, submitGlobalReadingInfo } from '@/api/trials'
-import { getToken } from '@/utils/auth'
-import const_ from '@/const/sign-code'
-import EditGlobalForm from './EditGlobalForm'
-import SignForm from '@/views/trials/components/newSignForm'
-export default {
-  name: 'GlobalReview',
-  components: { EditGlobalForm, SignForm },
-  props: {
-    trialId: {
-      type: String,
-      required: true
-    },
-    subjectId: {
-      type: String,
-      required: true
-    },
-    visitTaskId: {
-      type: String,
-      required: true
-    },
-    readingCategory: {
-      type: Number,
-      required: true
-    },
-    subjectCode: {
-      type: String,
-      required: true
-    },
-    taskBlindName: {
-      type: String,
-      required: true
-    },
-    isReadingShowSubjectInfo: {
-      type: Boolean,
-      required: true
-    },
-    isReadingShowPreviousResults: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      maxLength: 2,
-      evaluationQsList: [],
-      adjustedQsList: [],
-      taskList: [],
-      historyLoading: false,
-      historyTaskList: [],
-      currentUser: zzSessionStorage.getItem('userName'),
-      signVisible: false,
-      signCode: null,
-      editVisible: false,
-      rowData: {},
-      readingTaskState: 0
-    }
-  },
-  mounted() {
-    this.getGlInfo()
-    if (this.isReadingShowPreviousResults) {
-      this.getHistoryGlobalInfo()
-    }
-  },
-  methods: {
-    getGlInfo() {
-      this.loading = true
-      getGlobalReadingInfo({ visitTaskId: this.visitTaskId }).then(res => {
-        var evaluationQsList = []
-        var adjustedQsList = []
-        if (res.Result.TaskList.length > 0) {
-          var task = res.Result.TaskList[0]
-          task.BeforeQuestionList.map(qs => {
-            evaluationQsList.push(qs.QuestionName)
-          })
-          task.AfterQuestionList.map(qs => {
-            adjustedQsList.push(qs.QuestionName)
-          })
-        }
-
-        this.evaluationQsList = evaluationQsList
-        this.adjustedQsList = adjustedQsList
-        this.taskList = res.Result.TaskList
-        this.readingTaskState = res.Result.ReadingTaskState
-        this.loading = false
-      }).catch(() => { this.loading = false })
-    },
-    getHistoryGlobalInfo() {
-      this.historyLoading = true
-      getReadingPastResultList({ visitTaskId: this.visitTaskId }).then(res => {
-        this.historyTaskList = res.Result
-        this.historyLoading = false
-      }).catch(() => { this.historyLoading = false })
-    },
-    handleEdit(row) {
-      this.rowData = { ...row }
-      this.editVisible = true
-    },
-    handleConfirm() {
-      const { ImageAssessmentReportConfirmation } = const_.processSignature
-      this.signCode = ImageAssessmentReportConfirmation
-      this.signVisible = true
-    },
-    // 关闭签名框
-    closeSignDialog(isSign, signInfo) {
-      if (isSign) {
-        this.signConfirm(signInfo)
-      } else {
-        this.signVisible = false
-      }
-    },
-    // 签名并确认
-    signConfirm(signInfo) {
-      this.loading = true
-      var params = {
-        data: {
-          globalTaskId: this.visitTaskId
-        },
-        signInfo: signInfo
-      }
-      submitGlobalReadingInfo(params).then(res => {
-        if (res.IsSuccess) {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.$refs['signForm'].btnLoading = false
-          this.signVisible = false
-          window.location.reload()
-          window.opener.postMessage('refreshTaskList', window.location)
-        }
-        this.loading = false
-      }).catch(_ => {
-        this.loading = false
-        this.$refs['signForm'].btnLoading = false
-      })
-    },
-    handleView(row) {
-      var token = getToken()
-      var visitTaskId = row.VisitTaskId
-      const routeData = this.$router.resolve({
-        path: `/readingPage?subjectId=${this.subjectId}&trialId=${this.trialId}&visitTaskId=${visitTaskId}&TokenKey=${token}&isReadingShowPreviousResults=false`
-      })
-      window.open(routeData.href, '_blank')
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.glReview_wrapper{
-  flex: 1;
-  padding: 10px;
-  width: 100%;
-  height: 100%;
-  overflow-y: auto;
-  .box-mr{
-    margin:10px 0;
-  }
-}
-</style>

src/views/trials/trials-panel/reading/none-dicoms/components/OncologyReview.vue

@@ -1,427 +0,0 @@
-<template>
-  <div v-loading="loading" class="oncologyReview_wrapper">
-    <el-card shadow="never" :body-style="{ padding: '10px' }" style="margin-bottom:10px">
-      <h4 v-if="isReadingShowSubjectInfo">
-        受试者：
-        <span style="font-weight:normal">{{ subjectCode }} </span>
-        <span style="font-weight:normal">({{ taskBlindName }})</span>
-      </h4>
-    </el-card>
-    <el-card :body-style="{ padding: '10px' }">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;">肿瘤学阅片</span>
-      </div>
-      <div style="text-align:right;margin:5px 0;">
-        <el-button
-          type="primary"
-          size="small"
-          @click="previewCD"
-        >
-          临床数据
-        </el-button>
-        <el-button
-          v-if="oncologyInfo.ReadingTaskState < 2"
-          size="small"
-          type="primary"
-          @click="handleSave(true)"
-        >
-          保存
-        </el-button>
-        <el-button
-          v-if="oncologyInfo.ReadingTaskState < 2"
-          size="small"
-          type="primary"
-          @click="handleConfirm"
-        >
-          确认
-        </el-button>
-      </div>
-      <el-table
-        :data="oncologyInfo.OncologyVisits"
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="VisitName"
-          label="访视名称"
-          show-overflow-tooltip
-          width="150"
-        />
-
-        <el-table-column
-          label="影像学阅片结果"
-          align="center"
-          prop=""
-        >
-          <template>
-            <el-table-column
-              v-for="(qs,index) in questionCols"
-              :key="qs"
-              prop=""
-              :label="qs"
-              show-overflow-tooltip
-              width="150"
-            >
-              <template slot-scope="scope">
-                {{ scope.row.QuestionList.length>index?scope.row.QuestionList[index].Answer:'' }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-if="oncologyInfo.IsShowDetail"
-              prop="IsHaveChange"
-              label="全局是否有更新"
-              show-overflow-tooltip
-              width="150"
-            >
-              <template slot-scope="scope">
-                <span>{{ $fd('YesOrNo', scope.row.IsHaveChange ) }}</span>
-                <el-button
-                  v-if="scope.row.IsHaveChange && !!oncologyInfo.GlobalTaskId"
-                  type="text"
-                  style="margin-left:5px;"
-                  @click="handleViewDetail(oncologyInfo.GlobalTaskId)"
-                >
-                  查看详情
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-if="oncologyInfo.IsShowDetail"
-              prop="VisitRemark"
-              label="访视点注释"
-              show-overflow-tooltip
-              width="150"
-            />
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          label="肿瘤学阅片结果"
-          align="center"
-          prop=""
-        >
-          <template>
-            <el-table-column
-              prop="EvaluationResult"
-              label="结论"
-              show-overflow-tooltip
-              width="150"
-            >
-              <template slot-scope="scope">
-                <el-select
-                  v-if="oncologyInfo.ReadingTaskState < 2"
-                  v-model="scope.row.EvaluationResult"
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in trialEvaluations"
-                    :key="item"
-                    :label="item"
-                    :value="item"
-                  />
-                </el-select>
-                <span v-else>{{ scope.row.EvaluationResult }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="EvaluationReason"
-              show-overflow-tooltip
-              width="250"
-            >
-              <template slot="header">
-                <el-tooltip placement="top">
-
-                  <div slot="content">
-                    {{ oncologyInfo.TrialEvaluationReason }}
-                  </div>
-                  <div>
-                    <span>原因</span>
-                    <span style="color:red">*</span>
-                  </div>
-
-                </el-tooltip>
-              </template>
-              <template slot-scope="scope">
-                <el-input
-                  v-if="oncologyInfo.ReadingTaskState < 2"
-                  v-model="scope.row.EvaluationReason"
-                />
-                <span v-else>{{ scope.row.EvaluationReason }}</span>
-              </template>
-            </el-table-column>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          v-if="oncologyInfo.IsShowDetail"
-          :label="$t('common:action:action')"
-          width="100"
-        >
-          <template slot-scope="scope">
-            <el-button
-              circle
-              title="查看详情"
-              icon="el-icon-view"
-              @click="handleViewDetail(scope.row.VisitTaskId)"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <el-card v-if="isReadingShowPreviousResults" :body-style="{ padding: '10px' }" class="box-mr">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;">既往肿瘤学阅片结果</span>
-      </div>
-
-      <el-table
-        v-loading="priorLoading"
-        :data="priorList"
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="TaskBlindName"
-          label="肿瘤学阅片"
-          show-overflow-tooltip
-          width="200"
-        />
-        <el-table-column
-          :label="$t('common:action:action')"
-          width="200"
-        >
-          <template slot-scope="scope">
-            <el-button
-              circle
-              title="查看详情"
-              icon="el-icon-view"
-              @click="handleViewDetail(scope.row.VisitTaskId)"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <!-- 签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
-      <div slot="title">
-        <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
-      </div>
-      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { getOncologyReadingInfo, getReadingPastResultList, setOncologyReadingInfo, submitOncologyReadingInfo } from '@/api/trials'
-import const_ from '@/const/sign-code'
-import { getToken } from '@/utils/auth'
-import SignForm from '@/views/trials/components/newSignForm'
-export default {
-  name: 'OncologyReview',
-  components: { SignForm },
-  props: {
-    trialId: {
-      type: String,
-      required: true
-    },
-    subjectId: {
-      type: String,
-      required: true
-    },
-    visitTaskId: {
-      type: String,
-      required: true
-    },
-    readingCategory: {
-      type: Number,
-      required: true
-    },
-    subjectCode: {
-      type: String,
-      required: true
-    },
-    taskBlindName: {
-      type: String,
-      required: true
-    },
-    isReadingShowSubjectInfo: {
-      type: Boolean,
-      required: true
-    },
-    isReadingShowPreviousResults: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      currentUser: zzSessionStorage.getItem('userName'),
-      signVisible: false,
-      signCode: null,
-      loading: false,
-      priorLoading: false,
-      priorList: [],
-      questionCols: [],
-      oncologyInfo: {},
-      trialEvaluations: []
-    }
-  },
-  mounted() {
-    this.getList()
-    if (this.isReadingShowPreviousResults) {
-      this.getPriorList()
-    }
-  },
-  methods: {
-    getList() {
-      this.loading = true
-      getOncologyReadingInfo({ visitTaskId: this.visitTaskId }).then(res => {
-        var questions = []
-        if (res.Result.OncologyVisits.length > 0) {
-          var task = res.Result.OncologyVisits[0]
-          task.QuestionList.map(qs => {
-            questions.push(qs.QuestionName)
-          })
-        }
-        this.questionCols = questions
-        this.trialEvaluations = res.Result.TrialEvaluationResult ? res.Result.TrialEvaluationResult.split('|') : []
-        this.oncologyInfo = res.Result
-        this.loading = false
-      }).catch(() => { this.loading = false })
-    },
-    handleSave(isPrompt) {
-      this.loading = true
-      var index = this.oncologyInfo.OncologyVisits.findIndex(item => !item.EvaluationResult)
-      if (index > -1) {
-        this.loading = false
-        this.$confirm('肿瘤学阅片结论不能为空！', {
-          type: 'warning',
-          distinguishCancelAndClose: true
-        })
-          .then(() => {
-            return Promise.reject(false)
-          })
-          .catch(action => {
-            return Promise.reject(false)
-          })
-      } else {
-        this.loading = true
-        var oncologyQuestionList = []
-        this.oncologyInfo.OncologyVisits.map(item => {
-          if (item.EvaluationResult) {
-            oncologyQuestionList.push(
-              {
-                visitTaskId: item.VisitTaskId,
-                evaluationResult: item.EvaluationResult,
-                evaluationReason: item.EvaluationReason
-              }
-            )
-          }
-        })
-        var params = {
-          oncologyTaskId: this.visitTaskId,
-          oncologyQuestionList: oncologyQuestionList
-        }
-        return new Promise((resolve, reject) => {
-          setOncologyReadingInfo(params).then(res => {
-            this.loading = false
-            this.getList()
-            if (isPrompt) {
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
-            }
-            resolve(true)
-          }).catch(_ => {
-            this.loading = false
-            reject(false)
-          })
-        })
-      }
-    },
-    handleSubmit() {
-      this.$refs['adForm'].validate((valid) => {
-        if (!valid) return
-        const { ImageAssessmentReportConfirmation } = const_.processSignature
-        this.signCode = ImageAssessmentReportConfirmation
-        this.signVisible = true
-      })
-    },
-    // 关闭签名框
-    closeSignDialog(isSign, signInfo) {
-      if (isSign) {
-        this.signConfirm(signInfo)
-      } else {
-        this.signVisible = false
-      }
-    },
-    handleConfirm() {
-      this.handleSave(false).then(res => {
-        if (res) {
-          const { ImageAssessmentReportConfirmation } = const_.processSignature
-          this.signCode = ImageAssessmentReportConfirmation
-          this.signVisible = true
-        }
-      })
-    },
-    // 签名并确认
-    signConfirm(signInfo) {
-      this.loading = true
-      var params = {
-        data: {
-          oncologyTaskId: this.visitTaskId
-        },
-        signInfo: signInfo
-      }
-      submitOncologyReadingInfo(params).then(res => {
-        if (res.IsSuccess) {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.isEdit = false
-          this.$refs['signForm'].btnLoading = false
-          this.signVisible = false
-          window.location.reload()
-          window.opener.postMessage('refreshTaskList', window.location)
-        }
-        this.loading = false
-      }).catch(_ => {
-        this.loading = false
-        this.$refs['signForm'].btnLoading = false
-      })
-    },
-    getPriorList() {
-      this.priorLoading = true
-      getReadingPastResultList({ visitTaskId: this.visitTaskId }).then(res => {
-        this.priorList = res.Result
-        this.priorLoading = false
-      }).catch(() => { this.priorLoading = false })
-    },
-    handleViewDetail(visitTaskId) {
-      var token = getToken()
-      const routeData = this.$router.resolve({
-        path: `/readingPage?trialId=${this.trialId}&visitTaskId=${visitTaskId}&TokenKey=${token}&isReadingShowPreviousResults=false`
-      })
-      window.open(routeData.href, '_blank')
-    },
-    previewCD() {
-      var token = getToken()
-      const routeData = this.$router.resolve({
-        path: `/clinicalData?subjectId=${this.oncologyInfo.SubjectId}&trialId=${this.trialId}&visitTaskId=${this.oncologyInfo.OncologyTaskId}&TokenKey=${token}`
-      })
-      window.open(routeData.href, '_blank')
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.oncologyReview_wrapper{
-  flex: 1;
-  padding: 10px;
-  width: 100%;
-  height: 100%;
-  overflow-y: auto;
-  .box-mr{
-    margin:10px 0;
-  }
-}
-</style>

src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading" class="img-container">
     <el-card class="box-card left">
       <div v-if="otherInfo && otherInfo.IsReadingShowSubjectInfo" class="title">
-        <span>{{$t('trials:auditRecord:table:subject')}}：{{ otherInfo.SubjectCode }} </span>
+        <span>{{ $t('trials:auditRecord:table:subject') }}：{{ otherInfo.SubjectCode }} </span>
         <span>({{ otherInfo.TaskBlindName }})</span>
       </div>
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -41,7 +41,7 @@
           <div style="height:100%;">
             <!-- 文件层级 -->
             <div v-if="associatedList.length === 0" class="empty-text">
-              <slot name="empty">{{$t('trials:audit:message:noData')}}</slot>
+              <slot name="empty">{{ $t('trials:audit:message:noData') }}</slot>
             </div>
             <div v-else>
               <div
@@ -78,14 +78,15 @@
     </el-card>
 
     <el-card class="box-card" style="width:400px;height:100%;padding: 10px;margin-left:10px;overflow-y: auto;">
-      <el-button
+      <div style="text-align:right;">
-        v-if="otherInfo && otherInfo.IsExistsClinicalData"
+        <el-button
-        type="primary"
+          v-if="otherInfo && otherInfo.IsExistsClinicalData"
-        size="mini"
+          type="text"
-        @click="previewCD"
+          @click="previewCD"
-      >
+        >
-        {{ $t('trials:crcUpload:label:clinicalData') }}
+          {{ $t('trials:crcUpload:label:clinicalData') }}
-      </el-button>
+        </el-button>
+      </div>
       <Criterions
         v-if="otherInfo && visitTaskId!== '' && subjectId!== '' && readingCategory!==null && readingCategory!==4"
         :trial-id="trialId"
@@ -155,7 +156,7 @@ export default {
       currentTaskId: '',
       otherInfo: null,
       isReadingShowPreviousResults: false,
-      bp:[]
+      bp: []
     }
   },
   computed: {
@@ -269,7 +270,7 @@ export default {
       })
       window.open(routeData.href, '_blank')
     },
-  getBodyPart(bodyPart) {
+    getBodyPart(bodyPart) {
       if (!bodyPart) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
@@ -281,7 +282,7 @@ export default {
       }
       var arr = bodyPart.split(separator)
       var newArr = arr.map(i => {
-        return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name')
+        return this.$fd('Bodypart', i.trim(), 'Code', { Bodypart: this.bp }, 'Name')
       })
       return newArr.join(' | ')
     }

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

@@ -70,7 +70,7 @@
       </div>
 
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handleConfirmCD">{{$t("common:button:confirm")}}</el-button>
+        <el-button type="primary" @click="handleConfirmCD">{{ $t("common:button:confirm") }}</el-button>
       </span>
     </el-dialog>
 
@@ -87,7 +87,7 @@ import VisitReview from './components/VisitReview'
 import GlobalReview from '@/views/trials/trials-panel/reading/global-review'
 import AdReview from '@/views/trials/trials-panel/reading/ad-review'
 import ClinicalData from '@/views/trials/trials-panel/reading/clinical-data'
-import { getToken } from '@/utils/auth'
+// import { getToken } from '@/utils/auth'
 import OncologyReview from '@/views/trials/trials-panel/reading/oncology-review'
 export default {
   name: 'NoneDicomReading',
@@ -136,7 +136,7 @@ export default {
     this.readingTool = this.$router.currentRoute.query.readingTool
     this.isNewSubject = this.$router.currentRoute.query.isNewSubject
     if (this.isNewSubject && this.isReadingTaskViewInOrder) {
-      let message = this.$t('trials:reading:noneDicom:message:startRead').replace("xxx",this.subjectCode);
+      const message = this.$t('trials:reading:noneDicom:message:startRead').replace('xxx', this.subjectCode)
       this.$message.success(message)
       changeURLStatic('isNewSubject', '')
     }
@@ -164,11 +164,11 @@ export default {
       this.isShow = false
       getNextTask(param).then(res => {
         this.readingCategory = res.Result.ReadingCategory
-        if (this.subjectId !== res.Result.SubjectId && this.isReadingTaskViewInOrder) {
+        // if (this.subjectId !== res.Result.SubjectId && this.isReadingTaskViewInOrder) {
-          store.dispatch('reading/resetVisitTasks')
+        //   store.dispatch('reading/resetVisitTasks')
-          var token = getToken()
+        //   var token = getToken()
-          window.location.href = `/noneDicomReading?trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingShowPreviousResults=${this.isReadingShowPreviousResults}&isReadingShowSubjectInfo=${this.isReadingShowSubjectInfo}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&isNewSubject=1&isReadingTaskViewInOrder=${res.Result.IsReadingTaskViewInOrder}&TokenKey=${token}`
+        //   window.location.href = `/noneDicomReading?trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingShowPreviousResults=${this.isReadingShowPreviousResults}&isReadingShowSubjectInfo=${this.isReadingShowSubjectInfo}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&isNewSubject=1&isReadingTaskViewInOrder=${res.Result.IsReadingTaskViewInOrder}&TokenKey=${token}`
-        }
+        // }
         this.subjectId = res.Result.SubjectId
         this.visitTaskId = res.Result.VisitTaskId
         this.subjectCode = res.Result.SubjectCode
@@ -190,14 +190,17 @@ export default {
         this.loading = false
       }).catch(() => { this.loading = false })
     },
-    handleConfirmCD() {
+    async handleConfirmCD() {
       this.loading = true
       var visitTaskId = this.visitTaskId
-      readClinicalData({ visitTaskId }).then(res => {
+      try {
+        await readClinicalData({ visitTaskId })
         this.loading = false
         this.dialogVisible = false
         this.isReadClinicalData = true
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     }
   }
 }

src/views/trials/trials-panel/reading/oncology-review/index.vue

@@ -262,8 +262,11 @@
 <script>
 import { getOncologyReadingInfo, getReadingPastResultList, setOncologyReadingInfo, submitOncologyReadingInfo } from '@/api/trials'
 import { setSkipReadingCache } from '@/api/reading'
+import { getAutoCutNextTask } from '@/api/user'
 import const_ from '@/const/sign-code'
 import { getToken } from '@/utils/auth'
+// import store from '@/store'
+import { changeURLStatic } from '@/utils/history.js'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 import SignForm from '@/views/trials/components/newSignForm'
 export default {
@@ -352,9 +355,10 @@ export default {
     }
   },
   methods: {
-    getList() {
+    async getList() {
       this.loading = true
-      getOncologyReadingInfo({ visitTaskId: this.visitTaskId }).then(res => {
+      try {
+        const res = getOncologyReadingInfo({ visitTaskId: this.visitTaskId })
         var questions = []
         if (res.Result.OncologyVisits.length > 0) {
           var task = res.Result.OncologyVisits[0]
@@ -366,7 +370,9 @@ export default {
         this.assessTypeList = res.Result.AssessTypeList
         this.oncologyInfo = res.Result
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     },
     getAssessType(val) {
       var idx = this.assessTypeList.findIndex(i => i.Code === val)
@@ -377,28 +383,20 @@ export default {
       }
     },
     handleSave(isPrompt) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async(resolve, reject) => {
         this.loading = true
         // var index = this.oncologyInfo.OncologyVisits.findIndex(item => !item.EvaluationResult && !item.IsBaseLine)
         var isDiffer = this.checkDifferResult()
         if (isDiffer) {
           this.loading = false
-          // '肿瘤学阅片结论不能为空！' this.$t('trials:oncologyReview:message:msg1'
+          const confirm = await this.$confirm(
-          // '肿瘤学阅片结果与影像学整体肿瘤评估不一致，请填写原因！'
+            this.$t('trials:oncologyReview:message:msg2'),
-          // this.$confirm(this.$t('trials:oncologyReview:message:msg2'), {
+            {
-          //   type: 'warning',
+              type: 'warning',
-          //   distinguishCancelAndClose: true,
+              distinguishCancelAndClose: true
-          //   showCancelButton: false
+            }
-          // }).then(_ => {})
+          )
-          //   .catch(_ => {
+          if (confirm === 'confirm') reject(false)
-          //   })
-          this.$confirm(this.$t('trials:oncologyReview:message:msg2'), {
-            type: 'warning',
-            showCancelButton: false
-          })
-            .then(() => {
-              reject(false)
-            })
         } else {
           this.loading = true
           var oncologyQuestionList = []
@@ -419,18 +417,18 @@ export default {
             globalTaskId: this.oncologyInfo.GlobalTaskId,
             relatedTaskId: this.oncologyInfo.RelatedTaskId
           }
-
+          try {
-          setOncologyReadingInfo(params).then(res => {
+            await setOncologyReadingInfo(params)
             this.loading = false
             this.getList()
             if (isPrompt) {
               this.$message.success(this.$t('common:message:savedSuccessfully'))
             }
             resolve(true)
-          }).catch(_ => {
+          } catch (e) {
             this.loading = false
             reject(false)
-          })
+          }
         }
       })
     },
@@ -453,13 +451,12 @@ export default {
       }
       return isDiffer
     },
-    handleSubmit() {
+    async handleSubmit() {
-      this.$refs['adForm'].validate((valid) => {
+      const valid = await this.$refs['adForm'].validate()
-        if (!valid) return
+      if (!valid) return
-        const { ImageAssessmentReportConfirmation } = const_.processSignature
+      const { ImageAssessmentReportConfirmation } = const_.processSignature
-        this.signCode = ImageAssessmentReportConfirmation
+      this.signCode = ImageAssessmentReportConfirmation
-        this.signVisible = true
+      this.signVisible = true
-      })
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
@@ -469,17 +466,16 @@ export default {
         this.signVisible = false
       }
     },
-    handleConfirm() {
+    async handleConfirm() {
-      this.handleSave(false).then(res => {
+      const res = await this.handleSave(false)
-        if (res) {
+      if (res) {
-          const { ImageAssessmentReportConfirmation } = const_.processSignature
+        const { ImageAssessmentReportConfirmation } = const_.processSignature
-          this.signCode = ImageAssessmentReportConfirmation
+        this.signCode = ImageAssessmentReportConfirmation
-          this.signVisible = true
+        this.signVisible = true
-        }
+      }
-      })
     },
     // 签名并确认
-    signConfirm(signInfo) {
+    async signConfirm(signInfo) {
       this.loading = true
       var params = {
         data: {
@@ -487,7 +483,8 @@ export default {
         },
         signInfo: signInfo
       }
-      submitOncologyReadingInfo(params).then(res => {
+      try {
+        const res = await submitOncologyReadingInfo(params)
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.isEdit = false
@@ -497,43 +494,47 @@ export default {
           // window.opener.postMessage('refreshTaskList', window.location)
           // 设置当前任务阅片状态为已读
           this.oncologyInfo.ReadingTaskState = 2
-          window.opener.postMessage('refreshTaskList', window.location)
-          // '当前阅片任务已完成，是否进入下一个阅片任务？'
-          this.$confirm(this.$t('trials:oncologyReview:title:msg2'), {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          })
-            .then(() => {
-              // var token = getToken()
-              // var criterionType = this.$router.currentRoute.query.criterionType
-              // var readingTool = this.$router.currentRoute.query.readingTool
-              // var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
-              // var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
-              // var path = ''
-              // if (readingTool && parseInt(readingTool) === 0) {
-              //   path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
-              // } else {
-              //   path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
-              // }
-              // this.$router.push({ path })
-              DicomEvent.$emit('getNextTask')
-            })
-            .catch(action => {
 
-            })
+          const res = await getAutoCutNextTask()
+          var isAutoTask = res.Result.AutoCutNextTask
+          if (isAutoTask) {
+            // store.dispatch('reading/resetVisitTasks')
+            // DicomEvent.$emit('getNextTask')
+            window.location.reload()
+          } else {
+          // '当前阅片任务已完成，是否进入下一个阅片任务？'
+            const confirm = await this.$confirm(
+              this.$t('trials:oncologyReview:title:msg2'),
+              {
+                type: 'warning',
+                distinguishCancelAndClose: true
+              }
+            )
+            if (confirm === 'confirm') {
+              // store.dispatch('reading/resetVisitTasks')
+              // DicomEvent.$emit('getNextTask')
+              window.location.reload()
+            } else {
+              changeURLStatic('visitTaskId', this.visitTaskId)
+            }
+          }
+          window.opener.postMessage('refreshTaskList', window.location)
         }
         this.loading = false
-      }).catch(_ => {
+      } catch (e) {
         this.loading = false
         this.$refs['signForm'].btnLoading = false
-      })
+      }
     },
-    getPriorList() {
+    async getPriorList() {
       this.priorLoading = true
-      getReadingPastResultList({ visitTaskId: this.visitTaskId }).then(res => {
+      try {
+        const res = await getReadingPastResultList({ visitTaskId: this.visitTaskId })
         this.priorList = res.Result
         this.priorLoading = false
-      }).catch(() => { this.priorLoading = false })
+      } catch (e) {
+        this.priorLoading = false
+      }
     },
     handleViewDetail(visitTaskId) {
       if (this.openWindow) {

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -813,7 +813,7 @@ export default {
   },
   data() {
     return {
-      uploadActiveName: "pacs",
+      uploadActiveName: "file",
       editStudyInfoVisible: false,
       studyForm: {
         StudyCode: "",

src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue

@@ -70,62 +70,126 @@
     <template slot="main-container">
       <el-table
         v-loading="loading"
-        v-adaptive="{ bottomOffset: 120 }"
+        v-adaptive="{ bottomOffset: 150 }"
         height="100"
         :data="list"
         class="table"
         @selection-change="handleSelectChange"
         @sort-change="handleSortByColumn"
-        :default-sort="{ prop: 'studyTime', order: 'descending' }"
+        :default-sort="{ prop: 'StudyTime', order: 'descending' }"
       >
         <el-table-column type="selection" align="center" width="45" />
         <el-table-column type="index" width="50" />
-        <!--病历号-->
+        <!--患者信息-->
-        <el-table-column
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:patientId')"
-          prop="PatientIdStr"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--患者姓名-->
         <el-table-column
           :label="
-            $t('trials:visit:crcUpload:uploadDicomPacs:table:patientName')
+            $t('trials:visit:crcUpload:uploadDicomPacs:table:patientMessage')
           "
-          prop="PatientName"
+          prop="PatientIdStr"
-          min-width="90"
+          min-width="140"
           show-overflow-tooltip
           sortable="custom"
-        />
+        >
-        <!--性别-->
+          <template slot="header">
-        <el-table-column
+            <el-tooltip placement="top">
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:patientSex')"
+              <div slot="content">
-          prop="PatientSex"
+                {{ $t("trials:uploadDicomList:table:pId") }}<br />
-          min-width="160"
+                {{ $t("trials:uploadDicomList:table:patientName") }}<br />
-          show-overflow-tooltip
+                {{ $t("trials:uploadDicomList:table:pInfo") }}
-          sortable="custom"
+              </div>
-        />
+              <span>{{ $t("trials:uploadDicomList:table:patientInfo") }}</span>
-        <!--出生日期-->
+            </el-tooltip>
-        <el-table-column
+          </template>
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:patientSex')"
+          <template slot-scope="scope">
-          prop="CalledAEList"
+            <div style="line-height: 15px">
-          min-width="90"
+              <div>
-          show-overflow-tooltip
+                <span v-if="scope.row.PatientIdStr"
-          sortable="custom"
+                  ><span style="font-weight: 500">PID: </span
-          ><template slot-scope="scope">
+                  >{{ scope.row.PatientIdStr }}</span
-            {{ scope.row.CallingAEList.join(", ") }}
+                >
+                <span v-else style="color: #f44336">N/A</span>
+              </div>
+              <div>
+                <span :class="[scope.row.PatientName ? '' : 'colorOfRed']">
+                  {{ scope.row.PatientName ? scope.row.PatientName : "N/A" }}
+                </span>
+              </div>
+              <div>
+                <span :class="[scope.row.PatientSex ? '' : 'colorOfRed']">
+                  {{ scope.row.PatientSex ? scope.row.PatientSex : "N/A" }},
+                </span>
+
+                <span :class="[scope.row.PatientAge ? '' : 'colorOfRed']">
+                  {{ scope.row.PatientAge ? scope.row.PatientAge : "N/A" }},
+                </span>
+
+                <span :class="[scope.row.PatientBirthDate ? '' : 'colorOfRed']">
+                  {{
+                    scope.row.PatientBirthDate
+                      ? scope.row.PatientBirthDate
+                      : "N/A"
+                  }}
+                </span>
+              </div>
+            </div>
           </template>
         </el-table-column>
-
+        <!--检查申请号-->
-        <!--检查信息-->
+        <el-table-column
+          :label="
+            $t('trials:visit:crcUpload:uploadDicomPacs:table:accNumber')
+          "
+          prop="AccNumber"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--检查模态-->
         <el-table-column
           :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:modalities')"
           prop="Modalities"
+          min-width="120"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--检查部位-->
+        <el-table-column
+          :label="
+            $t('trials:visit:crcUpload:uploadDicomPacs:table:bodyPartExamined')
+          "
+          prop="BodyPartExamined"
+          min-width="120"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--检查描述-->
+        <el-table-column
+          :label="
+            $t('trials:visit:crcUpload:uploadDicomPacs:table:description')
+          "
+          prop="Description"
           min-width="160"
           show-overflow-tooltip
           sortable="custom"
         />
+        <!--序列数量-->
+        <el-table-column
+          :label="
+            $t('trials:visit:crcUpload:uploadDicomPacs:table:seriesCount')
+          "
+          prop="SeriesCount"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--图像数量-->
+        <el-table-column
+          :label="
+            $t('trials:visit:crcUpload:uploadDicomPacs:table:instanceCount')
+          "
+          prop="InstanceCount"
+          show-overflow-tooltip
+          sortable="custom"
+        />
         <!--检查日期-->
         <el-table-column
           :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:studyTime')"
@@ -134,29 +198,15 @@
           show-overflow-tooltip
           sortable="custom"
         />
-        <!--图像数量-->
+        <el-table-column :label="$t('common:action:action')" fixed="right">
-        <el-table-column
-          :label="
-            $t('trials:visit:crcUpload:uploadDicomPacs:table:instanceCount')
-          "
-          prop="InstanceCount"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <el-table-column
-          :label="$t('common:action:action')"
-          min-width="260"
-          fixed="right"
-        >
           <template slot-scope="scope">
             <!-- 添加 -->
             <el-button
-              icon="el-icon-view"
               :title="$t('common:button:add')"
-              circle
+              type="text"
               @click="handleAdd(scope.row)"
-            />
+              >{{ $t("common:button:add") }}</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -187,7 +237,7 @@ const searchDataDefault = () => {
     PageIndex: 1,
     PageSize: 20,
     Asc: true,
-    SortField: "StartTime",
+    SortField: "StudyTime",
   };
 };
 export default {
@@ -222,11 +272,11 @@ export default {
         return this.$message.warning(
           this.$t("trials:visit:crcUpload:uploadDicomPacs:message:notCheck")
         );
-      let arr = this.tableSelectData.map((item) => item.ScpStudyId);
+      let arr = this.tableSelectData.map((item) => item.SCPStudyId);
       this.submitVisitStudyBinding(arr);
     },
     handleAdd(row) {
-      let arr = [row.ScpStudyId];
+      let arr = [row.SCPStudyId];
       this.submitVisitStudyBinding(arr);
     },
     // 添加检查

vue.config.js

@@ -25,8 +25,8 @@ module.exports = {
   devServer: {
     port: '8080',
     headers: {
-      // 'Cross-Origin-Opener-Policy': 'same-origin',
+      'Cross-Origin-Opener-Policy': 'same-origin',
-      // 'Cross-Origin-Embedder-Policy': 'require-corp'
+      'Cross-Origin-Embedder-Policy': 'require-corp'
     },
     // open: true,
     overlay: {