From e47c75937c6832525e0a101681a3c995b0ccf516 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Fri, 6 Sep 2024 17:41:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=80=9F=E7=8E=87?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/uploadDicomAndNonedicom/dicomFile.vue       | 1 +
 src/components/uploadDicomAndNonedicom/nonedicomFile.vue   | 7 +++++--
 .../visit/crc-upload/components/uploadDicomFiles2.vue      | 6 +++---
 .../visit/crc-upload/components/uploadNonDicomFiles.vue    | 6 +++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 193a80d2..deaf517d 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -139,6 +139,7 @@
     </el-table>
     <div class="top" style="margin: 10px 0">
       <span>{{ $t('upload:dicom:uploadTitle') }}</span>
+      <span style="margin-left: 10px">{{ $store.state.trials.uploadTip }}</span>
     </div>
     <!--上传列表-->
     <el-table
diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index 0207e11c..6eb6e95b 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -230,9 +230,9 @@
               {{ $t('trials:uploadNonDicoms:button:select') }}
             </div>
           </div>
-          <span style="margin-left: 10px">{{
+          <!-- <span style="margin-left: 10px">{{
             $store.state.trials.uploadTip
-          }}</span>
+          }}</span> -->
         </div>
       </form>
       <!-- 文件列表 -->
@@ -316,6 +316,9 @@
         </el-table-column>
       </el-table>
       <div style="text-align: right; padding: 10px 0px">
+        <span style="margin-right: 10px">{{
+          $store.state.trials.uploadTip
+        }}</span>
         <el-button
           size="small"
           type="primary"
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 894a0487..cee25238 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -231,9 +231,6 @@
                 @change="beginScanFiles($event)"
               />
             </div>
-            <span style="margin-left: 10px">{{
-              $store.state.trials.uploadTip
-            }}</span>
           </div>
         </form>
 
@@ -578,6 +575,9 @@
           <!-- <el-button :disabled="btnLoading" size="small" type="primary" @click="cancel">
         {{ $t('trials:uploadDicomList:button:close') }}
       </el-button> -->
+          <span style="margin-right: 10px">{{
+            $store.state.trials.uploadTip
+          }}</span>
           <!-- 上传 -->
           <el-button
             size="small"
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
index 09b5b956..4b5a3e63 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
@@ -336,9 +336,6 @@
               {{ $t('trials:uploadNonDicoms:button:select') }}
             </div>
           </div>
-          <span style="margin-left: 10px">{{
-            $store.state.trials.uploadTip
-          }}</span>
         </div>
       </form>
       <!-- 文件列表 -->
@@ -422,6 +419,9 @@
         </el-table-column>
       </el-table>
       <div style="text-align: right; padding: 10px 0px">
+        <span style="margin-right: 10px">{{
+          $store.state.trials.uploadTip
+        }}</span>
         <el-button
           size="small"
           type="primary"

From 07b2341f93e30b5ce9cc44978e3780cb941ca448 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Fri, 6 Sep 2024 17:54:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?ir=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/reading/reading-task/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 6113a708..e4ee79ff 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@@ -171,7 +171,7 @@
                   <!-- 下载 -->
                   <el-button
                     v-if="
-                      item.ImageDownloadEnum === 1 &&
+                      item.ImageDownloadEnum > 0 &&
                       item.IsReadingTaskViewInOrder > 0 &&
                       !scope.row.IsSubjectJudge
                     "