From 9d47ae2561265904c262c3f2d595a9ac52b3ac3e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 27 Mar 2024 13:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E9=86=92=E7=AA=97=E5=8F=A3=E5=A4=9A?=
 =?UTF-8?q?=E6=AC=A1=E5=BC=B9=E5=87=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dcmUpload/anonymization.js              |  2 +-
 .../crc-upload/components/uploadDicomFiles2.vue   | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/utils/dcmUpload/anonymization.js b/src/utils/dcmUpload/anonymization.js
index a018d399..30e805ed 100644
--- a/src/utils/dcmUpload/anonymization.js
+++ b/src/utils/dcmUpload/anonymization.js
@@ -54,7 +54,7 @@ export const anonymization = function (file, config) {
             }
           }
         }
-        console.log(dataset)
+        // console.log(dataset)
         let newDicomFile = dataset.write()
         const bufferArray = new Uint8Array(newDicomFile)
         const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
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 3620c002..0429300e 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
@@ -581,7 +581,8 @@ export default {
       trialBodyPartTypes: [],
       trialModalitys: [],
       myInterval: [],
-      studyErrorList: []
+      studyErrorList: [],
+      confirmFlag:false
     }
   },
   mounted() {
@@ -669,8 +670,10 @@ export default {
               cancelButtonText: this.$t("common:button:cancel"),
               type: 'warning'
             }).then(() => {
+              this.confirmFlag = false;
               this.$emit("update:activeName",'clinical-data');
-            }).catch(() => {         
+            }).catch(() => {       
+              this.confirmFlag = false;  
             });
           }else{
             if(showConfirm) return;
@@ -940,7 +943,7 @@ export default {
     beginUploadQueues() {
       this.scanState = 'uploading'
       this.studyErrorList = []
-      console.log(this.uploadQueues, this.selectArr)
+      // console.log(this.uploadQueues, this.selectArr)
       this.warningArr = []
       for (let i = 0; i < this.selectArr.length; ++i) {
         const index = this.selectArr[i].studyIndex
@@ -1078,6 +1081,7 @@ export default {
           })
           this.$refs.pathClear.value = ''
           this.btnLoading = false
+          // console.log(11111);
           if (this.studyErrorList.length > 0) {
             let msg = this.$t('trials:uploadDicomFiles2:message:studyErrorList')
             msg = msg.replaceAll('xxx', this.studyErrorList.join('、'))
@@ -1087,6 +1091,9 @@ export default {
               this.beginUploadQueues()
             })
           }
+          if(this.confirmFlag){
+            this.getClinicalData(true);
+          }
         })
       }).catch(_ => { this.btnLoading = false })
     },
@@ -1378,7 +1385,7 @@ export default {
                 let flag = res.Result=== 'PET-CT' || res.Result==='CT、PT' || res.Result === 'PT、CT';
                 // let flag = params.study.seriesList.some(item=>item.modality==='PT');
                 if(flag){
-                  scope.getClinicalData(true);
+                  scope.confirmFlag = true;
                 }
                 scope.getStudyInfo()
                 if (scope.$route.path !== '/trials/trials-panel/visit/crc-question') {