From 9752fd694644ee8b102e964439106f2b611155bd Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Tue, 24 Sep 2024 10:09:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/reading-unit/components/ReadingRules.vue      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index dd903904..0fec6a0c 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/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']) ||
-            form.IsReadingTaskViewInOrder === 0 ||
-            form.IsReadingTaskViewInOrder === 1
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
           "
         >
           <el-radio
@@ -390,9 +388,7 @@
           v-model="form.ImageUploadEnum"
           :disabled="
             isConfirm ||
-            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-            form.IsReadingTaskViewInOrder === 0 ||
-            form.IsReadingTaskViewInOrder === 1
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
           "
         >
           <el-radio

From 2b5ee56e6b73a315509cca4d7e6c1a0a54250b82 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Tue, 24 Sep 2024 11:02:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E9=98=85=E7=89=87=E8=A7=84=E5=88=99=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E4=BB=BB=E5=8A=A1id=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uploadDicomAndNonedicom/dicomFile.vue         | 12 +++++++++++-
 src/components/uploadDicomAndNonedicom/index.vue  |  6 ++++++
 .../uploadDicomAndNonedicom/nonedicomFile.vue     | 15 +++++++++++----
 .../reading/dicoms/components/DicomViewer.vue     |  1 +
 .../dicoms/customize/CustomizeDicomViewer.vue     |  9 ++++++---
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index ae708f0f..0814cf64 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/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
diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue
index 7b767b4e..1b3d5633 100644
--- a/src/components/uploadDicomAndNonedicom/index.vue
+++ b/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 {
diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index 1ba2b9fd..9b54496c 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/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
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 70704988..2192fa44 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/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"
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index 795bf388..b293b56a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/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
       }