阅片表单数值问题可输入NE

src/api/trials.js

@@ -4123,31 +4123,4 @@ export function addFolder(data) {
     method: 'post',
     data
   })
-}
-
-
-// 配置-项目文档发布
-export function publishTrialDocument(data) {
-  return request({
-    url: `/TrialDocument/publishTrialDocument`,
-    method: 'post',
-    data
-  })
-}
-
-// 配置-获取稽查管理列表
-export function getTrialShowInspection(data) {
-  return request({
-    url: `/Inspection/getTrialShowInspection`,
-    method: 'post',
-    data
-  })
-}
-// 配置-设置稽查管理配置
-export function setTrialShowInspection(data) {
-  return request({
-    url: `/Inspection/setTrialShowInspection`,
-    method: 'post',
-    data
-  })
 }

src/api/trials/reading.js

@@ -480,3 +480,11 @@ export function resetReadingRestTime() {
     method: 'post'
   })
 }
+// 设置随机排序
+export function setRandomTaskOrder(data) {
+  return request({
+    url: `/VisitTask/setRandomTaskOrder`,
+    method: 'post',
+    data
+  })
+}

src/components/downloadDicomAndNonedicom/index.vue

@@ -1,39 +1,19 @@
 <template>
-  <el-dialog
+  <el-dialog :visible.sync="visible" :fullscreen="true" :close-on-click-modal="false" :before-close="beforeClose"
-    :visible.sync="visible"
+    :append-to-body="true" v-loading="btnLoading" class="downloadDicomAndNonedicom">
-    :fullscreen="true"
-    :close-on-click-modal="false"
-    :before-close="beforeClose"
-    :append-to-body="true"
-    v-loading="btnLoading"
-    class="downloadDicomAndNonedicom"
-  >
     <span slot="title">{{ title }}</span>
     <div class="top">
       <span>{{ $t('download:top:title') }}</span>
       <div class="btnBox">
-        <el-button
+        <el-button type="primary" size="mini" v-if="hasDicom" @click.stop="getIRReadingDownloadStudyInfo('dicom')">
-          type="primary"
-          size="mini"
-          v-if="hasDicom"
-          @click.stop="getIRReadingDownloadStudyInfo('dicom')"
-        >
           {{ $t('download:button:downloadDicom') }}
         </el-button>
-        <el-button
+        <el-button type="primary" size="mini" v-if="hasNonedicom"
-          type="primary"
+          @click.stop="getIRReadingDownloadStudyInfo('noneDicom')">
-          size="mini"
-          v-if="hasNonedicom"
-          @click.stop="getIRReadingDownloadStudyInfo('noneDicom')"
-        >
           {{ $t('download:button:downloadNonedicom') }}
         </el-button>
-        <el-button
+        <el-button type="primary" size="mini" v-if="hasDicom || hasNonedicom"
-          type="primary"
+          @click.stop="getIRReadingDownloadStudyInfo('all')">
-          size="mini"
-          v-if="hasDicom || hasNonedicom"
-          @click.stop="getIRReadingDownloadStudyInfo('all')"
-        >
           {{ $t('download:button:downloadAll') }}
         </el-button>
       </div>
@@ -43,16 +23,9 @@
       <div v-html="$t('download:tip:message')"></div>
     </div>
     <!--上传列表@selection-change="handleSelectionChange"-->
-    <el-table
+    <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 85 }" height="100" :data="list" :loading="loading"
-      ref="dicomFilesTable"
+      class="dicomFiles-table" @sort-change="handleSortByColumn"
-      v-adaptive="{ bottomOffset: 85 }"
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
-      height="100"
-      :data="list"
-      :loading="loading"
-      class="dicomFiles-table"
-      @sort-change="handleSortByColumn"
-      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
-    >
       <!-- <el-table-column
         type="selection"
         width="55"
@@ -60,50 +33,28 @@
       /> -->
       <el-table-column type="index" width="40" />
       <!--受试者-->
-      <el-table-column
+      <el-table-column :label="$t('download:table:subjectCode')" min-width="130" prop="SubjectCode"
-        :label="$t('download:table:subjectCode')"
+        show-overflow-tooltip />
-        min-width="130"
-        prop="SubjectCode"
-        show-overflow-tooltip
-      />
       <!--任务名称-->
-      <el-table-column
+      <el-table-column :label="$t('download:table:taskName')" min-width="130" show-overflow-tooltip prop="TaskBlindName"
-        :label="$t('download:table:taskName')"
+        sortable="custom" />
-        min-width="130"
-        show-overflow-tooltip
-        prop="TaskBlindName"
-        sortable="custom"
-      />
       <!--检查类型-->
