From de1ffc02a454312e04ef0725026060757a79e858 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Mon, 19 Aug 2024 17:44:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88=E9=97=AE?=
 =?UTF-8?q?=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/components/feedBack/index.vue             |   3 +-
 .../trials-layout/components/feedBack.vue     |   2 +-
 .../components/uploadDicomFiles2.vue          |   2 +-
 .../trials-panel/visit/crc-upload/index.vue   | 210 +++++++++---------
 4 files changed, 113 insertions(+), 104 deletions(-)

diff --git a/src/components/feedBack/index.vue b/src/components/feedBack/index.vue
index 8698c9ac..f0b44ff6 100644
--- a/src/components/feedBack/index.vue
+++ b/src/components/feedBack/index.vue
@@ -306,7 +306,8 @@ export default {
         if (res.IsSuccess) {
           this.$message.success(this.$t("feedBack:changeState:success"));
           this.$emit("success");
-          this.cancel();
+          // this.cancel();
+          this.getInfo(this.Id, this.visitTaskId);
         }
       } catch (err) {
         console.log(err);
diff --git a/src/views/trials/trials-layout/components/feedBack.vue b/src/views/trials/trials-layout/components/feedBack.vue
index 98d1dc8c..69c301ec 100644
--- a/src/views/trials/trials-layout/components/feedBack.vue
+++ b/src/views/trials/trials-layout/components/feedBack.vue
@@ -72,7 +72,7 @@ export default {
   position: fixed;
   bottom: 50px;
   right: -25px;
-  z-index: 1000;
+  z-index: 2000;
   width: 50px;
   height: 50px;
   background: rgba(64, 158, 255, 0.533);
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 896aac7b..6a972b32 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
@@ -859,7 +859,7 @@ export default {
       uploadCount: 0,
       uploadedCount: 0,
       wsList: [],
-      relationInfo: null,
+      relationInfo: {},
       trialBodyPartTypes: [],
       trialModalitys: [],
       myInterval: [],
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 4cc834e9..136fb8e6 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -414,109 +414,113 @@
     </el-dialog>
 
     <!-- 上传Dicom/非Dicom文件 -->
-    <el-dialog
-      v-if="uploadVisible"
-      :visible.sync="uploadVisible"
-      :fullscreen="true"
-      :close-on-click-modal="false"
-      custom-class="upload-dialog"
-      :before-close="beforeCloseUploadDig"
-    >
-      <span slot="title">
-        <el-breadcrumb separator-class="el-icon-arrow-right">
-          <label style="float: left;margin-right:10px;">Upload: </label>
-          <!-- <el-breadcrumb-item>Upload</el-breadcrumb-item> -->
-          <el-breadcrumb-item v-show="searchData.TrialCode">{{ searchData.TrialCode }}</el-breadcrumb-item>
-          <el-breadcrumb-item v-show="rowData.TrialSiteCode">{{ rowData.TrialSiteCode }}</el-breadcrumb-item>
-          <el-breadcrumb-item v-show="rowData.SubjectCode">{{ rowData.SubjectCode }}</el-breadcrumb-item>
-          <el-breadcrumb-item v-show="rowData.VisitName">{{ `${rowData.VisitName} (${rowData.VisitNum})` }}</el-breadcrumb-item>
-        </el-breadcrumb>
-      </span>
-      <div class="base-modal-body" style="display: flex;flex-direction: column;">
-        <el-form
-          v-show="(rowData.IsBaseLine && (otherInfo.IsHaveFirstGiveMedicineDate || otherInfo.IsEnrollementQualificationConfirm)) || (!rowData.IsBaseLine && otherInfo.IsPDProgressView)"
-          :inline="true"
-          class="base-search-form"
-          style="height: 60px;padding:10px;"
-        >
-          <!-- 访视基准日期 -->
-          <el-form-item
-            v-show="rowData.IsBaseLine && otherInfo.IsHaveFirstGiveMedicineDate"
-            :label="$t('trials:crcUpload:form:baseDateOfVisit')"
+    <div class="upload-dialog-box" v-if="uploadVisible">
+      <el-dialog
+        v-if="uploadVisible"
+        :visible.sync="uploadVisible"
+        :fullscreen="true"
+        :close-on-click-modal="false"
+        custom-class="upload-dialog"
+        :before-close="beforeCloseUploadDig"
+        :modal="false"
+      >
+        <span slot="title">
+          <el-breadcrumb separator-class="el-icon-arrow-right">
+            <label style="float: left;margin-right:10px;">Upload: </label>
+            <!-- <el-breadcrumb-item>Upload</el-breadcrumb-item> -->
+            <el-breadcrumb-item v-show="searchData.TrialCode">{{ searchData.TrialCode }}</el-breadcrumb-item>
+            <el-breadcrumb-item v-show="rowData.TrialSiteCode">{{ rowData.TrialSiteCode }}</el-breadcrumb-item>
+            <el-breadcrumb-item v-show="rowData.SubjectCode">{{ rowData.SubjectCode }}</el-breadcrumb-item>
+            <el-breadcrumb-item v-show="rowData.VisitName">{{ `${rowData.VisitName} (${rowData.VisitNum})` }}</el-breadcrumb-item>
+          </el-breadcrumb>
+        </span>
+        <div class="base-modal-body" style="display: flex;flex-direction: column;">
+          <el-form
+            v-show="(rowData.IsBaseLine && (otherInfo.IsHaveFirstGiveMedicineDate || otherInfo.IsEnrollementQualificationConfirm)) || (!rowData.IsBaseLine && otherInfo.IsPDProgressView)"
+            :inline="true"
+            class="base-search-form"
+            style="height: 60px;padding:10px;"
           >
-            <el-date-picker
-              v-model="rowData.SubjectFirstGiveMedicineTime"
-              type="date"
-              :picker-options="pickerOption"
-              value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
-              disabled
-            />
-          </el-form-item>
-          <!-- 入组确认评估 -->
-          <el-form-item
-            v-show="rowData.IsBaseLine && otherInfo.IsEnrollementQualificationConfirm"
-            :label="$t('trials:crcUpload:form:enrollmentConfirmation')"
-          >
-            <el-radio-group v-model="rowData.IsEnrollmentConfirm" disabled>
-              <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsEnrollmentConfirm${item.label}`">{{ item.label }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <!-- 疾病进展确认评估 -->
-          <el-form-item
-            v-show="!rowData.IsBaseLine && otherInfo.IsPDProgressView"
-            :label="$t('trials:crcUpload:form:pd')"
-          >
-            <el-radio-group v-model="rowData.PDState" disabled>
-              <el-radio v-for="item of $d.YesOrNoForInt" :label="item.value" :key="`PDState${item.label}`">{{ item.label }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-show="(rowData.IsBaseLine && (otherInfo.IsHaveFirstGiveMedicineDate || otherInfo.IsEnrollementQualificationConfirm)) || (!rowData.IsBaseLine && otherInfo.IsPDProgressView)">
-            <!-- 编辑 -->
-            <el-button
-              v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
-              type="primary"
-              icon="el-icon-edit"
-              style="margin-left:10px;"
-              @click="relationVisible = true"
+            <!-- 访视基准日期 -->
+            <el-form-item
+              v-show="rowData.IsBaseLine && otherInfo.IsHaveFirstGiveMedicineDate"
+              :label="$t('trials:crcUpload:form:baseDateOfVisit')"
             >
-              {{ $t('common:button:edit') }}
+              <el-date-picker
+                v-model="rowData.SubjectFirstGiveMedicineTime"
+                type="date"
+                :picker-options="pickerOption"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                disabled
+              />
+            </el-form-item>
+            <!-- 入组确认评估 -->
+            <el-form-item
+              v-show="rowData.IsBaseLine && otherInfo.IsEnrollementQualificationConfirm"
+              :label="$t('trials:crcUpload:form:enrollmentConfirmation')"
+            >
+              <el-radio-group v-model="rowData.IsEnrollmentConfirm" disabled>
+                <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsEnrollmentConfirm${item.label}`">{{ item.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <!-- 疾病进展确认评估 -->
+            <el-form-item
+              v-show="!rowData.IsBaseLine && otherInfo.IsPDProgressView"
+              :label="$t('trials:crcUpload:form:pd')"
+            >
+              <el-radio-group v-model="rowData.PDState" disabled>
+                <el-radio v-for="item of $d.YesOrNoForInt" :label="item.value" :key="`PDState${item.label}`">{{ item.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item v-show="(rowData.IsBaseLine && (otherInfo.IsHaveFirstGiveMedicineDate || otherInfo.IsEnrollementQualificationConfirm)) || (!rowData.IsBaseLine && otherInfo.IsPDProgressView)">
+              <!-- 编辑 -->
+              <el-button
+                v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
+                type="primary"
+                icon="el-icon-edit"
+                style="margin-left:10px;"
+                @click="relationVisible = true"
+              >
+                {{ $t('common:button:edit') }}
+
+              </el-button>
+            </el-form-item>
+          </el-form>
+          <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  :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" :activeName.sync="activeName"/>
+              <!-- <upload-dicom-files  :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" @setOpenWindow="setOpenWindow"/> -->
+            </el-tab-pane>
+            <!-- 非DICOM影像上传 -->
+            <el-tab-pane
+              :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')"
+              name="non-dicom"
+            >
+              <upload-non-dicom-files v-if="activeName==='non-dicom'" :data="rowData" :body-parts="otherInfo.BodyPartTypes" :modalities="otherInfo.Modalitys" :subject-visit-id="rowData.Id" :allow-add-or-edit="true" @getList="getList" />
+            </el-tab-pane>
+            <!-- 临床数据采集 -->
+            <el-tab-pane
+              v-if="rowData.IsBaseLine && (otherInfo.IsHaveSubjectClinicalData || otherInfo.IsHaveVisitClinicalData)"
+              :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')"
+              name="clinical-data"
+            >
+              <upload-clinical-data v-if="activeName==='clinical-data'" :subject-visit-id="rowData.Id" :data="rowData" :enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="true" @getList="getList" />
+            </el-tab-pane>
+            <!-- 临床数据采集2 -->
+            <el-tab-pane
+              v-if="!rowData.IsBaseLine && otherInfo.IsHaveVisitClinicalData"
+              :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')"
+              name="clinical-data"
+            >
+              <upload-clinical-data v-if="activeName==='clinical-data'" :subject-visit-id="rowData.Id" :data="rowData" :enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="true" @getList="getList" />
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </el-dialog>
+    </div>
 
-            </el-button>
-          </el-form-item>
-        </el-form>
-        <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  :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" :activeName.sync="activeName"/>
-            <!-- <upload-dicom-files  :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" @setOpenWindow="setOpenWindow"/> -->
-          </el-tab-pane>
-          <!-- 非DICOM影像上传 -->
-          <el-tab-pane
-            :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')"
-            name="non-dicom"
-          >
-            <upload-non-dicom-files v-if="activeName==='non-dicom'" :data="rowData" :body-parts="otherInfo.BodyPartTypes" :modalities="otherInfo.Modalitys" :subject-visit-id="rowData.Id" :allow-add-or-edit="true" @getList="getList" />
-          </el-tab-pane>
-          <!-- 临床数据采集 -->
-          <el-tab-pane
-            v-if="rowData.IsBaseLine && (otherInfo.IsHaveSubjectClinicalData || otherInfo.IsHaveVisitClinicalData)"
-            :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')"
-            name="clinical-data"
-          >
-            <upload-clinical-data v-if="activeName==='clinical-data'" :subject-visit-id="rowData.Id" :data="rowData" :enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="true" @getList="getList" />
-          </el-tab-pane>
-          <!-- 临床数据采集2 -->
-          <el-tab-pane
-            v-if="!rowData.IsBaseLine && otherInfo.IsHaveVisitClinicalData"
-            :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')"
-            name="clinical-data"
-          >
-            <upload-clinical-data v-if="activeName==='clinical-data'" :subject-visit-id="rowData.Id" :data="rowData" :enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="true" @getList="getList" />
-          </el-tab-pane>
-        </el-tabs>
-      </div>
-    </el-dialog>
 
     <!-- 检查列表 -->
     <el-dialog
@@ -524,7 +528,6 @@
       :visible.sync="studyVisible"
       :close-on-click-modal="false"
       :fullscreen="true"
-      custom-class="upload-dialog"
       :before-close="beforeCloseStudyDig"
     >
       <span slot="title">
@@ -1701,6 +1704,11 @@ export default {
 }
 </script>
 <style lang="scss">
+.upload-dialog-box{
+  .el-dialog__wrapper{
+    z-index: 1999 !important;
+  }
+}
 .visit-list{
   position: relative;
   .status-primary-circle{