From a1addde722cefd9c264a00d65d00859ace2e86a5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Thu, 26 Sep 2024 10:43:00 +0800
Subject: [PATCH] =?UTF-8?q?crc=E4=B8=8A=E4=BC=A0=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=8F=8Air=E4=B8=8B=E8=BD=BDsubjectId=E5=92=8Ccode=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/downloadDicomAndNonedicom/index.vue          | 5 +++--
 src/components/uploadDicomAndNonedicom/dicomFile.vue        | 1 +
 src/utils/multipartUpload/oss.js                            | 5 +++++
 .../visit/crc-upload/components/uploadDicomFiles2.vue       | 6 +++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index ed72d860..560f4b80 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -31,6 +31,7 @@
         <el-button
           type="primary"
           size="mini"
+          v-if="hasDicom || hasNonedicom"
           @click.stop="getIRReadingDownloadStudyInfo('all')"
         >
           {{ $t('download:button:downloadAll') }}
@@ -257,9 +258,9 @@ export default {
     async getIRReadingDownloadStudyInfo(type, row) {
       try {
         let data = {
-          SubjectId: this.SubjectId,
+          SubjectId: this.SubjectId || this.list[0].SubjectId,
           TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId,
-          SubjectCode: this.SubjectCode,
+          SubjectCode: this.SubjectCode || this.list[0].SubjectCode,
           SubjectVisitTaskList: [],
           DicomStudyIdList: [],
           NoneDicomStudyIdList: [],
diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index e64115f1..c9861d00 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -1090,6 +1090,7 @@ export default {
       this.btnLoading = true
       var studyList = []
       this.selectArr.forEach((item) => {
+        item.dicomInfo.uploadFileSize = 0
         if (!item.uploadState.selected) {
           studyList.push({
             studyInstanceUid: item.dicomInfo.studyUid,
diff --git a/src/utils/multipartUpload/oss.js b/src/utils/multipartUpload/oss.js
index f7309db9..106071ae 100644
--- a/src/utils/multipartUpload/oss.js
+++ b/src/utils/multipartUpload/oss.js
@@ -92,10 +92,15 @@ async function multipartUpload(OSSclient, partSize, saveFileId, uploadFile, data
             // 重新去掉某个缓存进行设置
             delete savaData[saveFileId];
             saveFinishedData(savaData);
+        } else if (res.res.status === 404) {
+            delete savaData[saveFileId];
+            saveFinishedData(savaData);
         }
         return res;
     } catch (e) {
         console.log(e);
+        delete savaData[saveFileId];
+        saveFinishedData(savaData);
         // 捕获超时异常。
         if (e.code === "ConnectionTimeoutError") {
             console.log("TimeoutError");
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 6eedea47..828f9efc 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
@@ -406,7 +406,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)
@@ -1364,6 +1367,7 @@ export default {
       this.btnLoading = true
       var studyList = []
       this.selectArr.forEach((item) => {
+        item.dicomInfo.uploadFileSize = 0
         if (!item.uploadState.selected) {
           studyList.push({
             studyInstanceUid: item.dicomInfo.studyUid,