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

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -302,7 +302,10 @@
           />
           <span>
             {{ $t('trials:uploadDicomList:table:uploadNow')
-            }}{{ scope.row.dicomInfo.failedFileCount }}/{{ scope.row.dicomInfo.fileCount }} ({{
+            }}{{ scope.row.dicomInfo.failedFileCount }}/{{
+              scope.row.dicomInfo.fileCount
+            }}
+            ({{
               (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2)
             }}MB/{{
               (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2)
@@ -483,6 +486,10 @@ export default {
         return {}
       },
     },
+    VisitTaskId: {
+      type: String,
+      default: '',
+    },
   },
   components: {
     'study-view': studyView,
@@ -556,6 +563,9 @@ export default {
           TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId,
           SubjectCode: this.SubjectCode,
         }
+        if (this.VisitTaskId) {
+          params.VisitTaskId = this.VisitTaskId
+        }
         this.loading = true
         let res = await getSubjectImageUploadList(params)
         this.loading = false

src/components/uploadDicomAndNonedicom/index.vue

@@ -18,6 +18,7 @@
           :SubjectId="SubjectId"
           :SubjectCode="SubjectCode"
           :Criterion="Criterion"
+          :VisitTaskId="VisitTaskId"
         />
       </el-tab-pane>
       <el-tab-pane
@@ -29,6 +30,7 @@
           :SubjectId="SubjectId"
           :SubjectCode="SubjectCode"
           :Criterion="Criterion"
+          :VisitTaskId="VisitTaskId"
         />
       </el-tab-pane>
     </el-tabs>
@@ -60,6 +62,10 @@ export default {
         return {}
       },
     },
+    VisitTaskId: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -63,7 +63,7 @@
                   <!-- 预览 -->
                   <viewer
                     :ref="files.row.Path"
-                    style="margin:0 10px;"
+                    style="margin: 0 10px"
                     :images="[`${OSSclientConfig.basePath}${files.row.Path}`]"
                   >
                     <el-button
@@ -81,7 +81,7 @@
                       crossorigin="anonymous"
                       :src="`${OSSclientConfig.basePath}${files.row.Path}`"
                       alt="Image"
-                    >
+                    />
                   </viewer>
                 </template>
               </el-table-column>
@@ -122,7 +122,7 @@
                   <!-- 预览 -->
                   <viewer
                     :ref="files.row.Path"
-                    style="margin:0 10px;"
+                    style="margin: 0 10px"
                     :images="[`${OSSclientConfig.basePath}${files.row.Path}`]"
                   >
                     <el-button
@@ -140,7 +140,7 @@
                       crossorigin="anonymous"
                       :src="`${OSSclientConfig.basePath}${files.row.Path}`"
                       alt="Image"
-                    >
+                    />
                   </viewer>
                 </template>
               </el-table-column>
@@ -394,6 +394,10 @@ export default {
         return {}
       },
     },
+    VisitTaskId: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
@@ -452,6 +456,9 @@ export default {
         this.searchData.TrialReadingCriterionId =
           this.Criterion.TrialReadingCriterionId
         this.searchData.SubjectCode = this.SubjectCode
+        if (this.VisitTaskId) {
+          this.searchData.VisitTaskId = this.VisitTaskId
+        }
         this.loading = true
         let res = await getIRUploadTaskNoneDicomStudyList(this.searchData)
         this.loading = false

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

@@ -719,6 +719,7 @@
       :subject-code="uploadSubjectCode"
       :criterion="uploadTrialCriterion"
       :visible.sync="uploadImageVisible"
+      :VisitTaskId="taskId"
     />
     <download-dicom-and-nonedicom
       v-if="downloadImageVisible"

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

@@ -473,7 +473,9 @@
           </div>
         </el-tooltip>
         <el-tooltip
-          v-if="trialCriterion.ImageUploadEnum > 0 && currentReadingTaskState < 2"
+          v-if="
+            trialCriterion.ImageUploadEnum > 0 && currentReadingTaskState < 2
+          "
           v-hasPermi="['role:ir']"
           class="item"
           effect="dark"
@@ -663,6 +665,7 @@
       :SubjectCode="uploadSubjectCode"
       :Criterion="uploadTrialCriterion"
       :visible.sync="uploadImageVisible"
+      :VisitTaskId="taskId"
     />
     <download-dicom-and-nonedicom
       v-if="downloadImageVisible"
@@ -890,7 +893,7 @@ export default {
       uploadSubjectCode: null,
       uploadTrialCriterion: {},
       uploadStatus: 'upload',
-      taskId: ''
+      taskId: '',
     }
   },
 
@@ -1075,7 +1078,7 @@ export default {
         .catch(() => {})
     },
     openUploadImage(status) {
-      const idx = this.visitTaskList.findIndex(i => i.IsCurrentTask)
+      const idx = this.visitTaskList.findIndex((i) => i.IsCurrentTask)
       if (idx > -1) {
         this.taskId = this.visitTaskList[idx].VisitTaskId
       }

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

@@ -367,9 +367,7 @@
           v-model="form.ImageDownloadEnum"
           :disabled="
             isConfirm ||
-            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-            form.IsReadingTaskViewInOrder === 0 ||
-            form.IsReadingTaskViewInOrder === 1
           "
         >
           <el-radio
@@ -390,9 +388,7 @@
           v-model="form.ImageUploadEnum"
           :disabled="
             isConfirm ||
-            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-            form.IsReadingTaskViewInOrder === 0 ||
-            form.IsReadingTaskViewInOrder === 1
           "
         >
           <el-radio