From 386db94fdbeff2a19c2d39cc64704b802470e74d Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Tue, 24 Sep 2024 17:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=A1=B5=E9=9D=A2=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E6=A0=B9=E6=8D=AE=E9=98=85=E7=89=87=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E8=BF=9B=E8=A1=8C=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uploadDicomAndNonedicom/dicomFile.vue          | 14 ++++++++++----
 src/components/uploadDicomAndNonedicom/index.vue   |  7 ++++++-
 .../reading/dicoms/components/DicomViewer.vue      |  1 +
 .../dicoms/customize/CustomizeDicomViewer.vue      |  1 +
 .../trials-panel/reading/reading-task/index.vue    |  1 +
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 492930e9..e64115f1 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -4,7 +4,9 @@
       <span>{{ $t('upload:dicom:title') }}</span>
       <div class="tip">
         <i class="el-icon-warning-outline"></i>
-        <div v-html="$t('upload:dicom:tip:message1')"></div>
+        <div
+          v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"
+        ></div>
       </div>
     </div>
     <!--检查列表-->
@@ -486,7 +488,7 @@ export default {
         return {}
       },
     },
-    VisitTaskId: {
+    TaskId: {
       type: String,
       default: '',
     },
@@ -494,6 +496,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      default: 0,
+    },
   },
   components: {
     'study-view': studyView,
@@ -567,8 +573,8 @@ export default {
           TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId,
           SubjectCode: this.SubjectCode,
         }
-        if (this.VisitTaskId) {
-          params.VisitTaskId = this.VisitTaskId
+        if (this.TaskId) {
+          params.VisitTaskId = this.TaskId
         }
         this.loading = true
         let res = await getSubjectImageUploadList(params)
diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue
index 04eea735..6304ac76 100644
--- a/src/components/uploadDicomAndNonedicom/index.vue
+++ b/src/components/uploadDicomAndNonedicom/index.vue
@@ -18,8 +18,9 @@
           :SubjectId="SubjectId"
           :SubjectCode="SubjectCode"
           :Criterion="Criterion"
-          :VisitTaskId="VisitTaskId"
+          :TaskId="VisitTaskId"
           :isUpload.sync="isUpload"
+          :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
         />
       </el-tab-pane>
       <el-tab-pane
@@ -68,6 +69,10 @@ export default {
       type: String,
       default: '',
     },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      default: 0,
+    },
   },
   data() {
     return {
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 2192fa44..afa916ac 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -720,6 +720,7 @@
       :criterion="uploadTrialCriterion"
       :visible.sync="uploadImageVisible"
       :VisitTaskId="taskId"
+      :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
     />
     <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 b293b56a..2392b460 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -666,6 +666,7 @@
       :Criterion="uploadTrialCriterion"
       :visible.sync="uploadImageVisible"
       :VisitTaskId="taskId"
+      :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
     />
     <download-dicom-and-nonedicom
       v-if="downloadImageVisible"
diff --git a/src/views/trials/trials-panel/reading/reading-task/index.vue b/src/views/trials/trials-panel/reading/reading-task/index.vue
index bd730c98..e46e1c6f 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@@ -274,6 +274,7 @@
       :SubjectId="uploadSubjectId"
       :SubjectCode="uploadSubjectCode"
       :Criterion="uploadTrialCriterion"
+      :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
       :visible.sync="uploadImageVisible"
     />
     <download-dicom-and-nonedicom