From 06b3632bf86b79b838d9b286e17687fd79706e63 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 28 Mar 2024 14:06:02 +0800
Subject: [PATCH] =?UTF-8?q?PET-CT=E6=84=9F=E5=8F=B9=E5=8F=B7=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=8F=8A=E6=97=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uploadDicomFiles2.vue          | 23 ++++++++-----------
 .../trials-panel/visit/crc-upload/index.vue   |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

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 0429300e..ed20b0c1 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
@@ -591,6 +591,7 @@ export default {
       this.form = { ...this.data }
     }
     this.getStudyInfo()
+    this.uploadQueues=[];
   },
   beforeDestroy() {
     this.myInterval.forEach(v => {
@@ -654,17 +655,14 @@ export default {
       getCRCClinicalData(param).then(res => {
         if(res.IsSuccess){
           let flag = res.Result.some(item=>item.ClinicalDataLevel===4&&item.PDFFileList.length===0)
-          if(flag){
-          if(!showConfirm){
-            data.forEach(item =>{
-              item.notClinicaData = false;
-              if(item.Modalities==="CT、PT"||item.Modalities==="PT、CT"||item.Modalities==="PET-CT"){
-                item.notClinicaData = true;
-              }
-            })
-            this.studyList = data;
-            return false;
-          }
+          data.forEach(item =>{
+            item.notClinicaData = false;
+            if((item.Modalities==="CT、PT"||item.Modalities==="PT、CT"||item.Modalities==="PET-CT")&& flag){
+              item.notClinicaData = true;
+            }
+          })
+          this.studyList = data;
+          if(flag&&showConfirm){
           this.$confirm(this.$t("trials:crc-upload:confirm:message"), this.$t('trials:uploadDicomList:label:prompt'), {
               confirmButtonText: this.$t('trials:reviewTrack:impactList:save'),
               cancelButtonText: this.$t("common:button:cancel"),
@@ -675,9 +673,6 @@ export default {
             }).catch(() => {       
               this.confirmFlag = false;  
             });
-          }else{
-            if(showConfirm) return;
-            this.studyList = data;
           }
         }
         // this.clinicalDatas = res.Result
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 126463df..4e449d55 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -479,7 +479,7 @@
         <el-tabs v-model="activeName" type="border-card" style="flex:1;">
           <!-- DICOM影像上传 -->
           <el-tab-pane :label="$t('trials:uploadedDicoms:tab:uploadDicoms')" name="dicom">
-            <upload-dicom-files2 v-if="uploadVisible2" :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" :activeName.sync="activeName"/>
+            <upload-dicom-files2 v-if="uploadVisible2&&activeName==='dicom'" :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" :activeName.sync="activeName"/>
             <upload-dicom-files v-else :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" @setOpenWindow="setOpenWindow"/>
           </el-tab-pane>
           <!-- 非DICOM影像上传 -->