From 85c4cf89f6736499a60d0c5882e9a52d9544fb5f Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Thu, 22 Aug 2024 10:18:03 +0800
Subject: [PATCH] =?UTF-8?q?pacs=E4=B8=8A=E4=BC=A0=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crc-upload/components/uploadDiocmPacs.vue | 81 ++++++-------------
 1 file changed, 25 insertions(+), 56 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue
index 65c2db4a..a0951995 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue
@@ -222,43 +222,6 @@
         @pagination="getList"
       />
     </template>
-    <!-- 校验警告信息模态框 -->
-    <el-dialog
-      v-if="warnVisible"
-      :visible.sync="warnVisible"
-      width="500px"
-      :close-on-click-modal="false"
-      append-to-body
-      :title="$t('trials:uploadDicomPacs:dialogTitle:warning')"
-      custom-class="warning-dialog"
-    >
-      <div style="border: 1px solid #e0e0e0; padding: 10px">
-        <!-- Information from DICOM headers not consistent with that of this subject -->
-        <div style="color: red; font-size: 14px; margin-bottom: 10px">
-          {{ $t("trials:uploadDicomPacs:message:informationConsistent") }}:
-        </div>
-        <div v-for="(item, i) in warningArr" :key="item.index">
-          <div>
-            {{
-              `(${i + 1}). ${$t(
-                "trials:visit:crcUpload:uploadDicomPacs:table:accNumber"
-              )}: ${item.AccessionNumber}`
-            }}
-          </div>
-          <ul>
-            <li>{{ item.ErrorMesseage }}</li>
-          </ul>
-        </div>
-      </div>
-      <div slot="footer" class="base-modal-footer">
-        <el-button size="small" type="primary" @click="handleCancelWarnVisible">
-          {{ $t("common:button:cancel") }}
-        </el-button>
-        <el-button size="small" type="primary" @click="handleContinueUpload">
-          {{ $t("trials:uploadDicomList:button:upload") }}
-        </el-button>
-      </div>
-    </el-dialog>
   </BaseContainer>
 </template>
       <script>
@@ -308,7 +271,6 @@ export default {
       SCPStudyIdList: [],
       ReUploadSCPStudyIdList: [],
       warningArr: [],
-      warnVisible: false,
     };
   },
   created() {
@@ -316,19 +278,6 @@ export default {
     this.getDicomModalityList();
   },
   methods: {
-    // warning弹框取消按钮回调
-    handleCancelWarnVisible() {
-      this.warnVisible = false;
-      this.warningArr = [];
-    },
-    // 忽略warning继续上传
-    handleContinueUpload() {
-      this.handleCancelWarnVisible();
-      this.submitVisitStudyBinding(
-        this.SCPStudyIdList,
-        this.ReUploadSCPStudyIdList
-      );
-    },
     // 校验上传数据
     async verifyPacsImage(arr) {
       try {
@@ -355,10 +304,11 @@ export default {
               continue;
             }
             if (!item.AllowUpload && !item.AllowReUpload) {
-              let data = this.tableSelectData.find(
-                (d) => d.SCPStudyId === item.SCPStudyId
-              );
-              this.warningArr.push(Object.assign({}, data, item));
+              // let data = this.tableSelectData.find(
+              //   (d) => d.SCPStudyId === item.SCPStudyId
+              // );
+              // this.warningArr.push(Object.assign({}, data, item));
+              this.warningArr.push(item);
               continue;
             }
           }
@@ -368,7 +318,26 @@ export default {
               this.ReUploadSCPStudyIdList
             );
           } else {
-            this.warnVisible = true;
+            var li = this.warningArr.map((item) => {
+              return `<li>${item.ErrorMesseage}</li>`;
+            });
+            const content = `
+                        <div>
+                        <ol>
+                        ${li.join("")}
+                        </ol>
+                        </div>`;
+            this.$alert(
+              content,
+              this.$t("trials:uploadDicomList:label:prompt"),
+              {
+                confirmButtonText: this.$t(
+                  "trials:uploadDicomList:label:confirm"
+                ),
+                dangerouslyUseHTMLString: true,
+                callback: (action) => {},
+              }
+            );
             this.loading = false;
           }
         } else {