From cd24670d917cb91fe4b580fb32d1de10178e6803 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 18 四月 2025 11:15:29 +0800
Subject: [PATCH] qx

---
 src/views/reservation/resercopy/index.vue |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index fed9291..777b0d3 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -210,7 +210,7 @@
         ref="upload"
         :limit="1"
         :key="uploadKey" 
-        accept=".xlsx, .xls"
+        accept=".xls"
         :headers="upload.headers"
         :data="data"
         :action="upload.url"
@@ -227,7 +227,7 @@
             <el-checkbox v-model="upload.updateSupport" />
             鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
           </div>
-          <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span>
+          <span>浠呭厑璁稿鍏ls鏍煎紡鏂囦欢銆�</span>
           <el-link
             type="primary"
             :underline="false"
@@ -902,15 +902,30 @@
         // Message.warning(response.msg);
         // this.$modal.msgError(response.msg);
         // this.$modal.msgError("浜哄憳"+ response.data.list + "淇℃伅閿欒");
-        const errorList = response.data.list.join(", ");
-       
-        this.$confirm(`${errorList}`, `${response.msg}`, {
-          confirmButtonText: "纭畾",
-          cancelButtonText: "鍙栨秷",
-          type: "error",
-          center: true,
-          dangerouslyUseHTMLString: true,
-        });
+        if (response.data) {
+          if (response.data.list) {
+            const errorList = `
+  <div style="max-height: 300px; overflow-y: auto;">
+    ${response.data.list.join(", ")}
+  </div>`
+
+            this.$confirm(errorList, `${response.msg}`, {
+              confirmButtonText: "纭畾",
+              cancelButtonText: "鍙栨秷",
+              type: "error",
+              center: true,
+              dangerouslyUseHTMLString: true,
+            });
+          }
+        } else {
+          this.$confirm(`${response.msg}`, {
+            confirmButtonText: "纭畾",
+            cancelButtonText: "鍙栨秷",
+            type: "error",
+            center: true,
+            dangerouslyUseHTMLString: true,
+          });
+        }
       }else{
         this.isdisabled = false;
         this.ListObj = response.data;

--
Gitblit v1.8.0