-      <el-table-column
+      <el-table-column :label="$t('download:table:studyType')" min-width="130" show-overflow-tooltip prop="IsDicom"
-        :label="$t('download:table:studyType')"
+        sortable="custom">
-        min-width="130"
-        show-overflow-tooltip
-        prop="IsDicom"
-        sortable="custom"
-      >
         <template slot-scope="scope">
           <span>{{ $fd('IsDicom', scope.row.IsDicom) }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column :label="$t('download:table:orginalStudyListNum')" min-width="150" show-overflow-tooltip>
-        :label="$t('download:table:orginalStudyListNum')"
-        min-width="150"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="
-            v-if="
+            (scope.row.IsDicom &&
-              (scope.row.IsDicom &&
+              scope.row.DicomStudyList &&
-                scope.row.DicomStudyList &&
+              scope.row.DicomStudyList.length >= 1) ||
-                scope.row.DicomStudyList.length >= 1) ||
+            (!scope.row.IsDicom &&
-              (!scope.row.IsDicom &&
+              scope.row.NoneDicomStudyList &&
-                scope.row.NoneDicomStudyList &&
+              scope.row.NoneDicomStudyList.length >= 1)
-                scope.row.NoneDicomStudyList.length >= 1)
+          " type="text" @click="handleOpenDialog(scope.row)">
-            "
-            type="text"
-            @click="handleOpenDialog(scope.row)"
-          >
             <span>{{
               scope.row.IsDicom
                 ? scope.row.DicomStudyList.length
@@ -113,37 +64,19 @@
           <span v-else>0</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column :label="$t('common:action:action')" fixed="right" width="150">
-        :label="$t('common:action:action')"
-        fixed="right"
-        width="150"
-      >
         <template slot-scope="scope">
           <!--预览--->
-          <el-button
+          <el-button circle icon="el-icon-view" :title="$t('download:button:preview')"
-            circle
+            @click.stop="preview(scope.row)" />
-            icon="el-icon-view"
-            :title="$t('download:button:preview')"
-            @click.stop="preview(scope.row)"
-          />
           <!--下载--->
-          <el-button
+          <el-button circle icon="el-icon-download" :title="$t('download:button:download')"
-            circle
+            @click.stop="getIRReadingDownloadStudyInfo('one', scope.row)" />
-            icon="el-icon-download"
-            :title="$t('download:button:download')"
-            @click.stop="getIRReadingDownloadStudyInfo('one', scope.row)"
-          />
         </template>
       </el-table-column>
     </el-table>
-    <study-view
+    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :modelList="modelList" :bodyPart="bodyPart"
-      v-if="model_cfg.visible"
+      :IsDicom="IsDicom" :visitTaskId="modelTaskId" />
-      :model_cfg="model_cfg"
-      :modelList="modelList"
-      :bodyPart="bodyPart"
-      :IsDicom="IsDicom"
-      :visitTaskId="modelTaskId"
-    />
   </el-dialog>
 </template>
 <script>
@@ -358,7 +291,8 @@ export default {
         name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
       }
       if (this.IsReadingTaskViewInOrder === 0) {
-        name = `${list[0].TaskBlindName}.zip`
+        // name = `${list[0].TaskBlindName}.zip`
+        name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
       }
       list.forEach((data) => {
         if (data.StudyList && data.StudyList.length > 0) {
@@ -370,11 +304,9 @@ export default {
                   series.InstancePathList.forEach((instance) => {
                     let fileName = instance.Path.split('/').pop()
                     let obj = {
-                      name: `${data.SubjectCode}/${
+                      name: `${data.SubjectCode}/${data.TaskBlindName
-                        data.TaskBlindName
+                        }/${this.$fd('IsDicom', true)}/${study.StudyCode
-                      }/${this.$fd('IsDicom', true)}/${
+                        }/${fileName}`,
-                        study.StudyCode
-                      }/${fileName}`,
                       url: this.OSSclientConfig.basePath + instance.Path,
                     }
                     if (this.IsReadingTaskViewInOrder === 0) {
@@ -500,10 +432,12 @@ export default {
   justify-content: space-between;
   margin: 10px 0;
 }
+
 .tip {
   display: flex;
   align-items: flex-start;
   margin-top: 5px;
+
   i {
     margin: 3px 5px 0 0;
   }

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -936,19 +936,19 @@ export default {
             ) {
               ++instanceIndex
             }
-            if (instanceIndex >= fileList.length) {
+            // if (instanceIndex >= fileList.length) {
-              fileList.push({
+            //   fileList.push({
-                instanceUid: instanceUid,
+            //     instanceUid: instanceUid,
-                file: file,
+            //     file: file,
-              })
+            //   })
-            }
+            // }
-            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
+            // scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
-            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
+            // scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
-              (prev, next) => {
+            //   (prev, next) => {
-                return prev + next.file.size
+            //     return prev + next.file.size
-              },
+            //   },
-              0
+            //   0
-            )
+            // )
 
             var seriesUid = data.string('x0020000e')
             var seriesList = scope.uploadQueues[studyIndex].seriesList
@@ -1046,6 +1046,19 @@ export default {
               }
               instanceList.push(instanceItem)
             }
+            if (instanceIndex >= fileList.length) {
+              fileList.push({
+                instanceUid: instanceUid,
+                file: file,
+              })
+            }
+            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
+            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
+              (prev, next) => {
+                return prev + next.file.size
+              },
+              0
+            )
             resolve()
           } catch (error) {
             console.log(error)

src/router/index.js

@@ -61,6 +61,12 @@ export const constantRoutes = [
     name: 'Resetpassword',
     hidden: true
   },
+  {
+    path: '/trials/trials-panel/reading/readingTracking/ReadOrder',
+    component: () => import('@/views/trials/trials-panel/reading/read-order/index'),
+    name: 'ReadOrder',
+    hidden: true
+  },
   {
     path: '/recompose',
     component: () => import('@/views/recompose/index'),

src/views/dictionary/checkConfig/index.vue

@@ -614,18 +614,6 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-show="title !== '复制'" :span="24">
-              <el-form-item>
-              <span slot="label">
-                是否默认
-              </span>
-                <el-switch
-                  v-model="form.IsDefaultChoice"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
-              </el-form-item>
-            </el-col>
             <!--分割线-->
             <el-col v-show="title !== '复制' && form.ConfigType == 'M'" :span="24">
               <el-divider content-position="left">其他信息</el-divider>
@@ -1142,7 +1130,6 @@ export default {
         DescriptionCN: null,
         InterfaceName: null,
         IsEnable: true,
-        IsDefaultChoice: true,
         ModuleTypeId: null,
         OptTypeId: null,
         ChildrenTypeId: null,

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

@@ -303,8 +303,8 @@ export default {
 
       ],
       scrollSyncInfo: { offset: 0 },
-      hideMeasureArr: []
+      hideMeasureArr: [],
-
+      isInitWwwc: true
     }
   },
   computed: {
@@ -565,7 +565,6 @@ export default {
         e.stopPropagation()
         e.preventDefault()
       } else if (this.activeToolName === 'Length' || this.activeToolName === 'Bidirectional' && this.readingTaskState < 2) {
-        console.log(e.detail.image)
         if (!e.detail.image.columnPixelSpacing || !e.detail.image.rowPixelSpacing) {
           // '该影像不具备测量长度所需的必要数据，不能进行长度测量。请选择其他工具进行标注。'
           this.$confirm(this.$t('trials:reading:warnning:msg56'), '', {
@@ -578,6 +577,13 @@ export default {
           e.stopPropagation()
           e.preventDefault()
         }
+      } else if (this.CriterionType === 21 && this.activeToolName === 'Probe' && this.readingTaskState < 2) {
+        if (!(e.detail.image.imageFrame.photometricInterpretation === 'MONOCHROME1' || e.detail.image.imageFrame.photometricInterpretation === 'MONOCHROME2')) {
+          this.$alert(this.$t('trials:MRIPDFF:message:message5'))
+          e.stopImmediatePropagation()
+          e.stopPropagation()
+          e.preventDefault()
+        }
       }
     },
     pointNearTool(e) {
@@ -668,7 +674,7 @@ export default {
     },
     sliderMousemove(e) {
       if (!this.sliderInfo.isMove) return
-      console.log('sliderMousemove')
+      // console.log('sliderMousemove')
       var PX = this.sliderInfo.oldB - (this.sliderInfo.oldM - e.clientY)
       var boxHeight = this.$refs['sliderBox'].clientHeight
       if (PX < 0) return
@@ -792,6 +798,8 @@ export default {
             } else if (toolType === 'Length') {
               // toolState.data[i].length = this.calculateLenth(toolState.data[i])
             }
+            measureData.largestPixelValue = image.imageFrame.largestPixelValue
+            measureData.imageId = imageId
             measureData.studyId = this.stack.studyId
             measureData.seriesId = this.stack.seriesId
             measureData.instanceId = instanceId
@@ -1024,6 +1032,8 @@ export default {
                 var questionInfo = this.measureData[idx]
                 // const canvas = this.canvas.querySelector('canvas')
                 // measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
+                measureData.largestPixelValue = image.imageFrame.largestPixelValue
+                measureData.imageId = imageId
                 measureData.studyId = this.stack.studyId
                 measureData.seriesId = this.stack.seriesId
                 measureData.instanceId = instanceId
@@ -1049,6 +1059,7 @@ export default {
     },
     loadImageStack(dicomSeries) {
       return new Promise(resolve => {
+        this.isInitWwwc = true
         this.isCurrentTask = dicomSeries.isCurrentTask
         this.isBaseline = dicomSeries.isBaseLineTask
         this.readingTaskState = dicomSeries.readingTaskState
@@ -1217,7 +1228,7 @@ export default {
         this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
         this.stack.instanceId = instanceId
         this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
-        // this.resetWwwc()
+        
         resolve()
       })
     },
@@ -1315,6 +1326,9 @@ export default {
         this.scrollSyncInfo.offset = 0
       }
       this.renderMeasuredData(e)
+      if (this.isInitWwwc) {
+        this.resetWwwc()
+      }
     },
     getOrientationMarker(element) {
       const enabledElement = cornerstone.getEnabledElement(element)
@@ -1351,6 +1365,8 @@ export default {
       this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
       if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') {
         const measureData = {}
+        measureData.largestPixelValue = element.image.imageFrame.largestPixelValue
+        measureData.imageId = imageId
         measureData.studyId = this.stack.studyId
         measureData.seriesId = this.stack.seriesId
         measureData.instanceId = instanceId
@@ -1368,6 +1384,8 @@ export default {
         cornerstoneTools.setToolPassiveForElement(this.canvas, e.detail.toolName)
       } else if (e.detail.toolName === 'Bidirectional') {
         const measureData = {}
+        measureData.largestPixelValue = element.image.imageFrame.largestPixelValue
+        measureData.imageId = imageId
         measureData.studyId = this.stack.studyId
         measureData.seriesId = this.stack.seriesId
         measureData.instanceId = instanceId
@@ -1384,6 +1402,8 @@ export default {
         cornerstoneTools.setToolPassiveForElement(this.canvas, e.detail.toolName)
       } else if (e.detail.toolName === 'Probe') {
         const measureData = {}
+        measureData.largestPixelValue = element.image.imageFrame.largestPixelValue
+        measureData.imageId = imageId
         measureData.studyId = this.stack.studyId
         measureData.seriesId = this.stack.seriesId
         measureData.instanceId = instanceId
@@ -1493,6 +1513,8 @@ export default {
           var questionInfo = this.measureData[idx]
           // const canvas = this.canvas.querySelector('canvas')
           // measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
+          measureData.largestPixelValue = element.image.imageFrame.largestPixelValue
+          measureData.imageId = imageId
           measureData.studyId = this.stack.studyId
           measureData.seriesId = this.stack.seriesId
           measureData.instanceId = instanceId
@@ -1684,6 +1706,8 @@ export default {
     },
 
     resetWwwc() {
+      // console.log('resetWwwc')
+      this.isInitWwwc = true
       this.toolState.viewportInvert = false
       var viewport = cornerstone.getViewport(this.canvas)
       // viewport.invert = false
@@ -1694,7 +1718,7 @@ export default {
     },
 
     setWwwc(ww, wc) {
-      // console.log('setWwwc', ww, wc)
+      this.isInitWwwc = false
       var viewport = cornerstone.getViewport(this.canvas)
       viewport.voi.windowWidth = ww
       viewport.voi.windowCenter = wc

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

@@ -8,39 +8,27 @@
           <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">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
-            <i
+            placement="bottom">
-              class="el-icon-refresh-left"
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
-              @click="resetMeasuredData"
-            />
           </el-tooltip>
         </div>
       </div>
 
       <!-- 影像质量问题 -->
       <div class="lesions">
-        <Questions
+        <Questions ref="ecrf" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-          ref="ecrf"
+          :group-classify="1" />
-          :question-form-change-state="true"
-          :question-form-change-num="0"
-          :is-qulity-issues="false"
-          :group-classify="1"
-        />
       </div>
-
       <!-- 测量问题 -->
       <template v-if="questions.length > 0">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper" style="margin-bottom: 10px">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper"
+          style="margin-bottom: 10px">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
-            <el-form
+            <el-form v-if="questions.length > 0" :ref="`questions${index}`" size="small" :model="questionForm">
-              v-if="questions.length > 0"
-              :ref="`questions${index}`"
-              size="small"
-              :model="questionForm"
-            >
               <div class="table-wrapper">
                 <div v-for="item in qs.Childrens" :key="item.Id">
                   <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
@@ -52,34 +40,25 @@
                       <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType)">
                         <i class="el-icon-upload2" />
                       </div>
-                      <div class="add-icon" @click.prevent="handleAddOrEdit('add',item)">
+                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
                         <i class="el-icon-plus" />
                       </div>
                     </div>
 
                   </div>
-                  <el-table
+                  <el-table v-if="item.Type === 'basicTable' && item.TableQuestions" :ref="item.Id"
-                    v-if="item.Type === 'basicTable' && item.TableQuestions"
+                    :data="item.TableQuestions.Answers">
-                    :ref="item.Id"
-                    :data="item.TableQuestions.Answers"
-                  >
                     <!-- <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
                       <template slot-scope="scope">
                         {{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
                       </template>
-                    </el-table-column> -->
+</el-table-column> -->
                     <!-- <el-table-column
                       type="index"
                       width="40px"
                     /> -->
-                    <el-table-column
+                    <el-table-column v-for="q of item.TableQuestions.Questions" :key="q.Id" :prop="q.Id"
-                      v-for="q of item.TableQuestions.Questions"
+                      :label="q.QuestionName" show-overflow-tooltip :render-header="renderHeader">
-                      :key="q.Id"
-                      :prop="q.Id"
-                      :label="q.QuestionName"
-                      show-overflow-tooltip
-                      :render-header="renderHeader"
-                    >
                       <template slot-scope="scope">
                         <span v-if="q.Unit > 0 && !isNaN(parseFloat(scope.row[q.Id]))">
                           {{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
@@ -92,14 +71,10 @@
                         </span>
                       </template>
                     </el-table-column>
-                    <el-table-column
+                    <el-table-column v-if="readingTaskState < 2 && item.LesionType === 102"
-                      v-if="readingTaskState < 2 && item.LesionType === 102"
+                      :label="$t('common:action:action')" width="90px" fixed="right">
-                      :label="$t('common:action:action')"
-                      width="90px"
-                      fixed="right"
-                    >
                       <template slot-scope="scope">
-                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit',item, scope.$index)">
+                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit', item, scope.$index)">
                           {{ $t('common:button:edit') }}
                         </el-button>
                         <el-button type="text" size="mini" @click="handleDelete(item, scope.$index)">
@@ -111,41 +86,57 @@
 
                   <template v-else>
                     <!-- 数值 -->
-                    <el-form-item
+                    <el-form-item v-if="item.ShowQuestion !== 2" :key="item.Id" :label="`${item.QuestionName}`"
-                      v-if="item.ShowQuestion!==2"
+                      :prop="item.Id" :rules="[
-                      :key="item.Id"
+                        {
-                      :label="`${item.QuestionName}`"
+                          required: (item.IsRequired === 0 || (item.IsRequired === 1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type !== 'group' && item.Type !== 'summary',
-                      :prop="item.Id"
+                          message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
-                      :rules="[
+                        },
-                        { required: (item.IsRequired === 0 || (item.IsRequired ===1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type!=='group' && item.Type!=='summary',
+                      ]">
-                          message:['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
-                      ]"
-                    >
                       <!-- 数值类型 -->
-                      <template v-if="item.Type==='textarea'">
+                      <template v-if="item.Type === 'textarea'">
-                        <el-input
+                        <el-input v-model="questionForm[item.Id]" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
-                          v-model="questionForm[qs.Id]"
+                          :disabled="!isCurrentTask || readingTaskState >= 2"
-                          type="textarea"
+                          @change="((val) => { formItemChange(val, item) })" />
-                          :autosize="{ minRows: 2, maxRows: 4}"
+                      </template>
-                          :disabled="!isCurrentTask || readingTaskState>=2"
+                      <template v-if="item.Type === 'number'">
-                          @change="((val)=>{formItemChange(val, qs)})"
+                        <el-input-number v-model="questionForm[item.Id]"
-                        />
+                          :disabled="!isCurrentTask || readingTaskState >= 2" :precision="0"
+                          @change="((val) => { formItemChange(val, item) })" />
+                      </template>
+                      <template v-if="item.Type === 'select'">
+                        <el-select v-model="questionForm[item.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
+                          @change="((val) => { formItemChange(val, item) })">
+                          <el-option v-for="dict of $d[item.DictionaryCode]" :key="dict.id" :value="String(dict.value)"
+                            :label="dict.label" />
+                        </el-select>
                       </template>
                     </el-form-item>
+                    <template v-if="item.Childrens && item.Childrens.length > 0">
+                      <template v-for="child in item.Childrens">
+                        <el-form-item :key="child.Id"
+                          v-if="(child.ShowQuestion === 1 && child.ParentTriggerValueList.includes(String(questionForm[item.Id]))) || child.ShowQuestion === 0"
+                          :label="`${child.QuestionName}`" :prop="child.Id" :rules="[
+                            {
+                              required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && (child.RelevanceValue.includes(questionForm[child.RelevanceId])))) && child.Type !== 'group' && child.Type !== 'summary',
+                              message: ['radio', 'select', 'checkbox'].includes(child.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+                            },
+                          ]">
+                          <template v-if="child.Type === 'input'">
+                            <el-input v-model="questionForm[child.Id]"
+                              :disabled="!isCurrentTask || readingTaskState >= 2"
+                              @change="((val) => { formItemChange(val, child) })" />
+                          </template>
+                        </el-form-item>
+                      </template>
+
+                    </template>
                   </template>
                 </div>
-                <div
+                <div v-if="isCurrentTask && readingTaskState < 2 && (qs.GroupClassify === 5 || qs.GroupClassify === 6)"
-                  v-if="isCurrentTask && readingTaskState<2 && qs.GroupClassify === 5"
+                  class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-                  class="base-dialog-footer"
-                  style="text-align:right;margin-top:10px;"
-                >
                   <!-- 保存 -->
-                  <el-button
+                  <el-button type="primary" size="mini" :disabled="!formChanged" @click="handleSave(index)">
-                    type="primary"
-                    size="mini"
-                    :disabled="!formChanged"
-                    @click="handleSave(index)"
-                  >
                     {{ $t('common:button:save') }}
                   </el-button>
                 </div>
@@ -156,51 +147,21 @@
       </template>
 
       <!-- 计算值 -->
-      <Questions
+      <Questions ref="ecrf2" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        ref="ecrf2"
+        :group-classify="4" style="margin-top:20px" />
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :is-qulity-issues="false"
-        :group-classify="4"
-        style="margin-top:20px"
-      />
 
       <!-- 评估结果 -->
-      <Questions
+      <Questions ref="ecrf3" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        ref="ecrf3"
+        :group-classify="5" />
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :is-qulity-issues="false"
-        :group-classify="5"
-      />
       <!-- 新增、编辑弹窗 -->
-      <el-dialog
+      <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
-        v-if="addOrEdit.visible"
+        :title="addOrEdit.title" width="500px">
-        :visible.sync="addOrEdit.visible"
+        <el-form ref="tableQsForm" v-loading="loading" :model="qsForm" size="small">
-        :close-on-click-modal="false"
+          <QuestionTableFormItem v-for="item in qsList" :key="item.Id" :question="item" :question-form="qsForm"
-        :title="addOrEdit.title"
+            :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
-        width="500px"
+            @resetFormItemData="resetFormItemData" />
-      >
-        <el-form
-          ref="tableQsForm"
-          v-loading="loading"
-          :model="qsForm"
-          size="small"
-        >
-          <QuestionTableFormItem
-            v-for="item in qsList"
-            :key="item.Id"
-            :question="item"
-            :question-form="qsForm"
-            :reading-task-state="readingTaskState"
-            @setFormItemData="setFormItemData"
-            @resetFormItemData="resetFormItemData"
-          />
           <el-form-item style="text-align: right">
-            <el-button
+            <el-button size="small" @click="addOrEdit.visible = false">
-              size="small"
-              @click="addOrEdit.visible = false"
-            >
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 保存 -->
@@ -211,17 +172,9 @@
         </el-form>
       </el-dialog>
       <!-- 导入 -->
-      <el-dialog
+      <el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
-        v-if="upload.visible"
+        :title="upload.title" width="500px">
-        :visible.sync="upload.visible"
+        <UploadExcel :visit-task-id="visitTaskId" @close="uploadDlgClose" />
-        :close-on-click-modal="false"
-        :title="upload.title"
-        width="500px"
-      >
-        <UploadExcel
-          :visit-task-id="visitTaskId"
-          @close="uploadDlgClose"
-        />
       </el-dialog>
     </div>
   </div>
@@ -485,8 +438,22 @@ export default {
     setMeasuredData(measureData) {
 
     },
-    formItemChange() {
+    formItemChange(val, item) {
       this.formChanged = true
+      if (item.Type === 'number') {
+        this.limitBlur(item.Id, item.ValueType)
+      }
+      if (question.Childrens.length > 0) {
+        this.resetChild(question.Childrens)
+      }
+    },
+    resetChild(obj) {
+      obj.forEach(i => {
+        this.resetData(i.Id)
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.resetChild(i.Childrens)
+        }
+      })
     },
     limitBlur(qId, valueType) {
       const value = this.questionForm[qId]
@@ -523,7 +490,7 @@ export default {
         answers: answers
       }
       try {
-        await saveTaskQuestion(8, params)
+        await saveTaskQuestion(12, params)
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         loading.close()
         DicomEvent.$emit('getReportInfo', true)
@@ -578,6 +545,9 @@ export default {
     },
     receiveMsg(event) {
     },
+    resetData(v) {
+      this.questionForm[v] = null
+    },
     resetFormItemData(v) {
       this.qsForm[v] = null
     },
@@ -730,21 +700,25 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
-  .container{
+
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -752,14 +726,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     display: inline-block;
     padding: 5px;
     font-weight: bold;
@@ -769,103 +745,123 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
-    ::v-deep .el-form-item__label{
+
+    ::v-deep .el-form-item__label {
       color: #c3c3c3;
       text-align: left;
     }
-    ::v-deep .el-input .el-input__inner{
+
+    ::v-deep .el-input .el-input__inner {
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-    ::v-deep .el-textarea__inner{
+
+    ::v-deep .el-textarea__inner {
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-    ::v-deep .el-form-item{
+
+    ::v-deep .el-form-item {
       display: flex;
       flex-direction: column;
       justify-content: flex-start;
     }
-    ::v-deep .el-form-item__content{
+
+    ::v-deep .el-form-item__content {
       flex: 1;
     }
-    ::v-deep .el-input.is-disabled .el-input__inner{
+
-      background-color: #646464a1;
+    ::v-deep .el-input.is-disabled .el-input__inner {
-    }
-    ::v-deep .el-select.is-disabled .el-input__inner{
       background-color: #646464a1;
     }
 
-    .el-form-item__content
+    ::v-deep .el-select.is-disabled .el-input__inner {
-    .el-select{
+      background-color: #646464a1;
+    }
+
+    .el-form-item__content .el-select {
       width: 100%;
     }
   }
+
   .table-wrapper {
     ::-webkit-scrollbar {
       width: 5px;
       height: 8px;
     }
+
     ::-webkit-scrollbar-thumb {
       border-radius: 10px;
       background: #d0d0d0;
     }
+
     ::v-deep .el-table,
     .el-table__expanded-cell {
       background-color: #000;
       color: #fff;
       border-color: #444444;
     }
+
     ::v-deep .el-table th,
     .el-table tr {
       background-color: #000;
       color: #fff;
       border-color: #444444;
     }
-    ::v-deep .el-table__body tr > td {
+
+    ::v-deep .el-table__body tr>td {
       background-color: #000 !important;
       color: #fff;
       border-color: #444444;
     }
-    ::v-deep .el-table__body tr:hover > td {
+
+    ::v-deep .el-table__body tr:hover>td {
       background-color: #858282 !important;
       color: #fff;
       border-color: #444444;
     }
+
     ::v-deep .el-table--border th.gutter:last-of-type {
       border: none;
     }
+
     ::v-deep .el-table__fixed-right {
       height: 100% !important;
     }
+
     // ::v-deep .el-table .cell {
     //   line-height: 20px;
     // }
     ::v-deep .el-table__cell {
       padding: 5px 0;
     }
+
     ::v-deep.el-table__fixed-right-patch {
       background-color: #000 !important;
       border-color: #444444;
     }
-    ::v-deep.el-table__fixed-body-wrapper tr:hover > td {
+
+    ::v-deep.el-table__fixed-body-wrapper tr:hover>td {
       background-color: #000 !important;
     }
+
     ::v-deep.el-table--scrollable-x .el-table__body-wrapper {
       z-index: 2;
     }

src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue

@@ -205,6 +205,7 @@
 import { saveTableQuestionMark, submitTaskRowInfo, deleteTableQuestionMark, deleteSingleTableQuestionMark } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
+import * as cornerstone from 'cornerstone-core'
 export default {
   name: 'MeasurementForm',
   props: {
@@ -444,7 +445,12 @@ export default {
           // 维护标记信息
           measureData.data.remark = this.getLesionName(this.orderMark, this.activeQuestionMark)
         }
-        const val = measureData.data.cachedStats.mean / 10
+        // const val = measureData.data.cachedStats.mean / 10
+        let val = parseFloat(measureData.data.cachedStats.mean)
+        // let imagePixelModule = cornerstone.metaData.get('imagePixelModule', measureData.imageId)
+        if (measureData.largestPixelValue >= 500) {
+          val = val / 10
+        }
         this.$set(this.questionForm, measureData.tableQuestionId, val.toFixed(this.digitPlaces))
         data = {
           Id: '',
@@ -574,14 +580,26 @@ export default {
         let params = {}
         if (i > -1 && this.markList[i].measureData && this.markList[i].measureData.MeasureData) {
           const measureData = this.markList[i].measureData.MeasureData
+          const tableQuestionId = this.markList[i].tableQuestionId
+          if (this.questionForm[tableQuestionId] > 100) {
+            const confirm = await this.$confirm(
+              this.$t('trials:MRIPDFF:message:message4'),
+              {
+                type: 'warning',
+                distinguishCancelAndClose: true
+              }
+            )
+            if (confirm !== 'confirm') return
+          }
           // 上传截图
+          
           DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: measureData.OrderMarkName, lesionType: null, isMarked: !!measureData }, async val => {
             params = Object.assign({}, this.markList[i].measureData)
             if (val) {
               const pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
               params.PicturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
             }
-            const tableQuestionId = this.markList[i].tableQuestionId
+            
             params.Answer = this.questionForm[tableQuestionId]
             params.MeasureData = JSON.stringify(this.markList[i].measureData.MeasureData)
             loading.close()

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

@@ -264,7 +264,6 @@ export default {
         if (item.Type === 'table' && item.Id === obj.questionId) {
           var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
           item.TableQuestions.Answers[idx].isMeasurable = obj.isMeasurable
-          console.log(obj.isMeasurable)
           item.TableQuestions.Answers[idx].mean = obj.mean
           item.TableQuestions.Answers[idx].saveTypeEnum = obj.saveTypeEnum
 

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

@@ -7,39 +7,28 @@
           <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">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
-            <i
+            placement="bottom">
-              class="el-icon-refresh-left"
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
-              @click="resetMeasuredData"
-            />
           </el-tooltip>
         </div>
       </div>
 
       <!-- 影像质量问题 -->
       <div class="lesions">
-        <Questions
+        <Questions ref="ecrf" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-          ref="ecrf"
+          :group-classify="1" />
-          :question-form-change-state="true"
-          :question-form-change-num="0"
-          :is-qulity-issues="false"
-          :group-classify="1"
-        />
       </div>
 
       <!-- 测量问题 -->
       <template v-if="questions.length > 0">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper" style="margin-bottom: 10px">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper"
+          style="margin-bottom: 10px">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
-            <el-form
+            <el-form v-if="questions.length > 0" :ref="`questions${index}`" size="small" :model="questionForm">
-              v-if="questions.length > 0"
-              :ref="`questions${index}`"
-              size="small"
-              :model="questionForm"
-            >
               <div class="table-wrapper">
                 <div v-for="item in qs.Childrens" :key="item.Id">
                   <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
@@ -51,35 +40,25 @@
                       <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType)">
                         <i class="el-icon-upload2" />
                       </div>
-                      <div class="add-icon" @click.prevent="handleAddOrEdit('add',item)">
+                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
                         <i class="el-icon-plus" />
                       </div>
                     </div>
 
                   </div>
-                  <el-table
+                  <el-table v-if="item.Type === 'basicTable' && item.TableQuestions" :ref="item.Id"
-                    v-if="item.Type === 'basicTable' && item.TableQuestions"
+                    :data="item.TableQuestions.Answers" max-height="600">
-                    :ref="item.Id"
-                    :data="item.TableQuestions.Answers"
-                    max-height="600"
-                  >
                     <!-- <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
                       <template slot-scope="scope">
                         {{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
                       </template>
-                    </el-table-column> -->
+</el-table-column> -->
                     <!-- <el-table-column
                       type="index"
                       width="40px"
                     /> -->
-                    <el-table-column
+                    <el-table-column v-for="q of item.TableQuestions.Questions" :key="q.Id" :prop="q.Id"
-                      v-for="q of item.TableQuestions.Questions"
+                      :label="q.QuestionName" show-overflow-tooltip :render-header="renderHeader">
-                      :key="q.Id"
-                      :prop="q.Id"
-                      :label="q.QuestionName"
-                      show-overflow-tooltip
-                      :render-header="renderHeader"
-                    >
                       <template slot-scope="scope">
                         <span v-if="q.Unit > 0 && !isNaN(parseFloat(scope.row[q.Id]))">
                           {{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
@@ -92,17 +71,14 @@
                         </span>
                       </template>
                     </el-table-column>
-                    <el-table-column
+                    <el-table-column v-if="readingTaskState < 2" :label="$t('common:action:action')" width="90px"
-                      v-if="readingTaskState < 2"
+                      fixed="right">
-                      :label="$t('common:action:action')"
-                      width="90px"
-                      fixed="right"
-                    >
                       <template slot-scope="scope">
-                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit',item, scope.$index)">
+                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit', item, scope.$index)">
                           {{ $t('common:button:edit') }}
                         </el-button>
-                        <el-button v-if="item.LesionType === 112 || item.LesionType === 111" type="text" size="mini" @click="handleDelete(item, scope.$index)">
+                        <el-button v-if="item.LesionType === 112 || item.LesionType === 111" type="text" size="mini"
+                          @click="handleDelete(item, scope.$index)">
                           {{ $t('common:button:delete') }}
                         </el-button>
                       </template>
@@ -111,41 +87,52 @@
 
                   <template v-else>
                     <!-- 数值 -->
-                    <el-form-item
+                    <el-form-item v-if="item.ShowQuestion !== 2" :key="item.Id" :label="`${item.QuestionName}`"
-                      v-if="item.ShowQuestion!==2"
+                      :prop="item.Id" :rules="[
-                      :key="item.Id"
+                        {
-                      :label="`${item.QuestionName}`"
+                          required: (item.IsRequired === 0 || (item.IsRequired === 1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type !== 'group' && item.Type !== 'summary',
-                      :prop="item.Id"
+                          message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
-                      :rules="[
+                        },
-                        { required: (item.IsRequired === 0 || (item.IsRequired ===1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type!=='group' && item.Type!=='summary',
+                      ]">
-                          message:['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
-                      ]"
-                    >
                       <!-- 数值类型 -->
-                      <template v-if="item.Type==='textarea'">
+                      <template v-if="item.Type === 'textarea'">
-                        <el-input
+                        <el-input v-model="questionForm[item.Id]" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
-                          v-model="questionForm[qs.Id]"
+                          :disabled="!isCurrentTask || readingTaskState >= 2"
-                          type="textarea"
+                          @change="((val) => { formItemChange(val, item) })" />
-                          :autosize="{ minRows: 2, maxRows: 4}"
+                      </template>
-                          :disabled="!isCurrentTask || readingTaskState>=2"
+                      <template v-if="item.Type === 'select'">
-                          @change="((val)=>{formItemChange(val, qs)})"
+                        <el-select v-model="questionForm[item.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
-                        />
+                          @change="((val) => { formItemChange(val, item) })">
+                          <el-option v-for="dict of $d[item.DictionaryCode]" :key="dict.id" :value="String(dict.value)"
+                            :label="dict.label" />
+                        </el-select>
                       </template>
                     </el-form-item>
+                    <template v-if="item.Childrens && item.Childrens.length > 0">
+                      <template v-for="child in item.Childrens">
+                        <el-form-item :key="child.Id"
+                          v-if="(child.ShowQuestion === 1 && child.ParentTriggerValueList.includes(String(questionForm[item.Id]))) || child.ShowQuestion === 0"
+                          :label="`${child.QuestionName}`" :prop="child.Id" :rules="[
+                            {
+                              required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && (child.RelevanceValue.includes(questionForm[child.RelevanceId])))) && child.Type !== 'group' && child.Type !== 'summary',
+                              message: ['radio', 'select', 'checkbox'].includes(child.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+                            },
+                          ]">
+                          <template v-if="child.Type === 'input'">
+                            <el-input v-model="questionForm[child.Id]"
+                              :disabled="!isCurrentTask || readingTaskState >= 2"
+                              @change="((val) => { formItemChange(val, child) })" />
+                          </template>
+                        </el-form-item>
+                      </template>
+
+                    </template>
                   </template>
                 </div>
-                <div
+                <div v-if="isCurrentTask && readingTaskState < 2 && (qs.GroupClassify === 5 || qs.GroupClassify === 6)"
-                  v-if="isCurrentTask && readingTaskState<2 && qs.GroupClassify === 5"
+                  class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-                  class="base-dialog-footer"
-                  style="text-align:right;margin-top:10px;"
-                >
                   <!-- 保存 -->
-                  <el-button
+                  <el-button type="primary" size="mini" :disabled="!formChanged" @click="handleSave(index)">
-                    type="primary"
-                    size="mini"
-                    :disabled="!formChanged"
-                    @click="handleSave(index)"
-                  >
                     {{ $t('common:button:save') }}
                   </el-button>
                 </div>
@@ -156,50 +143,20 @@
       </template>
 
       <!-- 计算值 -->
-      <Questions
+      <Questions ref="ecrf2" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        ref="ecrf2"
+        :group-classify="4" style="margin-top:20px" />
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :is-qulity-issues="false"
-        :group-classify="4"
-        style="margin-top:20px"
-      />
 
       <!-- 评估结果 -->
-      <Questions
+      <Questions ref="ecrf3" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        ref="ecrf3"
+        :group-classify="5" />
-        :question-form-change-state="true"
+      <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
-        :question-form-change-num="0"
+        :title="addOrEdit.title" width="500px">
-        :is-qulity-issues="false"
+        <el-form ref="tableQsForm" v-loading="loading" :model="qsForm" size="small">
-        :group-classify="5"
+          <QuestionTableFormItem v-for="item in qsList" :key="item.Id" :question="item" :question-form="qsForm"
-      />
+            :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
-      <el-dialog
+            @resetFormItemData="resetFormItemData" />
-        v-if="addOrEdit.visible"
-        :visible.sync="addOrEdit.visible"
-        :close-on-click-modal="false"
-        :title="addOrEdit.title"
-        width="500px"
-      >
-        <el-form
-          ref="tableQsForm"
-          v-loading="loading"
-          :model="qsForm"
-          size="small"
-        >
-          <QuestionTableFormItem
-            v-for="item in qsList"
-            :key="item.Id"
-            :question="item"
-            :question-form="qsForm"
-            :reading-task-state="readingTaskState"
-            @setFormItemData="setFormItemData"
-            @resetFormItemData="resetFormItemData"
-          />
           <el-form-item style="text-align: right">
-            <el-button
+            <el-button size="small" @click="addOrEdit.visible = false">
-              size="small"
-              @click="addOrEdit.visible = false"
-            >
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 保存 -->
@@ -210,18 +167,9 @@
         </el-form>
       </el-dialog>
       <!-- 导入 -->
-      <el-dialog
+      <el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
-        v-if="upload.visible"
+        :title="upload.title" width="500px">
-        :visible.sync="upload.visible"
+        <UploadExcel :visit-task-id="visitTaskId" :lesion-type="upload.lesionType" @close="uploadDlgClose" />
-        :close-on-click-modal="false"
-        :title="upload.title"
-        width="500px"
-      >
-        <UploadExcel
-          :visit-task-id="visitTaskId"
-          :lesion-type="upload.lesionType"
-          @close="uploadDlgClose"
-        />
       </el-dialog>
     </div>
   </div>
@@ -486,8 +434,22 @@ export default {
     setMeasuredData(measureData) {
 
     },
-    formItemChange() {
+    formItemChange(val, question) {
       this.formChanged = true
+      if (item.Type === 'number') {
+        this.limitBlur(item.Id, item.ValueType)
+      }
+      if (question.Childrens.length > 0) {
+        this.resetChild(question.Childrens)
+      }
+    },
+    resetChild(obj) {
+      obj.forEach(i => {
+        this.resetData(i.Id)
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.resetChild(i.Childrens)
+        }
+      })
     },
     limitBlur(qId, valueType) {
       const value = this.questionForm[qId]
@@ -521,7 +483,7 @@ export default {
         answers: answers
       }
       try {
-        await saveTaskQuestion(8, params)
+        await saveTaskQuestion(12, params)
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         loading.close()
         DicomEvent.$emit('getReportInfo', true)
@@ -576,6 +538,9 @@ export default {
     },
     receiveMsg(event) {
     },
+    resetData(v) {
+      this.questionForm[v] = null
+    },
     resetFormItemData(v) {
       this.qsForm[v] = null
     },
@@ -741,23 +706,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
-  .container{
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -765,14 +733,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     display: inline-block;
     padding: 5px;
     font-weight: bold;
@@ -782,103 +752,123 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
-    ::v-deep .el-form-item__label{
+
+    ::v-deep .el-form-item__label {
       color: #c3c3c3;
       text-align: left;
     }
-    ::v-deep .el-input .el-input__inner{
+
+    ::v-deep .el-input .el-input__inner {
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-    ::v-deep .el-textarea__inner{
+
+    ::v-deep .el-textarea__inner {
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-    ::v-deep .el-form-item{
+
+    ::v-deep .el-form-item {
       display: flex;
       flex-direction: column;
       justify-content: flex-start;
     }
-    ::v-deep .el-form-item__content{
+
+    ::v-deep .el-form-item__content {
       flex: 1;
     }
-    ::v-deep .el-input.is-disabled .el-input__inner{
+
-      background-color: #646464a1;
+    ::v-deep .el-input.is-disabled .el-input__inner {
-    }
-    ::v-deep .el-select.is-disabled .el-input__inner{
       background-color: #646464a1;
     }
 
-    .el-form-item__content
+    ::v-deep .el-select.is-disabled .el-input__inner {
-    .el-select{
+      background-color: #646464a1;
+    }
+
+    .el-form-item__content .el-select {
       width: 100%;
     }
   }
+
   .table-wrapper {
     ::-webkit-scrollbar {
       width: 5px;
       height: 8px;
     }
+
     ::-webkit-scrollbar-thumb {
       border-radius: 10px;
       background: #d0d0d0;
     }
+
     ::v-deep .el-table,
     .el-table__expanded-cell {
       background-color: #000;
       color: #fff;
       border-color: #444444;
     }
+
     ::v-deep .el-table th,
     .el-table tr {
       background-color: #000;
       color: #fff;
       border-color: #444444;
     }
-    ::v-deep .el-table__body tr > td {
+
+    ::v-deep .el-table__body tr>td {
       background-color: #000 !important;
       color: #fff;
       border-color: #444444;
     }
-    ::v-deep .el-table__body tr:hover > td {
+
+    ::v-deep .el-table__body tr:hover>td {
       background-color: #858282 !important;
       color: #fff;
       border-color: #444444;
     }
+
     ::v-deep .el-table--border th.gutter:last-of-type {
       border: none;
     }
+
     ::v-deep .el-table__fixed-right {
       height: 100% !important;
     }
+
     // ::v-deep .el-table .cell {
     //   line-height: 20px;
     // }
     ::v-deep .el-table__cell {
       padding: 5px 0;
     }
+
     ::v-deep.el-table__fixed-right-patch {
       background-color: #000 !important;
       border-color: #444444;
     }
-    ::v-deep.el-table__fixed-body-wrapper tr:hover > td {
+
+    ::v-deep.el-table__fixed-body-wrapper tr:hover>td {
       background-color: #000 !important;
     }
+
     ::v-deep.el-table--scrollable-x .el-table__body-wrapper {
       z-index: 2;
     }

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

@@ -69,6 +69,10 @@
         :rules="[
           { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (question.RelevanceValueList.includes(isNaN(parseFloat(questionForm[question.RelevanceId])) ? questionForm[question.RelevanceId] : questionForm[question.RelevanceId].toString())))) && question.Type!=='group' && question.Type!=='summary',
             message: $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+            {
+              validator: question.Type === 'number' && !question.TypeValue ? validatorNumberInput :(rule,value,callback )=>{callback()},
+              trigger: ['blur', 'change']
+            }
         ]"
         :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
       >
@@ -228,11 +232,12 @@
           />
         </el-select>
         <el-input
-          type="number"
+          type="text"
           v-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
           @change="(val) => { formItemNumberChange(val, question) }"
+          @input="numberInput(question.Id)"
           @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          v-model="questionForm[question.Id]"
+          v-model.trim="questionForm[question.Id]"
           :disabled="readingTaskState === 2"
         >
           <!-- <template slot="append">1</template> -->
@@ -240,11 +245,12 @@
           <template slot="append" v-else-if="question.ValueType === 2">%</template>
         </el-input>
         <el-input
-          type="number"
+          type="text"
+          @input="numberInput(question.Id)"
           v-if="question.Type === 'number' && !question.TypeValue && question.DataSource === 1"
           @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
           :disabled="question.DataSource === 1 || readingTaskState === 2"
-          v-model="questionForm[question.Id]"
+          v-model.trim="questionForm[question.Id]"
         >
           <!-- <template slot="append">2</template> -->
           <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
@@ -502,6 +508,21 @@ export default {
     }
   },
   methods: {
+    numberInput(id) {
+      this.questionForm[id] = this.questionForm[id].toUpperCase();
+    },
+    validatorNumberInput(rule, value, callback) {
+      let reg = new RegExp(/^(?:-?(?:(?:0|[1-9]\d*)(?:\.\d+)?|\.\d+)|NE)$/, 'g')
+       if (value === '') {
+          callback(new Error(this.$t('common:ruleMessage:specify')));
+        } else {
+          if (!reg.test(value)) {
+            callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));
+          }else{
+            callback();
+          }
+        }
+    },
     limitInput(value, a, b) {
       if (value.indexOf('.') > -1) {
         if (value.split('.')[1].length >= this.digitPlaces) {
@@ -510,7 +531,10 @@ export default {
       }
     },
     handleBlur(value, a, b) {
-      this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
+      if (!value) return false
+      if(!isNaN(parseFloat(value))) {
+        this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
+      }
     },
     deleteTableCol(row, index) {
       this.$confirm(this.$t('trials:uploadNonDicoms:message:msg1')).then(() => {
@@ -1085,8 +1109,6 @@ export default {
     flex-direction: row;
     align-items: flex-start;
   }
-  ::v-deep .el-form-item__content{
-  }
   .el-input{
     width:100%;
   }

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

@@ -7,6 +7,10 @@
         :rules="[
           { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))) && question.Type!=='group' && question.Type!=='summary',
             message:  $t('common:ruleMessage:select'), trigger: ['blur', 'change']},
+          {
+            validator: question.Type === 'number' && !question.TypeValue ? validatorNumberInput :(rule,value,callback )=>{callback()},
+            trigger: ['blur', 'change']
+          }
         ]"
         :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
       >
@@ -144,21 +148,23 @@
         <!-- 数值 -->
         <!-- :precision="2" :step="0.1" :max="10" -->
         <el-input
-          type="number"
+          type="text"
           v-if="question.Type === 'number' && question.DataSource !== 1"
           :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
           @change="((val)=>{formItemNumberChange(val, question)})"
+          @input="numberInput(question.Id)"
           @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          v-model="questionForm[question.Id]"
+          v-model.trim="questionForm[question.Id]"
         >
           <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
         </el-input>
         <el-input
-          type="number"
+          type="text"
           v-if="question.Type === 'number' && question.DataSource === 1"
           :disabled="question.DataSource === 1"
+          @input="numberInput(question.Id, true )"
           @blur="handleCalculationBlur(calculationValue)"
-          v-model="calculationValue"
+          v-model.trim="calculationValue"
         >
           <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
         </el-input>
@@ -331,7 +337,6 @@ export default {
           this.fileList.push({ name: '', url: `${url}` })
         })
       }
-      console.log('11')
     }
     if (this.type === 'edit') return
     // if (this.question.Type === 'number') {
@@ -342,6 +347,25 @@ export default {
     // }
   },
   methods: {
+    numberInput(id,notId = false) {
+      if(notId ) {
+        this.calculationValue = this.calculationValue.toUpperCase();
+      }else {
+        this.questionForm[id] = this.questionForm[id].toUpperCase();
+      }
+    },
+    validatorNumberInput(rule, value, callback) {
+      let reg = new RegExp(/^(?:-?(?:(?:0|[1-9]\d*)(?:\.\d+)?|\.\d+)|NE)$/, 'g')
+       if (value === '') {
+          callback(new Error(this.$t('common:ruleMessage:specify')));
+        } else {
+          if (!reg.test(value)) {
+            callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));
+          }else{
+            callback();
+          }
+        }
+    },
     save() {
     },
     openAddTableCol(row) {
@@ -382,10 +406,17 @@ export default {
       }
     },
     handleBlur(value, a, b) {
-      this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
+      if (!value) return false
+      if(!isNaN(parseFloat(value))) {
+        this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
+      }
+      // this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
     },
     handleCalculationBlur(v) {
-      this.calculationValue = parseFloat(v).toFixed(this.digitPlaces)
+      if (!v) return false
+      if(!isNaN(parseFloat(v))) {
+        this.calculationValue = parseFloat(v).toFixed(this.digitPlaces)
+      }
     },
     limitInput(value, q) {
       console.log(value)

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

@@ -137,7 +137,7 @@ export default {
             this.classArr.push({triggerId: v.ClassifyQuestionId, classId: v.Id, classifyAlgorithms: v.ClassifyAlgorithms, classifyType: v.ClassifyType})
           }
           if (v.Type === 'number') {
-            this.$set(this.questionForm, v.Id, v.Answer === '' ? '' : parseFloat(v.Answer).toFixed(this.digitPlaces))
+            this.$set(this.questionForm, v.Id, isNaN(parseFloat(v.Answer)) ? v.Answer : parseFloat(v.Answer).toFixed(this.digitPlaces))
           }
           if (v.Childrens.length > 0) {
             this.setChild(v.Childrens)
@@ -191,7 +191,7 @@ export default {
               this.$set(this.questionForm, v.Id, v.TableQuestions.Answers)
             }
             if (v.Type === 'number') {
-              this.$set(this.questionForm, v.Id, v.Answer === '' ? '' : parseFloat(v.Answer).toFixed(this.digitPlaces))
+              this.$set(this.questionForm, v.Id, isNaN(parseFloat(v.Answer)) ? v.Answer : parseFloat(v.Answer).toFixed(this.digitPlaces))
             }
             if (v.Childrens.length > 0) {
               this.setChild(v.Childrens)
@@ -212,7 +212,7 @@ export default {
           i.TableQuestions.Questions.forEach(o => {
             if (o.Type === 'number') {
               i.TableQuestions.Answers.forEach((ite, index) => {
-                this.$set(i.TableQuestions.Answers[index], o.Id, i.TableQuestions.Answers[index][o.Id] ? parseFloat(i.TableQuestions.Answers[index][o.Id]).toFixed(this.digitPlaces) : null)
+                this.$set(i.TableQuestions.Answers[index], o.Id, isNaN(parseFloat(i.TableQuestions.Answers[index][o.Id])) ? i.TableQuestions.Answers[index][o.Id] : parseFloat(i.TableQuestions.Answers[index][o.Id]).toFixed(this.digitPlaces))
               })
             }
           })
@@ -222,7 +222,7 @@ export default {
           this.classArr.push({triggerId: i.ClassifyQuestionId, classId: i.Id, classifyAlgorithms: i.ClassifyAlgorithms, classifyType: i.ClassifyType})
         }
         if (i.Type === 'number') {
-          this.$set(this.questionForm, i.Id, i.Answer === '' ? '' : parseFloat(i.Answer).toFixed(this.digitPlaces))
+          this.$set(this.questionForm, i.Id, isNaN(parseFloat(i.Answer)) ? i.Answer : parseFloat(i.Answer).toFixed(this.digitPlaces))
         }
         if (i.Childrens && i.Childrens.length > 0) {
           this.setChild(i.Childrens)

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

@@ -1,11 +1,6 @@
 <template>
-  <div
+  <div v-loading="loading" :element-loading-text="loadingText" element-loading-spinner="el-icon-loading"
-    v-loading="loading"
+  element-loading-background="rgba(0, 0, 0, 0.8)" class="read-page-container">
-    :element-loading-text="loadingText"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    class="read-page-container"
-  >
     <!-- 检查列表 -->
     <div class="left-panel">
       <div class="task-container">
@@ -205,7 +200,7 @@
               <svg-icon v-else icon-class="fitToImage" class="svg-icon" />
             </div>
             <!--融合-->
-            <div v-if="readingTool === 2" class="tool-item" :title="$t('trials:lugano:button:fusion')" @click.prevent="openFusion">
+            <div class="tool-item" :title="$t('trials:lugano:button:fusion')" @click.prevent="openFusion" v-if="readingTool === 2">
               <svg-icon icon-class="fusion" class="svg-icon" />
             </div>
             <div
@@ -284,9 +279,9 @@
             <div
               v-if="criterionType === 0"
               :title="$t('trials:reading:button:more')"
-              :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']"
               @click.stop="showPanel($event)"
               @mouseleave="toolMouseout"
+              :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']"
             >
               <div class="dropdown">
                 <div
@@ -297,10 +292,10 @@
                   <i class="el-icon-arrow-down" style="color:#fff;" />
                 </div>
                 <div class="dropdown-content">
-                  <ul v-if="readingTaskState < 2" style="width:100px;">
+                  <ul style="width:100px;" v-if="readingTaskState < 2">
                     <li v-for="i in customizeStandards" :key="i.toolName" style="text-align:left;">
                       <a href="#" @click.prevent="setMoreToolActive(i.toolName)">
-                        <svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;" />
+                        <svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;"/>
                         {{ $t(i.i18nKey) }}
                       </a>
                     </li>
@@ -308,10 +303,42 @@
                 </div>
               </div>
             </div>
+            <div
+                class="tool-item"
+                :title="$t('trials:reading:button:upload')"
+                v-if="trialCriterion.ImageUploadEnum > 0 && readingTaskState < 2"
+                v-hasPermi="['role:ir']"
+              >
+                <div class="tool-wrapper">
+                <div class="icon" @click.prevent="openUploadImage('upload')">
+                  <i class="el-icon-upload2 svg-icon" />
+                </div>
+              </div>
+            </div>
+            <div
+              v-if="trialCriterion.ImageDownloadEnum > 0"
+              v-hasPermi="[
+                'role:ir',
+                'role:mim',
+                'role:mc',
+                'role:pm',
+                'role:apm',
+                'role:ea',
+                'role:qa',
+              ]"
+              class="tool-item"
+              :title="$t('trials:reading:button:download')"
+            >
+              <div class="tool-wrapper">
+                <div class="icon" @click.prevent="openUploadImage('download')">
+                  <i class="el-icon-download svg-icon" />
+                </div>
+              </div>
+            </div>
             <!-- 伪彩 -->
-            <template v-if="readingTool === 2">
+             <template v-if="readingTool === 2">
-              <colorMap v-show="isFusion" ref="colorMap" @setColorMap="setColorMap" @voiChange="voiChange" />
+                <colorMap v-show="isFusion" ref="colorMap" @setColorMap="setColorMap" @voiChange="voiChange" />
-            </template>
+             </template>
           </div>
 
           <div>
@@ -343,7 +370,7 @@
         <div class="content-wrapper">
           <!-- viewports -->
           <div class="viewports-wrapper">
-            <div ref="container" class="grid-container">
+            <div ref="container" class="grid-container" >
               <div :class="[ 'viewports-box', isFusion ? 'viewports-box-down' : '' ]" :style="gridStyle">
                 <div
                   v-for="(v, index) in cellsMax"
@@ -367,7 +394,7 @@
                   />
                 </div>
               </div>
-              <div v-if="readingTool === 2" :class="[ 'viewports-box', !isFusion ? 'viewports-box-down' : '' ]" :style="gridStyle">
+              <div :class="[ 'viewports-box', !isFusion ? 'viewports-box-down' : '' ]" v-if="readingTool === 2" :style="gridStyle">
                 <div
                   v-for="(v, index) in cellsMax"
                   v-show="index < cells.length"
@@ -437,7 +464,6 @@
                 :visit-info="s"
                 @resetAnnotations="resetAnnotations"
                 @setReadingTaskState="setReadingTaskState"
-                @viewCustomAnnotationSeries="viewCustomAnnotationSeries"
               />
             </div>
           </div>
@@ -528,18 +554,32 @@
       </div>
 
     </el-dialog>
-    <el-dialog
+    <el-dialog :visible.sync="fusionVisible" :close-on-click-modal="false" :title="$t('trials:lugano:button:record')"
-      :visible.sync="fusionVisible"
+      width="850px" >
-      :close-on-click-modal="false"
+      <FusionForm v-if="fusionVisible" :activeTaskIndex="activeTaskIndex" :taskList="visitTaskList" @close="closeFusion" @fusion="handleFusion" />
-      :title="$t('trials:lugano:button:record')"
-      width="850px"
-    >
-      <FusionForm v-if="fusionVisible" :active-task-index="activeTaskIndex" :task-list="visitTaskList" @close="closeFusion" @fusion="handleFusion" />
     </el-dialog>
+
+    <upload-dicom-and-nonedicom
+      v-if="uploadImageVisible"
+      :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode"
+      :criterion="uploadTrialCriterion"
+      :visible.sync="uploadImageVisible"
+      :visit-task-id="taskId"
+      :is-reading-task-view-in-order="isReadingTaskViewInOrder"
+    />
+    <download-dicom-and-nonedicom
+      v-if="downloadImageVisible"
+      :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode"
+      :criterion="uploadTrialCriterion"
+      :task-id="taskId"
+      :visible.sync="downloadImageVisible"
+    />
   </div>
 </template>
 <script>
-import { getRelatedVisitTask, getReadingVisitStudyList, getTableAnswerRowInfoList, deleteCustomTag } from '@/api/trials'
+import { getRelatedVisitTask, getReadingVisitStudyList, getTableAnswerRowInfoList, deleteCustomTag, getCriterionReadingInfo } from '@/api/trials'
 import { getDoctorShortcutKey, getUserWLTemplateList } from '@/api/user'
 import { getCustomTag, submitCustomTag } from '@/api/reading'
 import {
@@ -575,6 +615,8 @@ import ClinicalData from '@/views/trials/trials-panel/reading/clinical-data'
 import FusionForm from './FusionForm.vue'
 import colorMap from './colorMap.vue'
 import RectangleROITool from './tools/RectangleROITool'
+import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
+import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 const { visibility } = annotation
 const { ViewportType, Events } = Enums
 const renderingEngineId = 'myRenderingEngine'
@@ -600,11 +642,11 @@ const {
   synchronizers
   // cursors
 } = cornerstoneTools
-const { createCameraPositionSynchronizer, createVOISynchronizer } = synchronizers
+const { createCameraPositionSynchronizer, createVOISynchronizer } = synchronizers;
 const newStyles = {
   global: {
     color: 'rgb(255, 0, 0)',
-    colorHighlighted: 'rgb(0, 255, 0)',
+    colorHighlighted: 'rgb(255, 0, 0)',
     colorSelected: 'rgb(255, 0, 0)',
     colorLocked: 'rgb(255, 0, 0)',
     lineWidth: '1',
@@ -614,7 +656,7 @@ const newStyles = {
     textBoxFontFamily: 'Helvetica Neue, Helvetica, Arial, sans-serif',
     textBoxFontSize: '14px',
     textBoxColor: 'rgb(255, 0, 0)',
-    textBoxColorHighlighted: 'rgb(0, 255, 0)',
+    textBoxColorHighlighted: 'rgb(255, 0, 0)',
     textBoxColorSelected: 'rgb(255, 0, 0)',
     textBoxColorLocked: 'rgb(255, 0, 0)',
     textBoxBackground: '',
@@ -628,6 +670,12 @@ annotation.config.style.setDefaultToolStyles(newStyles)
 const { MouseBindings, Events: toolsEvents } = csToolsEnums
 export default {
   name: 'ReadPage',
+  props: {
+    readingTool: {
+      type: Number,
+      default: 2
+    }
+  },
   components: {
     StudyList,
     Viewport,
@@ -642,13 +690,9 @@ export default {
     Others,
     ClinicalData,
     FusionForm,
-    colorMap
+    colorMap,
-  },
+    downloadDicomAndNonedicom,
-  props: {
+    uploadDicomAndNonedicom,
-    readingTool: {
-      type: Number,
-      default: 2
-    }
   },
   data() {
     return {
@@ -719,8 +763,19 @@ export default {
       studyList: [],
       volumeData: {},
       fusionSerieId: {},
-      loadingText: null
+      loadingText: null,
       // resetAnnotation: false , // 是否初始化标记 （融合时使用）
+
+         // 上传
+      downloadImageVisible: false,
+      uploadImageVisible: false,
+      uploadSubjectId: null,
+      uploadSubjectCode: null,
+      uploadTrialCriterion: {},
+      uploadStatus: 'upload',
+      taskId: '',
+      isReadingTaskViewInOrder: null,
+      trialCriterion: {}
     }
   },
   computed: {
@@ -749,6 +804,7 @@ export default {
     }
   },
   watch: {
+    currentReadingTaskState(){console.log(this.currentReadingTaskState,'currentReadingTaskState')},
     activeTaskId: {
       immediate: true,
       handler(id) {
@@ -798,12 +854,13 @@ export default {
   },
   mounted() {
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.isReadingTaskViewInOrder = this.taskInfo.IsReadingTaskViewInOrder
     this.criterionType = this.taskInfo.CriterionType
     const digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     if (this.criterionType === 0) {
       this.tools = getCustomizeStandardsTools(this.taskInfo.ReadingToolList)
-      const toolNames = this.tools.map(i => i.toolName)
+      let toolNames = this.tools.map(i=>i.toolName)
       this.customizeStandards = config.customizeStandards.filter(item => !toolNames.includes(item.toolName))
     } else {
       this.tools = getTools(this.criterionType)
@@ -822,6 +879,7 @@ export default {
       this.initLoader()
       this.getWwcTpl()
       this.getHotKeys()
+      this.getTrialCriterion()
     })
   },
   methods: {
@@ -1072,13 +1130,13 @@ export default {
         }
       ]
       let viewportIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3']
-      const fusionViewportIds = ['viewport-fusion-0', 'viewport-fusion-1', 'viewport-fusion-2', 'viewport-fusion-3']
+      let fusionViewportIds = ["viewport-fusion-0", "viewport-fusion-1", "viewport-fusion-2", "viewport-fusion-3"]
-      if (this.readingTool === 2) {
+      if(this.readingTool === 2){
         const fusionElement1 = this.$refs['viewport-fusion-0'][0].$el
         const fusionElement2 = this.$refs['viewport-fusion-1'][0].$el
         const fusionElement3 = this.$refs['viewport-fusion-2'][0].$el
         const fusionElement4 = this.$refs['viewport-fusion-3'][0].$el
-        const arr = [
+        let arr = [
           {
             viewportId: 'viewport-fusion-0',
             type: ViewportType.ORTHOGRAPHIC,
@@ -1114,7 +1172,7 @@ export default {
             }
           }
         ]
-        viewportInputArray = [...viewportInputArray, ...arr]
+        viewportInputArray = [ ...viewportInputArray, ...arr ]
         viewportIds = viewportIds.concat(fusionViewportIds)
       }
       renderingEngine.setViewports(viewportInputArray)
@@ -1180,28 +1238,28 @@ export default {
         toolGroup.addTool(CircleROITool.toolName, {
           getTextLines: this.getCircleROIToolTextLines
         })
-        if (toolGroupId === 'viewport-fusion-3') {
+        if(toolGroupId === 'viewport-fusion-3'){
-          toolGroup.addTool(VolumeRotateTool.toolName)
+          toolGroup.addTool(VolumeRotateTool.toolName);
           toolGroup.setToolActive(VolumeRotateTool.toolName, {
-            bindings: [
+              bindings: [
-              {
+                  {
-                mouseButton: MouseBindings.Wheel // mouse wheel
+                      mouseButton: MouseBindings.Wheel, // mouse wheel
-              }
+                  },
-            ]
+              ],
-          })
+          });
           toolGroup.addTool(MIPJumpToClickTool.toolName, {
-            targetViewportIds: fusionViewportIds
+              targetViewportIds: fusionViewportIds,
-          })
+          });
 
           // Set the initial state of the tools, here we set one tool active on left click.
           // This means left click will draw that tool.
           toolGroup.setToolActive(MIPJumpToClickTool.toolName, {
-            bindings: [
+              bindings: [
-              {
+                  {
-                mouseButton: MouseBindings.Primary // Left Click
+                      mouseButton: MouseBindings.Primary, // Left Click
-              }
+                  },
-            ]
+              ],
-          })
+          });
         }
         toolGroup.setToolActive(StackScrollTool.toolName, {
           bindings: [{ mouseButton: MouseBindings.Wheel }]
@@ -1239,7 +1297,7 @@ export default {
 
       eventTarget.addEventListener('cornerstoneimageloadprogress', this.imageLoadProgress)
       console.log(Events, toolsEvents)
-      if (this.readingTool === 2) {
+      if ( this.readingTool === 2 ) {
         this.setUpSynchronizers()
       }
     },
@@ -1337,11 +1395,6 @@ export default {
         toolsEvents.ANNOTATION_REMOVED,
         this.criterionType === 0 ? this.customAnnotationRemovedListener : this.annotationRemovedListener
       )
-      eventTarget.addEventListener(
-        toolsEvents.ANNOTATION_SELECTION_CHANGE,
-        this.criterionType === 0 ? this.customAnnotationSelectionChangeListener : this.annotationSelectionChangeListener
-      )
-
       // eventTarget.addEventListener(
       //   toolsEvents.ANNOTATION_ADDED,
       //   this.annotationAddedListener
@@ -1441,7 +1494,6 @@ export default {
             annotation.data.text = markName
           }
           this.saveCustomAnnotation(annotation)
-          this.$refs[`ecrf_${series.TaskInfo.VisitTaskId}`][0].bindAnnotationToQuestion(annotation)
         }
       }
 
@@ -1484,33 +1536,15 @@ export default {
       const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
       if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
         this.saveCustomAnnotation(annotation)
-        this.$refs[`ecrf_${series.TaskInfo.VisitTaskId}`][0].updateAnnotationToQuestion(annotation)
       }
       this.setToolsPassive()
     },
     async customAnnotationRemovedListener(e) {
       const { annotation } = e.detail
-      try {
+      try{
         // if ( this.resetAnnotation && this.isFusion ) return false
         if (!annotation) return false
-        if (this.readingTaskState === 2) {
+        if (this.readingTaskState === 2) throw 'annotation Not allowed to operate'
-          const errorMsg = { message: 'annotation Not allowed to operate' }
-          throw errorMsg
-        }
-        const i = this.tools.findIndex(i => i.toolName === annotation.metadata.toolName)
-        if (i === -1) {
-          // 临时标记
-          return
-        }
-        if (annotation.visitTaskId === this.taskInfo.VisitTaskId) {
-          const isBound = this.$refs[`ecrf_${annotation.visitTaskId}`][0].verifyAnnotationIsBound(annotation)
-          if (isBound) {
-            this.$alert('该标记已与问题进行绑定，不允许删除！')
-            const errorMsg = { message: 'annotation Not allowed to operate' }
-            throw errorMsg
-          }
-        }
-
         if (annotation.visitTaskId === this.taskInfo.VisitTaskId && annotation.seriesId) {
           if (this.activeTool === 'Eraser') {
             await this.$confirm(
@@ -1533,10 +1567,9 @@ export default {
             viewport.render()
           }
         } else {
-          const errorMsg = { message: 'annotation Not allowed to operate' }
+          throw 'annotation Not allowed to operate'
-          throw errorMsg
         }
-      } catch (e) {
+      }catch(e){
         cornerstoneTools.annotation.state.addAnnotation(annotation)
         const renderingEngine = getRenderingEngine(renderingEngineId)
         for (let i = 0; i < this.cells.length; i++) {
@@ -1556,20 +1589,6 @@ export default {
         viewport.render()
       }
     },
-    customAnnotationSelectionChangeListener(e) {
-      if (this.readingTaskState === 2) return
-      const { detail } = e
-      const annotations = cornerstoneTools.annotation.state.getAllAnnotations()
-      const i = annotations.findIndex(i => i.annotationUID === detail.selection[0])
-      if (i > -1) {
-        if (annotations[i].visitTaskId !== this.taskInfo.VisitTaskId) {
-          return
-        } else {
-          this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].bindAnnotationToQuestion(annotations[i])
-        }
-      }
-    },
-    annotationSelectionChangeListener(e) {},
     async getAnnotations(visitTaskId) {
       if (this.readingTaskState === 2) return
       const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
@@ -1921,10 +1940,8 @@ export default {
       const type = parseInt(value)
       // 1：默认值；2：垂直翻转；3：水平翻转；4：左转90度；5：右转90度；
       if (type === 1) {
-        // viewport.resetCamera()
+        viewport.resetCamera()
-        // viewport.resetProperties()
+        viewport.resetProperties()
-        // viewport.render()
-        viewport.setViewPresentation({ rotation: 0 })
         viewport.render()
       } else if (type === 2) {
         const { flipVertical } = viewport.getCamera()
@@ -2086,8 +2103,8 @@ export default {
       const renderingEngine = getRenderingEngine(renderingEngineId)
       const viewport = renderingEngine.getViewport(`${this.viewportKey}-${this.activeViewportIndex}`)
       const { invert } = viewport.getProperties()
-      if (this.isFusion) {
+      if ( this.isFusion ) {
-        viewport.setProperties({ invert: !invert }, this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].volumeId)
+        viewport.setProperties({ invert: !invert }, this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].volumeId )
       }
       viewport.setProperties({ invert: !invert })
       viewport.render()
@@ -2231,18 +2248,18 @@ export default {
     toggleFullScreen(e, index) {
       this.fullScreenIndex = this.fullScreenIndex === index ? null : index
       this.activeViewportIndex = index
-      if (this.isFusion) {
+      if ( this.isFusion ) {
-        const viewportIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`]
+        let viewportIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`]
-        viewportIds.forEach(id => {
+        viewportIds.forEach(id=>{
-          const index = this.$refs[id][0].series.SliceIndex
+          let index = this.$refs[id][0].series.SliceIndex
           this.$refs[id][0].setFullScreen(index)
         })
       }
     },
     async toggleTask(taskInfo, taskIndex) {
-      if (this.isFusion) {
+      if(this.isFusion){
-        const confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
+        let confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
-        if (!confirm) return false
+        if(!confirm) return false
         this.isFusion = false
         this.fullScreenIndex = null
         this.setToolsPassive()
@@ -2312,9 +2329,9 @@ export default {
       this.setToolsPassive()
     },
     async activeSeries(obj) {
-      if (this.isFusion) {
+      if(this.isFusion){
-        const confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
+        let confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
-        if (!confirm) return false
+        if(!confirm) return false
         this.isFusion = false
         this.setToolsPassive()
         this.rows = 1
@@ -2470,17 +2487,6 @@ export default {
       }
       return obj
     },
-    viewCustomAnnotationSeries(obj) {
-      const i = this.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
-      if (i === -1) return
-      const studyList = this.visitTaskList[i].StudyList
-      const series = this.getMarkedSeries(studyList, obj.annotation)
-      if (series) {
-        this.$refs[`${this.viewportKey}-${this.cells.length - 1}`][0].setSeriesInfo(series, true)
-        this.activeViewportIndex = i
-        this.$refs[series.TaskInfo.VisitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
-      }
-    },
     async getScreenshots(measureData, callback) {
       if (measureData) {
         await this.imageLocation(measureData)
@@ -2706,7 +2712,7 @@ export default {
       }
     },
     showPanel(e, toolName) {
-      if (toolName === 'layout' && this.isFusion) return false
+      if(toolName === 'layout' && this.isFusion) return false
       e.currentTarget.firstChild.lastChild.style.display = 'block'
     },
     toolMouseout(e) {
@@ -2723,67 +2729,67 @@ export default {
     },
     // 融合视口相机同步
     setUpSynchronizers() {
-      const axialCameraPositionSynchronizer = createCameraPositionSynchronizer(
+      let axialCameraPositionSynchronizer = createCameraPositionSynchronizer(
         'AXIAL_CAMERA_SYNCHRONIZER_ID'
-      )
+      );
-      const ctVoiSynchronizer = createVOISynchronizer('CT_VOI_SYNCHRONIZER_ID', {
+      let ctVoiSynchronizer = createVOISynchronizer('CT_VOI_SYNCHRONIZER_ID', {
         syncInvertState: false,
-        syncColormap: false
+        syncColormap: false,
-      })
+      });
-      const ptVoiSynchronizer = createVOISynchronizer('PT_VOI_SYNCHRONIZER_ID', {
+      let ptVoiSynchronizer = createVOISynchronizer('PT_VOI_SYNCHRONIZER_ID', {
         syncInvertState: false,
-        syncColormap: false
+        syncColormap: false,
-      })
+      });
-      const fusionVoiSynchronizer = createVOISynchronizer('FUSION_VOI_SYNCHRONIZER_ID', {
+      let fusionVoiSynchronizer = createVOISynchronizer('FUSION_VOI_SYNCHRONIZER_ID', {
         syncInvertState: false,
-        syncColormap: false
+        syncColormap: false,
       });
       [
         `viewport-fusion-0`,
         `viewport-fusion-1`,
-        `viewport-fusion-2`
+        `viewport-fusion-2`,
       ].forEach((viewportId) => {
         axialCameraPositionSynchronizer.add({
           renderingEngineId: this.renderingEngineId,
-          viewportId
+          viewportId,
-        })
+        });
       });
       [
-        `viewport-fusion-0`
+       `viewport-fusion-0`,
       ].forEach((viewportId) => {
         ctVoiSynchronizer.add({
           renderingEngineId: this.renderingEngineId,
-          viewportId
+          viewportId,
-        })
+        });
       });
       [
         `viewport-fusion-3`,
-        `viewport-fusion-1`
+        `viewport-fusion-1`,
       ].forEach((viewportId) => {
         ptVoiSynchronizer.add({
           renderingEngineId: this.renderingEngineId,
-          viewportId
+          viewportId,
-        })
+        });
       });
       [
-        `viewport-fusion-2`
+        `viewport-fusion-2`,
       ].forEach((viewportId) => {
         fusionVoiSynchronizer.add({
           renderingEngineId,
-          viewportId
+          viewportId,
-        })
+        });
         ctVoiSynchronizer.addTarget({
           renderingEngineId,
-          viewportId
+          viewportId,
-        })
+        });
         ptVoiSynchronizer.addTarget({
           renderingEngineId,
-          viewportId
+          viewportId,
-        })
+        });
-      })
+      });
     },
     setColorMap(rgbPresetName) {
-      const fusionViewportIds = [`viewport-fusion-1`, `viewport-fusion-2`, `viewport-fusion-3`]
+      let fusionViewportIds = [`viewport-fusion-1`, `viewport-fusion-2`, `viewport-fusion-3`]
       fusionViewportIds.forEach(id => {
         this.$refs[id][0].setPreset(rgbPresetName)
         this.$refs[id][0].renderColorBar(rgbPresetName)
@@ -2791,25 +2797,25 @@ export default {
       })
     },
     voiChange(v) {
-      const fusionViewportIds = [`viewport-fusion-1`, `viewport-fusion-2`, `viewport-fusion-3`]
+      let fusionViewportIds = [`viewport-fusion-1`, `viewport-fusion-2`, `viewport-fusion-3`]
       fusionViewportIds.forEach(id => {
         this.$refs[id][0].voiChange(v)
       })
     },
     async handleFusion(data) {
-      try {
+      try{
         this.fusionVisible = false
         this.isFusion = true
-        this.rows = 2
+        this.rows = 2;
         this.cols = 2
-        const { ct, pt } = data
+        let { ct, pt } = data
         this.loading = true
         this.loadingText = this.$t('trials:lugano:message:loadVolumes')
         // this.resetAnnotation = true
         // console.log(cornerstoneTools.annotation.state.getAllAnnotations(),'cornerstoneTools.annotation.state')
         // cornerstoneTools.annotation.state.removeAllAnnotations()
         this.renderedTaskIds = []
-        if (this.verifyFusionData(ct, pt)) {
+        if ( this.verifyFusionData(ct, pt) ) {
           this.loading = false
           this.loadingText = null
           this.$refs[`viewport-0`][0].setSeriesInfo(ct)
@@ -2819,10 +2825,10 @@ export default {
           // this.resetAnnotation = false
           return true
         }
-        if (!this.fusionSerieId.ct || this.fusionSerieId.ct !== ct.SeriesInstanceUid) {
+        if (!this.fusionSerieId.ct || this.fusionSerieId.ct !== ct.SeriesInstanceUid ) {
           this.fusionSerieId.ct = ct.SeriesInstanceUid
         }
-        if (!this.fusionSerieId.pt || this.fusionSerieId.pt !== pt.SeriesInstanceUid) {
+        if (!this.fusionSerieId.pt || this.fusionSerieId.pt !== pt.SeriesInstanceUid ) {
           this.fusionSerieId.pt = pt.SeriesInstanceUid
         }
         await this.getVolume(pt)
@@ -2830,22 +2836,22 @@ export default {
         await this.getVolume(pt, true)
         this.loading = false
         this.loadingText = null
-        const ctData = {
+        let ctData = {
           data: ct,
-          volumeId: this.volumeData[ct.SeriesInstanceUid].volumeId
+          volumeId: this.volumeData[ct.SeriesInstanceUid].volumeId,
         }
-        const ptData = {
+        let ptData = {
           data: pt,
           volumeId: this.volumeData[pt.SeriesInstanceUid].volumeId,
-          volume: this.volumeData[pt.SeriesInstanceUid].volume
+          volume: this.volumeData[pt.SeriesInstanceUid].volume,
         }
-        const fusionData = {
+        let fusionData = {
           ct,
           data: pt,
           volumeId: this.volumeData[pt.SeriesInstanceUid].volumeId,
           ctVolumeId: this.volumeData[ct.SeriesInstanceUid].volumeId,
           ptVolumeId: this.volumeData[pt.SeriesInstanceUid].volumeId,
-          fusionVolumeId: this.volumeData[`fusion_${pt.SeriesInstanceUid}`].volumeId
+          fusionVolumeId: this.volumeData[`fusion_${pt.SeriesInstanceUid}`].volumeId,
         }
         this.$refs[`viewport-0`][0].setSeriesInfo(ct)
         this.$refs[`viewport-1`][0].setSeriesInfo(pt)
@@ -2853,36 +2859,36 @@ export default {
         this.$refs[`viewport-3`][0].setSeriesInfo(pt)
 
         this.$refs[`viewport-fusion-0`][0].setSeriesInfo(ctData)
-        this.$refs[`viewport-fusion-1`][0].setSeriesInfo(ptData, { colorMap: true })
+        this.$refs[`viewport-fusion-1`][0].setSeriesInfo(ptData, { colorMap: true})
         this.$refs[`viewport-fusion-2`][0].setSeriesInfo(fusionData, { isFusion: true, colorMap: true })
         this.$refs[`viewport-fusion-3`][0].setSeriesInfo(ptData, { isMip: true, colorMap: true })
         // this.resetAnnotation = false
         this.$nextTick(() => {
           this.$refs[`colorMap`].init()
         })
-      } catch (err) {
+      }catch(err){
         console.log(err)
         this.loading = false
         this.loadingText = null
       }
     },
     verifyFusionData(ct, pt) {
-      if (this.fusionSerieId.ct === ct.SeriesInstanceUid && this.fusionSerieId.pt === pt.SeriesInstanceUid && cache.getVolume(this.volumeData[ct.SeriesInstanceUid].volumeId) && cache.getVolume(this.volumeData[pt.SeriesInstanceUid].volumeId) && cache.getVolume(this.volumeData[`fusion_${pt.SeriesInstanceUid}`].volumeId)) {
+      if (this.fusionSerieId.ct === ct.SeriesInstanceUid && this.fusionSerieId.pt === pt.SeriesInstanceUid && cache.getVolume(this.volumeData[ct.SeriesInstanceUid].volumeId) && cache.getVolume(this.volumeData[pt.SeriesInstanceUid].volumeId) && cache.getVolume(this.volumeData[`fusion_${pt.SeriesInstanceUid}`].volumeId) ) {
         return true
       }
       return false
     },
-    async getVolume(serie, isFusion = false) {
+    async getVolume(serie, isFusion = false ) {
       return new Promise(async res => {
-        let volumeId = null; let volume = null
+        let volumeId = null, volume = null
-        const key = isFusion ? `fusion_${serie.SeriesInstanceUid}` : serie.SeriesInstanceUid
+        let key = isFusion ? `fusion_${serie.SeriesInstanceUid}` : serie.SeriesInstanceUid
-        if (!this.volumeData[key] || !cache.getVolume(this.volumeData[key].volumeId)) {
+        if(!this.volumeData[key] || !cache.getVolume(this.volumeData[key].volumeId)) {
-          if (serie.Modality === 'PT' && !isFusion) {
+          if ( serie.Modality === 'PT' && !isFusion ) {
             serie.ImageIds.forEach(async id => {
-              const imageLoadObject = cache.getImage(id)
+              const imageLoadObject = cache.getImage(id);
               if (imageLoadObject) {
                 await new Promise(res => {
-                  cache.removeImageLoadObject(id, { force: true }) // 从缓存中删除
+                  cache.removeImageLoadObject(id, {force:true}); // 从缓存中删除
                   res()
                 })
               }
@@ -2908,11 +2914,32 @@ export default {
       this.$refs.colorMap.upperRangeChange(upper)
     },
     openFusion() {
-      this.fusionVisible = true
+      this.fusionVisible = true 
     },
     closeFusion() {
       this.fusionVisible = false
-    }
+    },
+    getTrialCriterion() {
+      getCriterionReadingInfo({
+        TrialId: this.$route.query.trialId,
+        TrialReadingCriterionId: this.$route.query.TrialReadingCriterionId
+      })
+        .then((res) => {
+          this.trialCriterion = res.Result
+        })
+        .catch(() => {})
+    },
+    openUploadImage(status) {
+      const idx = this.visitTaskList.findIndex(i => i.IsCurrentTask)
+      if (idx > -1) {
+        this.taskId = this.visitTaskList[idx].VisitTaskId
+      }
+      this.uploadSubjectCode = localStorage.getItem("subjectCode")
+      this.uploadSubjectId = localStorage.getItem("subjectId")
+      this.uploadTrialCriterion = this.trialCriterion
+      this.uploadStatus = status
+      this[`${status}ImageVisible`] = true
+    },
   }
 }
 </script>

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

@@ -402,7 +402,8 @@ export default {
         this.series = { ...obj }
         const renderingEngine = getRenderingEngine(this.renderingEngineId)
         const viewport = renderingEngine.getViewport(this.viewportId)
-        const image = await cornerstoneDICOMImageLoader.wadouri.loadImage(obj.ImageIds[obj.SliceIndex]).promise
+        let imageId = obj.ImageIds[obj.SliceIndex] ? obj.ImageIds[obj.SliceIndex] : obj.ImageIds[0]
+        const image = await cornerstoneDICOMImageLoader.wadouri.loadImage(imageId).promise
         if (obj.Modality === 'PT') {
           this.cachePTMetadata([image])
         }

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

@@ -32,13 +32,9 @@
             :reading-task-state="readingTaskState"
             :criterion-id="criterionId"
             :calculation-list="calculationList"
-            :question-mark-info-list="questionMarkInfoList"
-            :questions-mark-status="questionsMarkStatus"
             :is-baseline="isBaseLineTask"
             @resetFormItemData="resetFormItemData"
             @setFormItemData="setFormItemData"
-            @getQuestions="getQuestions"
-            @operateImageMarker="operateImageMarker"
           />
         </template>
 
@@ -78,10 +74,10 @@
 
 <script>
 
-import { getCustomTableQuestionAnswer, changeDicomReadingQuestionAnswer, submitVisitTaskQuestionsInDto, getQuestionCalculateRelation, saveTaskQuestion } from '@/api/trials'
+import { getCustomTableQuestionAnswer, changeDicomReadingQuestionAnswer, submitVisitTaskQuestionsInDto, getQuestionCalculateRelation } from '@/api/trials'
 import { setSkipReadingCache, resetReadingTask } from '@/api/reading'
 import const_ from '@/const/sign-code'
-import QuestionFormItem from './QuestionFormItem'
+import QuestionFormItem from '@/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem'
 import SignForm from '@/views/trials/components/newSignForm'
 export default {
   name: 'EcrfList',
@@ -97,7 +93,7 @@ export default {
     readingTaskState: {
       type: Number,
       required: true
-    }
+    },
   },
   data() {
     return {
@@ -117,11 +113,6 @@ export default {
       taskInfo: null,
       isBaseLineTask: false,
       rerender: true,
-      questionMarkInfoList: [],
-      operateStateEnum: null, // 1：标记；2：查看；3：更改；4：移除；5：保存
-      operateQuestionId: '',
-      operateRowId: '',
-      questionsMarkStatus: {}, // 1：未保存；2：已保存
       digitPlaces: 2
     }
   },
@@ -131,7 +122,7 @@ export default {
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
     this.isBaseLineTask = this.taskInfo.IsBaseLine
     this.criterionType = this.taskInfo.CriterionType
-    const digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.getQuestionCalculateRelation()
     this.getQuestions()
@@ -158,23 +149,13 @@ export default {
               this.classArr.push({ triggerId: v.ClassifyQuestionId, classId: v.Id, classifyAlgorithms: v.ClassifyAlgorithms, classifyType: v.ClassifyType })
             }
             if (v.Type === 'number') {
-              this.$set(this.questionForm, v.Id, v.Answer === '' ? '' : parseFloat(v.Answer).toFixed(this.digitPlaces))
+              this.$set(this.questionForm, v.Id, isNaN(parseFloat(v.Answer)) ? v.Answer : parseFloat(v.Answer).toFixed(this.digitPlaces))
             }
             if (v.Childrens.length > 0) {
               this.setChild(v.Childrens)
             }
           })
           this.questions = res.Result.SinglePage
-          this.questionsMarkStatus = {}
-          this.questionMarkInfoList = res.OtherInfo.QuestionMarkInfoList.map(i => {
-            if (i.QuestionId && i.MeasureData) {
-              this.$set(this.questionsMarkStatus, i.QuestionId, 2)
-            }
-            if (typeof i.MeasureData === 'string' && i.MeasureData) {
-              i.MeasureData = JSON.parse(i.MeasureData)
-            }
-            return i
-          })
           this.loading = false
         }
       } catch (e) {
@@ -191,7 +172,7 @@ export default {
           i.TableQuestions.Questions.forEach(o => {
             if (o.Type === 'number') {
               i.TableQuestions.Answers.forEach((ite, index) => {
-                this.$set(i.TableQuestions.Answers[index], o.Id, i.TableQuestions.Answers[index][o.Id] ? parseFloat(i.TableQuestions.Answers[index][o.Id]).toFixed(this.digitPlaces) : null)
+                this.$set(i.TableQuestions.Answers[index], o.Id, isNaN(parseFloat(i.TableQuestions.Answers[index][o.Id])) ? i.TableQuestions.Answers[index][o.Id] :  parseFloat(i.TableQuestions.Answers[index][o.Id]).toFixed(this.digitPlaces))
               })
             }
           })
@@ -201,7 +182,7 @@ export default {
           this.classArr.push({ triggerId: i.ClassifyQuestionId, classId: i.Id, classifyAlgorithms: i.ClassifyAlgorithms, classifyType: i.ClassifyType })
         }
         if (i.Type === 'number') {
-          this.$set(this.questionForm, i.Id, i.Answer === '' ? '' : parseFloat(i.Answer).toFixed(this.digitPlaces))
+          this.$set(this.questionForm, i.Id, isNaN(parseFloat(i.Answer)) ? i.Answer : parseFloat(i.Answer).toFixed(this.digitPlaces))
         }
         if (i.Childrens && i.Childrens.length > 0) {
           this.setChild(i.Childrens)
@@ -347,130 +328,6 @@ export default {
         }
       })
     },
-    verifyAnnotationIsBound(annotation) {
-      const i = this.questionMarkInfoList.findIndex(i => i.MeasureData && i.MeasureData.annotationUID === annotation.annotationUID)
-      return i > -1
-    },
-    async operateImageMarker(obj) {
-      this.operateStateEnum = obj.operateStateEnum
-      this.operateQuestionId = obj.question.Id
-      if (obj.operateStateEnum === 1) {
-        // 添加标记
-
-      } else if (obj.operateStateEnum === 2) {
-        // 查看标记
-        const i = this.questionMarkInfoList.findIndex(i => i.QuestionId === obj.question.Id)
-        if (i > -1) {
-          const annotation = this.questionMarkInfoList[i].MeasureData
-          this.$emit('viewCustomAnnotationSeries', { visitTaskId: this.visitTaskId, annotation })
-        }
-      } else if (obj.operateStateEnum === 3) {
-        // 更改标记
-        // this.$set(this.questionsMarkStatus, obj.question.Id, 1)
-      } else if (obj.operateStateEnum === 4) {
-        // 移除标记
-        this.$set(this.questionForm, obj.question.Id, '')
-        const i = this.questionMarkInfoList.findIndex(i => i.QuestionId === obj.question.Id)
-        if (i > -1) {
-          this.questionMarkInfoList.splice(i, 1)
-        }
-        this.$set(this.questionsMarkStatus, obj.question.Id, 0)
-      } else if (obj.operateStateEnum === 5) {
-        // 保存标记
-        this.loading = true
-        try {
-          const answers = []
-          answers.push({ id: obj.question.Id, answer: this.questionForm[obj.question.Id] })
-          const markInfo = []
-          const i = this.questionMarkInfoList.findIndex(i => i.QuestionId === this.operateQuestionId)
-          if (i > -1) {
-            const obj = Object.assign({}, this.questionMarkInfoList[i])
-            obj.MeasureData = obj.MeasureData ? JSON.stringify(obj.MeasureData) : ''
-            markInfo.push(obj)
-          }
-          const params = {
-            visitTaskId: this.visitTaskId,
-            answers: answers,
-            questionMarkInfoList: markInfo
-          }
-          await saveTaskQuestion(-10, params)
-
-          this.$set(this.questionsMarkStatus, obj.question.Id, 2)
-          this.loading = false
-        } catch (e) {
-          console.log(e)
-          this.loading = false
-        }
-      }
-    },
-    async bindAnnotationToQuestion(annotation) {
-      try {
-        if (!(this.operateStateEnum === 1 || this.operateStateEnum === 3)) return
-        if (!this.operateQuestionId) return
-        if (this.operateStateEnum === 3) {
-          if (!annotation.data.label) {
-            this.$alert('该标记不能与问题绑定！')
-            return
-          }
-          const confirm = await this.$confirm('是否确认更改？', {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          })
-          if (confirm !== 'confirm') return
-        }
-        console.log('bindAnnotationToQuestion', annotation)
-
-        const i = this.questionMarkInfoList.findIndex(i => i.QuestionId === this.operateQuestionId)
-        if (i === -1) {
-          const markInfo = {
-            QuestionId: this.operateQuestionId,
-            InstanceId: annotation.instanceId,
-            SeriesId: annotation.seriesId,
-            StudyId: annotation.studyId,
-            MarkTool: annotation.metadata.toolName,
-            PicturePath: '',
-            NumberOfFrames: annotation.numberOfFrames,
-            MeasureData: annotation
-          }
-          this.questionMarkInfoList.push(markInfo)
-        } else {
-          this.questionMarkInfoList[i].InstanceId = annotation.instanceId
-          this.questionMarkInfoList[i].SeriesId = annotation.seriesId
-          this.questionMarkInfoList[i].StudyId = annotation.studyId
-          this.questionMarkInfoList[i].MarkTool = annotation.metadata.toolName
-          this.questionMarkInfoList[i].PicturePath = ''
-          this.questionMarkInfoList[i].NumberOfFrames = annotation.numberOfFrames
-          this.questionMarkInfoList[i].MeasureData = annotation
-        }
-        this.setAnswerToQuestion(annotation, this.operateQuestionId)
-        this.$set(this.questionsMarkStatus, this.operateQuestionId, 1)
-      } catch (e) {
-        console.log(e)
-      }
-    },
-    updateAnnotationToQuestion(annotation) {
-      console.log('updateAnnotationToQuestion', annotation)
-      const i = this.questionMarkInfoList.findIndex(i => i.MeasureData && i.MeasureData.annotationUID === annotation.annotationUID)
-      if (i === -1) return
-      this.questionMarkInfoList[i].measureData = annotation
-      this.setAnswerToQuestion(annotation, this.questionMarkInfoList[i].QuestionId)
-      this.$set(this.questionsMarkStatus, this.questionMarkInfoList[i].QuestionId, 1)
-    },
-    setAnswerToQuestion(annotation, questionId) {
-      if (!questionId || !annotation) return
-      const referencedImageId = annotation.metadata.referencedImageId
-      if (annotation.metadata.toolName === 'Length') {
-        let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
-        length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
-        this.$set(this.questionForm, questionId, length)
-      } else if (annotation.metadata.toolName === 'Bidirectional') {
-        // let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
-        // length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
-        let short = annotation.data.cachedStats[`imageId:${referencedImageId}`].width
-        short = short ? parseFloat(short).toFixed(this.digitPlaces) : short
-        this.$set(this.questionForm, questionId, short)
-      }
-    },
     async resetForm() {
       const confirm = await this.$confirm(
         this.$t('trials:dicomReading:message:confirmReset1'),
@@ -489,7 +346,7 @@ export default {
           await this.getQuestionCalculateRelation()
           await this.getQuestions()
           this.$emit('resetAnnotations', this.visitTaskId)
-          this.$nextTick(() => {
+          this.$nextTick(()=>{
             this.rerender = true
           })
         }
@@ -498,7 +355,7 @@ export default {
         loading.close()
         console.log(e)
       }
-    }
+    },
   }
 }
 </script>
@@ -579,6 +436,6 @@ export default {
 // .ecrf-list-container{
 //   min-height:400px;
 //   color: #ddd;
-
+  
 // }
 </style>

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

@@ -1,576 +0,0 @@
-<template>
-  <div class="criterion-form-item">
-    <el-form-item
-        v-if="(question.ShowQuestion===1 && !!~question.ParentTriggerValueList.indexOf(questionForm[question.ParentId])) || question.ShowQuestion===0"
-        :label="`${question.QuestionName}`"
-        :prop="question.Id"
-        :rules="[
-          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))) && question.Type!=='group' && question.Type!=='summary',
-            message:  $t('common:ruleMessage:select'), trigger: ['blur', 'change']},
-        ]"
-        :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
-      >
-        <!-- 输入框 -->
-        <el-input
-          v-if="question.Type==='input'"
-          v-model="questionForm[question.Id]"
-          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-        />
-        <!-- 多行文本输入框 -->
-        <el-input
-          v-if="question.Type==='textarea'"
-          v-model="questionForm[question.Id]"
-          type="textarea"
-          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-          :autosize="{ minRows: 2, maxRows: 4}"
-        />
-        <!-- 下拉框 -->
-        <el-select
-          v-if="question.Type==='select'"
-          v-model="questionForm[question.Id]"
-          clearable
-          :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
-          <template v-if="question.TableQuestionType === 1">
-            <el-option
-              v-for="item in organList"
-              :key="item.Id"
-              :label="item[question.DataTableColumn]"
-              :value="item[question.DataTableColumn]"
-            />
-          </template>
-          <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-            <el-option
-              v-for="item of $d[question.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
-          </template>
-          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-            <el-option
-              v-for="item of $d[question.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
-          </template>
-          <template v-else>
-            <el-option
-              v-for="val in question.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-              :value="val"
-            />
-          </template>
-
-        </el-select>
-        <!-- 单选 -->
-        <el-radio-group
-          v-if="question.Type==='radio'"
-          v-model="questionForm[question.Id]"
-          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
-          <el-radio
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-          >
-            {{ val }}
-          </el-radio>
-        </el-radio-group>
-        <!-- 复选框 -->
-        <el-checkbox-group
-          v-if="question.Type==='checkbox'"
-          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-          v-model="questionForm[question.Id]"
-        >
-          <el-checkbox
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-          >
-            {{ val }}
-          </el-checkbox>
-        </el-checkbox-group>
-        <!-- 自动分类 -->
-        <el-input
-          v-if="question.Type === 'class' && question.ClassifyShowType === 1"
-          v-model="questionForm[question.Id]"
-        />
-        <el-select
-          v-if="question.Type === 'class' && question.ClassifyShowType === 2"
-          v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType"
-          @change="(val) => { formItemChange(val, question) }"
-        >
-          <el-option
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val.trim()"
-            :value="val.trim()"
-          />
-        </el-select>
-        <el-radio-group
-          v-if="question.Type === 'class' && question.ClassifyShowType === 3"
-          v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType"
-          @change="(val) => { formItemChange(val, question) }"
-        >
-          <el-radio
-            v-for="item of question.TypeValue.split('|')"
-            :key="item.trim()"
-            :label="item.trim()"
-          >
-            {{ item.trim() }}
-          </el-radio>
-        </el-radio-group>
-        <!-- 自动计算 -->
-        <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-input
-          v-if="question.Type==='calculation'"
-          v-model="questionForm[question.Id]"
-          oninput="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')"
-          disabled
-        />
-        <!-- 自增 -->
-        <el-input
-          v-if="question.Type==='increment'"
-          v-model="questionForm[question.Id]"
-          disabled
-        />
-        <!-- 数值 -->
-        <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-input
-          type="number"
-          v-if="question.Type === 'number' && question.DataSource !== 1"
-          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-          @change="((val)=>{formItemNumberChange(val, question)})"
-          @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          v-model="questionForm[question.Id]"
-        >
-          <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
-        </el-input>
-        <el-input
-          type="number"
-          v-if="question.Type === 'number' && question.DataSource === 1"
-          :disabled="question.DataSource === 1"
-          @blur="handleCalculationBlur(calculationValue)"
-          v-model="calculationValue"
-        >
-          <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
-        </el-input>
-        <!-- 上传图像 -->
-        <el-upload
-          v-if="question.Type==='upload'"
-          action
-          :accept="question.FileType"
-          :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
-          :on-preview="handlePictureCardPreview"
-          :before-upload="handleBeforeUpload"
-          :http-request="uploadScreenshot"
-          list-type="picture-card"
-          :on-remove="handleRemove"
-          :file-list="fileList"
-          :class="{disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount}"
-        >
-          <i slot="default" class="el-icon-plus" />
-          <div slot="file" slot-scope="{file}">
-            <viewer
-              :ref="file.url"
-              :images="[imageUrl]"
-              style="
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                width: 100%;
-                height: 100%;
-              "
-            >
-              <img
-                class="el-upload-list__item-thumbnail"
-                :src="OSSclientConfig.basePath + file.url"
-                crossOrigin="anonymous"
-                alt=""
-                style="max-width: 100%; max-height: 100%"
-              />
-              <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="readingTaskState < 2"
-                  class="el-upload-list__item-delete"
-                  @click="handleRemove(file)"
-                >
-                  <i class="el-icon-delete" />
-                </span>
-              </span>
-            </viewer>
-          </div>
-        </el-upload>
-        <el-dialog
-          v-if="question.Type==='upload'"
-          append-to-body
-          :visible.sync="imgVisible"
-          width="600px"
-        >
-          <el-image :src="imageUrl" width="100%">
-            <div slot="placeholder" class="image-slot">
-              {{$t('trials:readingUnit:qsList:message:loading')}}<span class="dot">...</span>
-            </div>
-          </el-image>
-        </el-dialog>
-      </el-form-item>
-  </div>
-</template>
-<script>
-export default {
-  name: 'QuestionTableFormItem',
-  props: {
-    isBaseline: {
-      type: Boolean,
-      required: true
-    },
-    questionForm: {
-      type: Object,
-      default() {
-        return {}
-      }
-    },
-    question: {
-      type: Object,
-      default() {
-        return []
-      }
-    },
-    criterionId: {
-      type: String,
-      required: true
-    },
-    calculationList: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    readingTaskState: {
-      type: Number,
-      required: true
-    },
-    visitTaskId: {
-      type: String,
-      default: ''
-    },
-    type: {
-      type: String,
-      default: 'add'
-    }
-  },
-  computed: {
-    calculationValue: {
-      get() {
-        return this.questionForm[this.question.Id]
-      },
-      set() {
-
-      }
-    }
-  },
-  data() {
-    return {
-      addOrEdit: { visible: false, title: '' },
-      fileList: [],
-      accept: '.png,.jpg,.jpeg',
-      imgVisible: false,
-      imageUrl: '',
-      urls: [],
-      organList: [],
-      QuestionsList: [],
-      QuestionsForm: {},
-      digitPlaces: 2
-    }
-  },
-  watch: {
-    questionForm: {
-      deep: true,
-      immediate: true,
-      handler(v, oldv) {
-        // try {
-        //   if (!v[this.question.Id] || !oldv[this.question.Id]) return
-        // } catch (e) {
-        // }
-        // this.formItemNumberChange(this.question.Id, false)
-      }
-    },
-  },
-  mounted() {
-    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
-    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
-    if (this.question.Type === 'upload') {
-      if (this.questionForm[this.question.Id]) {
-        this.urls = this.questionForm[this.question.Id].split('|')
-        this.fileList = []
-        this.urls.map(url => {
-          this.fileList.push({ name: '', url: `${url}` })
-        })
-      }
-    }
-    if (this.type === 'edit') return
-  },
-  methods: {
-    save() {
-    },
-    openAddTableCol(row) {
-      this.addOrEdit.visible = true
-      this.addOrEdit.title = row.QuestionName + this.$t('trials:readingUnit:qsList:title:tableQs')
-      this.QuestionsList = row.TableQuestions.Questions
-      this.AnswersList = row.TableQuestions.Answers
-      this.QuestionsForm = {}
-    },
-    formItemChange(v, question) {
-      if (question.Childrens && question.Childrens.length > 0) {
-        this.resetChild(question.Childrens)
-      }
-      if (question.TableQuestionType === 1 && question.RelationQuestions.length > 0) {
-        var index = this.organList.findIndex(item => item[question.DataTableColumn] === v)
-        if (index < 0) return
-        var selected = this.organList[index]
-        this.question.RelationQuestions.map(qs => {
-          var val = selected[qs.DataTableColumn]
-          // if (typeof val === 'boolean') {
-          //   // val = String(val)
-          // }
-          this.$emit('setFormItemData', { key: qs.Id, val: val, question: qs })
-        })
-      } else {
-        this.$emit('setFormItemData', { key: question.Id, val: v, question: question })
-      }
-    },
-    handleBlur(value, a, b) {
-      this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
-    },
-    handleCalculationBlur(v) {
-      this.calculationValue = parseFloat(v).toFixed(this.digitPlaces)
-    },
-    limitInput(value, q) {
-      if (value.indexOf('.') > -1) {
-        if (value.split('.')[1].length >= this.digitPlaces) {
-          this.$set(this.questionForm, q.Id, parseFloat(value).toFixed(this.digitPlaces))
-        }
-      } else {
-      }
-    },
-    logic(rules, num = 0) {
-      try {
-        if (rules.CalculateQuestionList.length === 0) {
-          return false
-        }
-        let dataArr = []
-        var count = 0
-        var maxList = [], minList = []
-        rules.CalculateQuestionList.forEach((o, i) => {
-          if (rules.CustomCalculateMark > 4 && rules.CustomCalculateMark < 10) {
-            if (i !== 0) {
-              switch (rules.CustomCalculateMark) {
-                case 7:
-                  count += parseFloat(this.questionForm[o.TableQuestionId])
-                  if (i === rules.CalculateQuestionList.length - 1) {
-                    num = count / rules.CalculateQuestionList.length
-                  }
-                  break;
-                case 8:
-                  maxList.push(this.questionForm[o.TableQuestionId])
-                  if (i === rules.CalculateQuestionList.length - 1) {
-                    num = Math.max(...maxList)
-                  }
-                  break;
-                case 9:
-                  minList.push(this.questionForm[o.TableQuestionId])
-                  if (i === rules.CalculateQuestionList.length - 1) {
-                    num = Math.min(...minList)
-                  }
-                  break;
-              }
-            } else {
-              maxList.push(this.questionForm[o.TableQuestionId])
-              minList.push(this.questionForm[o.TableQuestionId])
-              count = parseFloat(this.questionForm[o.TableQuestionId])
-              num = parseFloat(this.questionForm[o.TableQuestionId])
-              dataArr.push(num)
-            }
-          } else {
-            if (i !== 0) {
-              switch (rules.CustomCalculateMark) {
-                case 1:
-                  num += parseFloat(this.questionForm[o.TableQuestionId])
-                  break;
-                case 2:
-                  num -= parseFloat(this.questionForm[o.TableQuestionId])
-                  break;
-                case 3:
-                  num *= parseFloat(this.questionForm[o.TableQuestionId])
-                  break;
-                case 4:
-                  if (parseFloat(this.questionForm[o.TableQuestionId]) === 0) {
-                    num = 0
-                  } else {
-                    num /= parseFloat(this.questionForm[o.TableQuestionId])
-                  }
-                  break;
-                case 10:
-                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                }
-                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
-                    return acc + (typeof curr === "number" ? curr : 0);
-                  }, 0) / dataArr.length;
-                break;
-              case 11:
-                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                }
-                num = Math.max(...dataArr);
-                break;
-              case 12:
-                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                }
-                num = Math.min(...dataArr);
-                break;
-              }
-            } else {
-              num = parseFloat(this.questionForm[o.TableQuestionId])
-            }
-          }
-        })
-      } catch (e) {
-        console.log(e)
-      }
-      if (rules.ValueType === 2) {
-        num = num * 100
-      }
-      return num.toFixed(this.digitPlaces)
-    },
-    formItemNumberChange(v, question) {
-      this.$emit('formItemTableNumberChange', v, question)
-      // this.$emit('formItemTableNumberChange', v, question)
-    },
-    resetChild(obj) {
-      obj.forEach(i => {
-        this.$emit('resetFormItemData', i.Id)
-        if (i.Childrens && i.Childrens.length > 0) {
-          this.resetChild(i.Childrens)
-        }
-      })
-    },
-    resetFormItemData(v) {
-      this.$emit('resetFormItemData', v)
-    },
-    setFormItemData(obj) {
-      this.$emit('setFormItemData', obj)
-    },
-    async uploadScreenshot(param) {
-      if (!this.visitTaskId) return
-      const loading = this.$loading({
-        target: document.querySelector('.el-dialog'),
-        fullscreen: false,
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading'
-      })
-      var trialId = this.$route.query.trialId
-      var subjectId = this.$route.query.trialId
-      var file = await this.fileToBlob(param.file)
-      const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${param.file.name}`, file)
-      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url)})
-      this.urls.push(this.$getObjectName(res.url))
-      this.$emit('setFormItemData', { key:this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '', question: this.question })
-      loading.close()
-    },
-    handleBeforeUpload(file) {
-      // 检测文件类型是否符合要求
-      if (this.checkFileSuffix(file.name)) {
-        // this.fileList = []
-        return true
-      } else {
-        let msg = this.$t(
-          "trials:readingUnit:qsList:message:imageFormat"
-        ).replace("xxx", this.question.FileType)
-        this.$alert(msg)
-        return false
-      }
-    },
-    checkFileSuffix(fileName) {
-      var index = fileName.lastIndexOf('.')
-      var suffix = fileName.substring(index + 1, fileName.length)
-      if (this.question.FileType.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 预览图片
-    handlePictureCardPreview(file) {
-      var suffix = file.url.substring(file.url.lastIndexOf(".")+1)
-      suffix = suffix ? suffix.toLowerCase() : ''
-      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf'){
-        window.open(this.OSSclientConfig.basePath + file.url,'_blank')
-      }else{
-        this.imageUrl = this.OSSclientConfig.basePath + file.url
-        // this.imgVisible = true
-        this.$refs[file.url].$viewer.show()
-      }
-      
-    },
-    // 删除图片
-    handleRemove(file, fileList) {
-      this.imageUrl = ''
-      this.fileList.splice(this.fileList.findIndex(f => f.url === file.url), 1)
-      this.urls.splice(this.fileList.findIndex(f => f === file.url), 1)
-      this.$emit('setFormItemData', { key:this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '', question: this.question })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.my_dialog{
-  .criterion-form-item{
-    ::v-deep .el-form-item__content{
-      width: auto;
-    }
-  }
-}
-.criterion-form-item{
-  .el-form-item{
-    display: flex;
-    flex-direction: row;
-    align-items: flex-start;
-  }
-  ::v-deep .el-form-item__content{
-    width: 500px;
-  }
-  .el-input{
-    width:100%;
-  }
-  .mb{
-    margin-bottom: 0px;
-  }
-  .disabled{
-    ::v-deep .el-upload--picture-card {
-      display: none;
-    }
-  }
-  .uploadWrapper{
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-  }
-}
-</style>

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

@@ -396,7 +396,7 @@ export default {
         if (v.Type === 'number') {
           let val = null
           if (v.ValueType === 0) {
-            val = parseInt(v.Answers[this.visitTaskId])
+            val = isNaN(parseFloat(v.Answers[this.visitTaskId])) ? v.Answers[this.visitTaskId] : parseInt(v.Answers[this.visitTaskId])
           } else if (v.ValueType === 3) {
             val = v.Answers[this.visitTaskId]
           } else {
@@ -422,7 +422,7 @@ export default {
         if (i.Type === 'number') {
           let val = null
           if (i.ValueType === 0) {
-            val = parseInt(i.Answers[this.visitTaskId])
+            val = isNaN(parseFloat(i.Answers[this.visitTaskId])) ? i.Answers[this.visitTaskId] : parseInt(i.Answers[this.visitTaskId])
           } else if (i.ValueType === 3) {
             val = i.Answers[this.visitTaskId]
           } else {
@@ -561,7 +561,7 @@ export default {
               if (item.Type === 'number') {
                 let val = null
                 if (item.ValueType === 0) {
-                  val = parseInt(i.Answer)
+                  val = isNaN(parseFloat(i.Answer)) ? i.Answer : parseInt(i.Answer)
                 } else if (item.ValueType === 3) {
                   val = i.Answer
                 } else {

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

@@ -30,6 +30,7 @@
           type="primary"
           size="small"
           @click="skipTask"
+          v-if="!isView"
         >
           <!-- 跳过 -->
           {{ $t('trials:readingReport:button:skip') }}
@@ -337,6 +338,11 @@ export default {
   //     }
   //   }
   // },
+  computed:{
+    isView(){
+      return !this.hasPermi(['role:ir'])
+    }
+  },
   mounted() {
     this.getList()
     if (this.isReadingShowPreviousResults) {

src/views/trials/trials-panel/reading/read-order/index.vue

@@ -0,0 +1,433 @@
+<template>
+    <BaseContainer style="padding: 20px;">
+        <template slot="title-container">
+            <div class="title">
+                {{ $t('trials:readOrder:title') }}
+            </div>
+        </template>
+
+        <template slot="search-container">
+            <el-form :inline="true">
+                <!-- 是否加急 -->
+                <el-form-item style="margin-bottom: 10px" :label="$t('trials:readOrder:table:isUrgent')">
+                    <el-select v-model="searchData.IsUrgent" clearable style="width: 120px">
+                        <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value"
+                            :label="item.label" />
+                    </el-select>
+                </el-form-item>
+                <!-- 临床数据是否完备 -->
+                <el-form-item style="margin-bottom: 10px"
+                    :label="$t('trials:readOrder:table:completeClinicalDataEnum')">
+                    <el-select v-model="searchData.CompleteClinicalDataEnum" clearable style="width: 120px">
+                        <el-option v-for="item of $d.CompleteClinicalDataEnum"
+                            :key="'CompleteClinicalDataEnum' + item.label" :value="item.value" :label="item.label" />
+                    </el-select>
+                </el-form-item>
+                <!-- 中心编号 -->
+                <el-form-item :label="$t('trials:readOrder:table:siteCode')">
+                    <el-select v-model="searchData.TrialSiteId" clearable filterable style="width: 120px">
+                        <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
+                            :value="item.TrialSiteId" />
+                    </el-select>
+                </el-form-item>
+                <!-- 受试者编号 -->
+                <el-form-item :label="$t('trials:readOrder:table:subjectCode')">
+                    <el-input v-model="searchData.SubjectCode" style="width: 100px" />
+                </el-form-item>
+                <!-- 任务名称 -->
+                <el-form-item style="margin-bottom: 10px" :label="$t('trials:readOrder:table:taskName')">
+                    <el-input v-model="searchData.TaskName" style="width: 100px" clearable />
+                </el-form-item>
+                <!-- 阅片人 -->
+                <el-form-item style="margin-bottom: 10px" :label="$t('trials:readOrder:table:reader')">
+                    <el-select v-model="searchData.DoctorUserId" style="width: 120px">
+                        <el-option v-for="item of DoctorUserList" :key="'DoctorUserId' + item.DoctorUserId"
+                            :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
+                    </el-select>
+                </el-form-item>
+                <!-- 阅片标准 -->
+                <el-form-item style="margin-bottom: 10px" :label="$t('trials:readOrder:table:criterionName')">
+                    <el-select v-model="searchData.TrialReadingCriterionId" style="width: 120px">
+                        <el-option v-for="item of trialCriterionList"
+                            :key="'TrialReadingCriterionId' + item.TrialReadingCriterionId"
+                            :value="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" />
+                    </el-select>
+                </el-form-item>
+                <!-- 分配时间 -->
+                <el-form-item style="margin-bottom: 10px" :label="$t('trials:readOrder:table:assignTime')">
+                    <el-date-picker v-model="timeList" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
+                        :default-time="['00:00:00', '23:59:59']" @change="changeTimeList" />
+                </el-form-item>
+                <el-form-item style="margin-bottom: 10px">
+                    <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+                        {{ $t('common:button:search') }}
+                    </el-button>
+                    <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+                        {{ $t('common:button:reset') }}
+                    </el-button>
+                    <!--导出-->
+                    <el-button type="primary" icon="el-icon-download" @click="handleExport">
+                        {{ $t('common:button:export') }}
+                    </el-button>
+                    <!-- 随机排序 -->
+                    <el-button type="primary" @click="randomOrder"
+                        :disabled="!searchData.TrialReadingCriterionId || !searchData.DoctorUserId" v-if="!isAdmin">
+                        {{ $t('trials:readingTracking:button:order') }}
+                    </el-button>
+                </el-form-item>
+            </el-form>
+        </template>
+        <template slot="main-container">
+            <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
+                @sort-change="handleSortChange">
+                <!-- 是否加急 -->
+                <el-table-column prop="IsUrgent" :label="$t('trials:readOrder:table:isUrgent')" min-width="120"
+                    sortable="custom" align="center" style="position: relative">
+                    <template slot-scope="scope">
+                        <el-tooltip placement="top">
+                            <div slot="content">
+                                <span>{{
+                                    `${$t('trials:readOrder:label:taskUrgentType')}${$fd(
+                                        'TaskUrgentType',
+                                        scope.row.TaskUrgentType
+                                    )}`
+                                }}</span><br />
+                                <span>{{
+                                    scope.row.TaskUrgentRemake
+                                        ? `${$t('trials:readOrder:label:taskUrgentRemake')}${scope.row.TaskUrgentRemake
+                                        }`
+                                        : ''
+                                }}</span>
+                            </div>
+                            <div>
+                                <el-button :disabled="!(
+                                    !scope.row.TaskState &&
+                                    (scope.row.ReadingTaskState === 0 ||
+                                        scope.row.ReadingTaskState === 1)
+                                ) || !scope.row.IsCanEditUrgentState
+                                    " v-if="scope.row.IsUrgent" type="danger" size="mini">{{
+                                        $fd('YesOrNo', scope.row.IsUrgent) }}</el-button>
+                            </div>
+                        </el-tooltip>
+                        <el-button :disabled="!(
+                            !scope.row.TaskState &&
+                            (scope.row.ReadingTaskState === 0 ||
+                                scope.row.ReadingTaskState === 1)
+                        ) || !scope.row.IsCanEditUrgentState
+                            " v-if="!scope.row.IsUrgent" type="primary" size="mini">{{
+                                $fd('YesOrNo', scope.row.IsUrgent) }}</el-button>
+                    </template>
+                </el-table-column>
+                <!-- 临床数据是否完备 -->
+                <el-table-column prop="CompleteClinicalDataEnum"
+                    :label="$t('trials:readOrder:table:completeClinicalDataEnum')" min-width="160"
+                    show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.CompleteClinicalDataEnum === -1">
+                            {{
+                                $fd(
+                                    'CompleteClinicalDataEnum',
+                                    scope.row.CompleteClinicalDataEnum
+                                )
+                            }}
+                        </span>
+                        <el-button type="text" v-else>
+                            {{
+                                $fd(
+                                    'CompleteClinicalDataEnum',
+                                    scope.row.CompleteClinicalDataEnum
+                                )
+                            }}
+                        </el-button>
+                    </template>
+                </el-table-column>
+                <!-- 中心编号 -->
+                <el-table-column prop="TrialSiteCode" :label="$t('trials:readOrder:table:siteCode')" min-width="100"
+                    sortable="custom" show-overflow-tooltip />
+                <!-- 受试者编号 -->
+                <el-table-column prop="SubjectCode" :label="$t('trials:readOrder:table:subjectCode')" min-width="120"
+                    sortable="custom" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span v-if="
+                            scope.row.BlindSubjectCode &&
+                            scope.row.BlindSubjectCode !== scope.row.SubjectCode
+                        ">
+                            {{ `${scope.row.SubjectCode}/${scope.row.BlindSubjectCode}` }}
+                        </span>
+                        <span v-else>{{ scope.row.SubjectCode }}</span>
+                    </template>
+                </el-table-column>
+                <!-- 任务名称 -->
+                <el-table-column prop="VisitTaskNum" :label="$t('trials:readOrder:table:taskName')" min-width="140"
+                    sortable="custom" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span v-if="
+                            scope.row.TaskBlindName &&
+                            scope.row.TaskName !== scope.row.TaskBlindName
+                        ">
+                            {{ `${scope.row.TaskName}/${scope.row.TaskBlindName}` }}
+                        </span>
+                        <span v-else>{{ scope.row.TaskName }}</span>
+                    </template>
+                </el-table-column>
+                <!-- 阅片人 -->
+                <el-table-column prop="UserName" :label="$t('trials:readOrder:table:reader')" min-width="130"
+                    sortable="custom" show-overflow-tooltip>
+                    <template v-if="scope.row.UserName" slot-scope="scope">
+                        <span>{{ scope.row.UserName }}({{ scope.row.FullName }})</span>
+                    </template>
+                </el-table-column>
+                <!-- 阅片标准 -->
+                <el-table-column prop="TrialReadingCriterionName" :label="$t('trials:readOrder:table:criterionName')"
+                    min-width="180" sortable="custom" show-overflow-tooltip />
+                <!-- 分配时间 -->
+                <el-table-column prop="AllocateTime" :label="$t('trials:readOrder:table:assignTime')" min-width="180"
+                    sortable="custom" show-overflow-tooltip />
+                <!-- 阅片序号 -->
+                <el-table-column prop="RandomOrder" :label="$t('trials:readOrder:table:randomOrder')" min-width="180"
+                    sortable="custom" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <el-input-number v-model="scope.row.RandomOrder"
+                            @change="(value, old) => handleChange(scope.row, value, old)" :min="0" style="width: 150px;"
+                            v-if="scope.row.ReadingTaskState !== 1 && !isAdmin"></el-input-number>
+                        <span v-else>{{ scope.row.RandomOrder }}</span>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!-- 分页组件 -->
+            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+                @pagination="getList" />
+        </template>
+    </BaseContainer>
+</template>
+<script>
+import { getTrialSiteSelect } from '@/api/trials'
+import {
+    getTrialCriterionList,
+    getReadingTaskList,
+    getDoctorUserSelectList,
+    setRandomTaskOrder
+} from '@/api/trials/reading'
+import { getReadingTaskList_Export } from '@/api/export'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+const searchDataDefault = () => {
+    return {
+        PageIndex: 1,
+        PageSize: 20,
+        Asc: true,
+        SortField: 'RandomOrder',
+        TrialId: null,
+        TrialSiteId: null,
+        SubjectId: null,
+        SubjectCode: null,
+        IsUrgent: null,
+        TaskName: null,
+        TaskState: null,
+        DoctorUserId: null,
+        ReadingCategory: null,
+        TaskAllocationState: null,
+        BeginAllocateDate: null,
+        EndAllocateDate: null,
+        ReadingTaskState: null,
+        CompleteClinicalDataEnum: null,
+        BeginSignTime: null,
+        EndSignTime: null,
+        IsEffect: true,
+        TrialReadingCriterionId: null,
+        IsRandomOrderList: true
+        // ArmEnum: null
+    }
+}
+export default {
+    name: 'ReadOrder',
+    components: {
+        BaseContainer,
+        Pagination,
+    },
+    data() {
+        return {
+            searchData: searchDataDefault(),
+            exportVisible: false,
+            list: [],
+            siteOptions: [],
+            total: 0,
+            SubjectAssignListTotal: 0,
+            loading: false,
+            trialCriterionList: [],
+            DoctorUserList: [],
+            timeList: []
+        }
+    },
+    created() {
+        if (!this.hasPermi(['role:pm', 'role:apm', 'role:admin'])) return this.$router.replace("/login")
+    },
+    computed: {
+        isAdmin() {
+            return !!this.hasPermi(['role:admin'])
+        }
+    },
+    mounted() {
+        this.getSite()
+        Promise.all([this.getDoctorUserSelectList(), this.getTrialCriterionList()]).then(() => {
+            this.getList()
+        })
+
+    },
+    beforeDestroy() {
+        if (this.openWindow) {
+            this.openWindow.close()
+        }
+    },
+    methods: {
+        // 手动设置排序序号
+        async handleChange(row, value, old) {
+            try {
+                if (!this.searchData.DoctorUserId || !this.searchData.TrialReadingCriterionId) return false
+                if (!value) throw this.$t('trials:readOrder:message:min1')
+                let data = {
+                    TrialId: this.$route.query.trialId,
+                    TrialReadingCriterionId: this.searchData.TrialReadingCriterionId,
+                    DoctorUserId: this.searchData.DoctorUserId,
+                    IsAutoSet: false,
+                    SetList: [
+                        { Id: row.Id, RandomOrder: value }
+                    ]
+                }
+                this.loading = true;
+                let res = await setRandomTaskOrder(data)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.getList()
+                } else {
+                    row.RandomOrder = old
+                }
+            } catch (err) {
+                row.RandomOrder = old
+                console.log(err)
+                this.$message.warning(err)
+                this.getList()
+                this.loading = false
+            }
+        },
+        // 随机排序
+        async randomOrder() {
+            try {
+                if (!this.searchData.DoctorUserId || !this.searchData.TrialReadingCriterionId) return false
+                let data = {
+                    TrialId: this.$route.query.trialId,
+                    TrialReadingCriterionId: this.searchData.TrialReadingCriterionId,
+                    DoctorUserId: this.searchData.DoctorUserId,
+                    IsAutoSet: true,
+                    SetList: []
+                }
+                this.loading = true;
+                let res = await setRandomTaskOrder(data)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.getList()
+                }
+            } catch (err) {
+                console.log(err)
+                this.loading = false
+            }
+        },
+        async handleExport() {
+            this.loading = true
+            try {
+                await getReadingTaskList_Export(this.searchData)
+                this.loading = false
+            } catch (e) {
+                this.loading = false
+            }
+        },
+        getTrialCriterionList() {
+            return new Promise((resolve, reject) => {
+                getTrialCriterionList(this.$route.query.trialId, true)
+                    .then((res) => {
+                        this.trialCriterionList = res.Result
+                        if (this.trialCriterionList.length > 0) {
+                            this.searchData.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
+                        }
+                        resolve()
+                    })
+                    .catch(() => { reject() })
+            })
+        },
+        getDoctorUserSelectList() {
+            return new Promise((resolve, reject) => {
+                getDoctorUserSelectList(this.$route.query.trialId).then((res) => {
+                    this.DoctorUserList = res.Result
+                    if (this.DoctorUserList.length > 0) {
+                        this.searchData.DoctorUserId = this.DoctorUserList[0].DoctorUserId
+                    }
+                    resolve()
+                }).catch(() => { reject() })
+            })
+
+        },
+        getList() {
+            if (!this.searchData.DoctorUserId || !this.searchData.TrialReadingCriterionId) return false
+            this.searchData.TrialId = this.$route.query.trialId
+            this.loading = true
+            getReadingTaskList(this.searchData)
+                .then((res) => {
+                    this.loading = false
+                    this.list = []
+                    this.$nextTick(() => {
+                        this.list = res.Result.CurrentPageData
+                        this.total = res.Result.TotalCount
+                    })
+                })
+                .catch(() => {
+                    this.loading = false
+                })
+        },
+        handleSearch() {
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+        handleReset() {
+            let TrialReadingCriterionId = this.searchData.TrialReadingCriterionId
+            let DoctorUserId = this.searchData.DoctorUserId
+            this.searchData = searchDataDefault()
+            this.searchData.DoctorUserId = DoctorUserId
+            this.searchData.TrialReadingCriterionId = TrialReadingCriterionId
+            this.timeList = []
+            this.getList()
+        },
+        getSite() {
+            getTrialSiteSelect(this.$route.query.trialId).then((res) => {
+                this.siteOptions = res.Result
+            })
+        },
+        changeTimeList() {
+            if (this.timeList) {
+                this.searchData.BeginAllocateDate = this.timeList[0]
+                this.searchData.EndAllocateDate = this.timeList[1]
+            } else {
+                this.searchData.BeginAllocateDate = null
+                this.searchData.EndAllocateDate = null
+            }
+        },
+        // 排序
+        handleSortChange(column) {
+            if (column.order === 'ascending') {
+                this.searchData.Asc = true
+            } else {
+                this.searchData.Asc = false
+            }
+            this.searchData.SortField = column.prop
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+.title {
+    line-height: 40px;
+    font-weight: bold;
+    margin-bottom: 10px;
+}
+</style>

src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue

@@ -45,7 +45,7 @@
           <el-input 
             v-model="scope.row.CDISCCode"
             size="mini"
-            :disabled="scope.row.HasChildren || (scope.row.IsTableQuestion && exportInfo.CriterionType !== 0)"
+            :disabled="scope.row.HasChildren || scope.row.IsTableQuestion"
             v-show="!scope.row.IsGroup || !scope.row.HasChildren"
           >
           </el-input>
@@ -68,7 +68,7 @@ export default {
   data() {
     return {
       loading: false,
-      exportInfo: {}
+      exportInfo: []
     }
   },
   mounted() {
@@ -152,8 +152,7 @@ export default {
       } else if ((this.exportInfo.CriterionGroup === 0 || this.exportInfo.CriterionType === 0 ) && item.Code === 1 && (row.HasChildren || row.IsTableQuestion)) {
         // 自定义或非肿瘤阅片标准阅片结果表(1)不能配置表格问题
         return true
-      } else if (item.Code === 8 && (row.HasChildren || (row.IsTableQuestion && this.exportInfo.CriterionType !== 0))) {
+      } else if (item.Code === 8 && (row.HasChildren || row.IsTableQuestion)) {
-        // else if (item.Code === 8 && (row.HasChildren || row.IsTableQuestion))
         // CDISC导出不能配置表格问题
         return true
       } else if (item.Code === 2 && row.HasChildren) {

src/views/trials/trials-panel/setting/inspection/index.vue

@@ -1,194 +0,0 @@
-<template>
-    <BoxContent style="min-height: 100%; background: #fff">
-        <div class="inspection-content" v-loading="loading">
-            <!-- <div class="top">
-                <span class="title">{{ this.$t("trials:setting:inspection:module") }}</span>
-                <span>{{ this.$t("trials:setting:inspection:optName") }}</span>
-            </div> -->
-            <el-tree :data="tree" show-checkbox node-key="id" :expand-on-click-node="false" ref="tree">
-                <span class="custom-tree-node" slot-scope="{ node }">
-                    <span>{{ node.label }}</span>
-                    <!-- <span>
-                        {{ node.data.optName }}
-                    </span> -->
-                </span>
-            </el-tree>
-        </div>
-        <div class="btnBox">
-            <el-button @click.stop="getCheckedNodes" type="primary"
-                v-if="hasPermi(['trials:setting:inspection:update'])" class="btn">
-                {{ $t('common:button:save') }}
-            </el-button>
-        </div>
-    </BoxContent>
-</template>
-<script>
-import BoxContent from '@/components/BoxContent'
-import {
-    getTrialShowInspection,
-    setTrialShowInspection
-} from '@/api/trials'
-export default {
-    components: { BoxContent },
-    data() {
-        return {
-            loading: false,
-            tree: [
-                {
-                    id: 1,
-                    label: this.$t("trials:setting:inspection:module"),
-                    optName: this.$t("trials:setting:inspection:optName"),
-                }
-            ],
-            list: []
-        }
-    },
-    created() {
-        this.getTree()
-    },
-    computed: {
-        isEN() {
-            return this.$i18n.locale !== 'zh'
-        }
-    },
-    methods: {
-        async getCheckedNodes() {
-            try {
-                this.loading = true
-                let ids = this.$refs.tree.getCheckedKeys()
-                let list = []
-                this.list.forEach(item => {
-                    let obj = {
-                        FrontAuditConfigId: item.FrontAuditConfigId,
-                        isShow: false
-                    }
-                    if (ids.includes(item.FrontAuditConfigId)) {
-                        obj.isShow = true
-                    }
-                    list.push(obj)
-                })
-                let data = {
-                    TrialId: this.$route.query.trialId,
-                    TrialShowInspectionList: list
-                }
-                let res = await setTrialShowInspection(data)
-                if (res.IsSuccess) {
-                    this.getTree()
-                }
-            } catch (err) {
-                console.log(err)
-            }
-        },
-        async getTree() {
-            try {
-                let data = {
-                    TrialId: this.$route.query.trialId
-                }
-                this.loading = true
-                let res = await getTrialShowInspection(data);
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.list = this.formatList(res.Result)
-                    let { tree, ids } = this.formatTree(res.Result);
-                    console.log(ids)
-                    this.tree = tree
-                    if (ids.length > 0) {
-                        this.$nextTick(() => {
-                            this.$refs.tree.setCheckedKeys(ids)
-                        })
-                    }
-                }
-            } catch (err) {
-                this.loading = false
-                console.log(err)
-            }
-        },
-        formatTree(list) {
-            let tree = [], ids = []
-            list.forEach(item => {
-                let obj = {
-                    id: item.FrontAuditConfigId,
-                    label: this.isEN ? item.Description : item.DescriptionCN
-                }
-                if (item.IsShow) {
-                    ids.push(item.FrontAuditConfigId)
-                }
-                if (item.Children && item.Children.length > 0) {
-                    obj.children = []
-                    item.Children.forEach(it => {
-                        let o = {
-                            id: it.FrontAuditConfigId,
-                            label: this.isEN ? it.Description : it.DescriptionCN
-                        }
-                        if (it.IsShow) {
-                            ids.push(it.FrontAuditConfigId)
-                        }
-                        obj.children.push(o)
-                    })
-                }
-                tree.push(obj)
-            })
-            return { tree, ids }
-        },
-        formatList(list) {
-            let arr = []
-            list.forEach(item => {
-                let obj = {
-                    FrontAuditConfigId: item.FrontAuditConfigId,
-                    ParentId: item.ParentId
-                }
-                arr.push(obj)
-                if (item.Children && item.Children.length > 0) {
-                    item.Children.forEach(it => {
-                        let o = {
-                            FrontAuditConfigId: it.FrontAuditConfigId,
-                            ParentId: it.ParentId
-                        }
-                        arr.push(o)
-                    })
-                }
-            })
-            return arr;
-        }
-    }
-
-}
-</script>
-<style lang="scss" scoped>
-.inspection-content {
-    width: 40%;
-    min-height: 500px;
-
-    .top {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 20px;
-        padding-top: 20px;
-
-        .title {
-            width: 70%;
-        }
-
-        span {
-            display: inline-block;
-        }
-    }
-
-    .custom-tree-node {
-        width: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 0 20px 0 0;
-    }
-}
-
-.btnBox {
-    width: 40%;
-    padding: 0 20px 20px;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-}
-</style>

src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue

@@ -738,7 +738,7 @@ export default {
     },
     handleIsDeletedChanged(val) {
       if (val) {
-        // this.statusForm.joinTime = ''
+        this.statusForm.joinTime = ''
       } else {
         this.statusForm.removeTime = ''
       }

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue

@@ -727,19 +727,6 @@
           }}
         </div>
       </div>
-      <!-- 影像标记 -->
-      <el-form-item
-        v-if="form.Type === 'number' && !isFromSystem"
-        :label="$t('trials:readingUnit:qsList:title:imageMarkEnum')"
-        prop="ImageMarkEnum"
-      >
-        <el-radio-group
-          v-model="form.ImageMarkEnum"
-          :disabled="form.IsRequired === 0"
-        >
-          <el-radio v-for="item of $d.ImageMark" :key="item.id" :label="item.value" :disabled="form.IsRequired === 2 && item.value === 1">{{ item.label }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
       <!-- 最大上传个数 -->
       <el-form-item 
         v-if="form.Type === 'upload'" 
@@ -1084,8 +1071,7 @@ export default {
         ExportResult: [],
         ClassifyType: null,
         ClassifyEditType: null,
-        ClassifyShowType: null,
+        ClassifyShowType: null
-        ImageMarkEnum: 0
         // IsEnable: true
       },
       rules: {
@@ -1470,12 +1456,6 @@ export default {
         form.RelevanceId = ''
         form.RelevanceValueList = []
       }
-      if (val === 0 && form.Type === 'number' && !this.isFromSystem) {
-        form.ImageMarkEnum = 1
-      }
-      if (val === 2 && form.Type === 'number' && !this.isFromSystem) {
-        form.ImageMarkEnum = 0
-      }
     },
     parentQuestionChange(val, form) {
       console.log(val)
@@ -1570,7 +1550,6 @@ export default {
       form.ExportResult = []
       form.ClassifyType = null
       form.ClassifyShowType = null
-      form.ImageMarkEnum = 0
     },
     getLesionType() {
       return new Promise((resolve, reject) => {

src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue

@@ -429,22 +429,6 @@
             <i class="el-icon-info" />{{ [1, 2, 3, 4].includes(form.CustomCalculateMark) ? $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2') }}
           </div>
         </div>
-        <!-- 影像标记 -->
-      <el-form-item
-        v-if="form.Type === 'number' && !isFromSystem"
-        :label="$t('trials:readingUnit:qsList:title:imageMarkEnum')"
-        prop="ImageMarkEnum"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select')}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.ImageMarkEnum"
-          :disabled="form.IsRequired === 0"
-        >
-          <el-radio v-for="item of $d.ImageMark" :key="item.id" :label="item.value" :disabled="form.IsRequired === 2 && item.value === 1">{{ item.label }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
         <el-form-item
           v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'input') && isFromSystem"
           :label="$t('trials:readingUnit:label:QuestionGenre')"
@@ -912,7 +896,6 @@ export default {
         ClassifyType: null,
         ClassifyEditType: null,
         ClassifyShowType: null,
-        ImageMarkEnum: 0
         // IsEnable: true
       },
       rules: {
@@ -1280,12 +1263,6 @@ export default {
         form.RelevanceId = ''
         form.RelevanceValueList = []
       }
-      if (val === 0 && form.Type === 'number' && !this.isFromSystem) {
-        form.ImageMarkEnum = 1
-      }
-      if (val === 2 && form.Type === 'number' && !this.isFromSystem) {
-        form.ImageMarkEnum = 0
-      }
     },
     async parentQuestionChange(val, form) {
       if (val) {
@@ -1395,7 +1372,6 @@ export default {
       form.ImageCount = 0
       form.ClassifyType = null
       form.ClassifyShowType = null
-      form.ImageMarkEnum = 0
     },
     close() {
       this.$emit('close')

src/views/trials/trials-panel/trial-summary/audit-record/index.vue

@@ -1018,28 +1018,34 @@ export default {
           return
         }
         if (v.DataType === 'ImageList') {
-          if (obj[v.Code] && obj[v.Code].length > 0) {
+            // if (obj[v.Code] && obj[v.Code].length > 0) {
+
+          if (obj[v.Code]) {
+            obj[v.Code] = obj[v.Code].filter(s => s && s.trim())
             // obj[v.Code].forEach((o,i) => {
             //   var uo = upObj && upObj.length > 0 ? upObj[v.Code][i] : 0
             if (row.OptType === 'Add' || row.OptType === 'Init') {
               item = {
                 key: v.Code,
                 Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value,
-                newValue: obj[v.Code] ? obj[v.Code] : '--',
+                // newValue: obj[v.Code] ? obj[v.Code] : '--',
+                newValue: obj[v.Code] && obj[v.Code].length > 0 ? obj[v.Code] : '--',
                 oldValue: ''
               }
             } else if (row.OptType === 'Delete') {
               item = {
                 key: v.Code,
                 Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value,
-                oldValue: obj[v.Code] ? obj[v.Code] : '--',
+                // oldValue: obj[v.Code] ? obj[v.Code] : '--',
+                oldValue: obj[v.Code] && obj[v.Code].length > 0 ? obj[v.Code] : '--',
                 newValue: '--'
               }
             } else {
               item = {
                 key: v.Code,
                 Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value,
-                newValue: obj[v.Code] ? obj[v.Code] : '--',
+                // newValue: obj[v.Code] ? obj[v.Code] : '--',
+                newValue: obj[v.Code] && obj[v.Code].length > 0 ? obj[v.Code] : '--',
                 oldValue: upObj[v.Code].length > 0 ? upObj[v.Code] : '--'
               }
             }
@@ -1082,14 +1088,17 @@ export default {
         }
         if (v.DataType === 'Router') {
           item = {
-            oldValue: v.UrlConfig.IsHaveParameters ?  v.UrlConfig.RoutePath + '?' +
+            // oldValue: v.UrlConfig.IsHaveParameters ?  v.UrlConfig.RoutePath + '?' +
-              v.UrlConfig.ParameterList.map((v) => {
+            //   v.UrlConfig.ParameterList.map((v) => {
-                let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
+            //     let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
-                if (v.UrlParameterValueName === 'token') {
+            //     if (v.UrlParameterValueName === 'token') {
-                  a = getToken()
+            //       a = getToken()
-                }
+            //     }
-                return v.UrlParameterName + '=' + a + '&'
+            //     return v.UrlParameterName + '=' + a + '&'
-              }).toString().replaceAll(',', '')+'&'+'lang='+this.$i18n.locale +'&'+ 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath,
+            //   }).toString().replaceAll(',', '')+'&'+'lang='+this.$i18n.locale +'&'+ 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath,
+            
+            // 后端已确定旧数据不会有跳转 25/06/13
+            oldValue: '--',
             newValue: v.UrlConfig.IsHaveParameters ?  v.UrlConfig.RoutePath + '?' +
               v.UrlConfig.ParameterList.map((v) => {
                 let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]

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

@@ -952,19 +952,19 @@ export default {
             ) {
               ++instanceIndex
             }
-            if (instanceIndex >= fileList.length) {
+            // if (instanceIndex >= fileList.length) {
-              fileList.push({
+            //   fileList.push({
-                instanceUid: instanceUid,
+            //     instanceUid: instanceUid,
-                file: file,
+            //     file: file,
-              })
+            //   })
-            }
+            // }
-            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
+            // scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
-            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
+            // scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
-              (prev, next) => {
+            //   (prev, next) => {
-                return prev + next.file.size
+            //     return prev + next.file.size
-              },
+            //   },
-              0
+            //   0
-            )
+            // )
 
             var seriesUid = data.string('x0020000e')
             var seriesList = scope.uploadQueues[studyIndex].seriesList
@@ -1065,6 +1065,19 @@ export default {
               }
               instanceList.push(instanceItem)
             }
+            if (instanceIndex >= fileList.length) {
+              fileList.push({
+                instanceUid: instanceUid,
+                file: file,
+              })
+            }
+            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
+            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
+              (prev, next) => {
+                return prev + next.file.size
+              },
+              0
+            )
             resolve()
           } catch (error) {
             console.log(error)