From 87ea9c16cbd5fa47da338b38767f234a51d23170 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 2 Dec 2025 14:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=B8=8D=E6=8A=9B=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E5=89=8D=E7=AB=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/del_upload_excel.vue | 88 +++++++++++++++++++--
 1 file changed, 80 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/ecss/del_upload_excel.vue b/src/views/modules/ecss/del_upload_excel.vue
index 1b3e379..caeadba 100644
--- a/src/views/modules/ecss/del_upload_excel.vue
+++ b/src/views/modules/ecss/del_upload_excel.vue
@@ -33,13 +33,13 @@
         <p style="margin-top: 10px; color: #666;">正在解析文件，请稍候...</p>
       </div>
 
-      <div v-if="showPreview" style="margin-top: 20px; margin-bottom: 30px;">
+      <div v-if="showPreview" style="margin-top: 10px; margin-bottom: 10px;">
         <!-- 可导入的发票表格 -->
         <div v-if="validInvoices.length > 0">
-          <h4 style="color: #67C23A; margin-bottom: 15px;">
+          <span style="color: #67C23A; ">
             <i class="el-icon-success" style="margin-right: 8px;"></i>
             可导入的发票 (共{{ validInvoices.length }}个发票)
-          </h4>
+          </span>
           <el-table :data="validInvoices" border style="width: 100%" max-height="300" :show-overflow-tooltip="true" class="delClass valid-table">
           <el-table-column label="操作" width="40" fixed="left">
             <template slot-scope="scope">
@@ -162,11 +162,11 @@
         </div>
 
         <!-- 物料不存在的发票表格 -->
-        <div v-if="invalidInvoices.length > 0" style="margin-top: 30px;">
-          <h4 style="color: #F56C6C; margin-bottom: 15px;">
+        <div v-if="invalidInvoices.length > 0" style="margin-top: 10px;margin-bottom: 10px">
+          <span style="color: #F56C6C;">
             <i class="el-icon-warning" style="margin-right: 8px;"></i>
             物料不存在的发票 (共{{ invalidInvoices.length }}个发票，将不会导入)
-          </h4>
+          </span>
           <el-table :data="invalidInvoices" border style="width: 100%" max-height="300" :show-overflow-tooltip="true" class="delClass invalid-table">
             <el-table-column prop="cmcInvoice" label="发票号" width="120" fixed="left">
               <template slot-scope="scope">
@@ -224,6 +224,44 @@
             <el-table-column prop="shippingMode" label="运输方式" min-width="80"></el-table-column>
           </el-table>
         </div>
+
+        <!-- Sheet错误信息展示 -->
+        <div v-if="sheetErrors.length > 0" style="margin-bottom: 5px;">
+          <span style="color: #E6A23C; ">
+            <i class="el-icon-warning" style="margin-right: 8px;"></i>
+            Sheet处理警告 (共{{ sheetErrors.length }}个Sheet存在问题)
+          </span>
+          <el-table :data="sheetErrors" border style="width: 100%" max-height="400" class="delClass warning-table">
+            <el-table-column prop="sheetName" label="Sheet名称" width="150" fixed="left" >
+              <template slot-scope="scope">
+                <span style="font-weight: bold;">{{ scope.row.sheetName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="errorMessage" label="原因" min-width="300">
+              <template slot-scope="scope">
+                <div>
+                  <el-tooltip
+                    v-if="scope.row.errorDetails && scope.row.errorDetails.length > 0"
+                    placement="top"
+                    effect="light">
+                    <div slot="content" style="max-width: 500px; line-height: 1.6;">
+                      <div style="font-weight: bold; margin-bottom: 8px; color: #E6A23C;">详细错误信息 (共{{ scope.row.errorDetails.length }}条)：</div>
+                      <div v-for="(detail, index) in scope.row.errorDetails" :key="index" style="margin-bottom: 6px;">
+                        <span style="color: #E6A23C; font-weight: bold;">{{ index + 1 }}.</span> {{ detail }}
+                      </div>
+                    </div>
+                    <div style="font-size: 12px; color: #909399; cursor: pointer; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+                      <span v-for="(detail, index) in scope.row.errorDetails" :key="index">
+                        <span v-if="index > 0">; </span>
+                        <span style="color: #E6A23C; font-weight: bold;">{{ index + 1 }}.</span> {{ detail }}
+                      </span>
+                    </div>
+                  </el-tooltip>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
       </div>
 
       <span slot="footer" class="dialog-footer" style="margin-top: 10px">
@@ -531,6 +569,7 @@
         saveButtonLoading: false, // 保存按钮加载状态
         confirmSaveButtonLoading: false, // 确认保存按钮加载状态
         deletedInvoices: [], // 被删除的发票号列表
+        sheetErrors: [], // Sheet错误信息列表
         customSearchData: {},
         customerList : [],//所有客户
         customerAddrs : [],//地址
@@ -977,9 +1016,9 @@
           this.$message.error("请先上传文件!")
           return false
         }
-        
+
         this.saveButtonLoading = true // 开始加载
-        
+
         const formData = new FormData()
         formData.append("buNo",this.pageData.buNo)
         formData.append("username",this.$store.state.user.name)
@@ -1079,9 +1118,26 @@
 
           if (data.code === 0) {
             this.previewData = data.data || []
+            this.sheetErrors = data.sheetErrors || []
             this.showPreview = true
             // 清空删除列表，因为这是新的文件预览
             this.deletedInvoices = []
+
+            // 如果有Sheet错误，显示警告信息
+            if (this.sheetErrors.length > 0) {
+              const skippedCount = this.sheetErrors.filter(e => e.skipped).length
+              const errorCount = this.sheetErrors.filter(e => !e.skipped).length
+              let message = `文件解析完成，但有 ${this.sheetErrors.length} 个Sheet存在问题`
+              if (skippedCount > 0) {
+                message += `（${skippedCount}个已跳过`
+              }
+              if (errorCount > 0) {
+                message += `${skippedCount > 0 ? '，' : '（'}${errorCount}个处理失败`
+              }
+              message += '），请查看详细信息'
+              this.$message.warning(message)
+            }
+
             // 为每个发票号初始化客户信息
             this.previewData.forEach(item => {
               this.$set(item, 'selectedTemplate', '')
@@ -1230,6 +1286,7 @@
       cancelPreview() {
         this.showPreview = false
         this.previewData = []
+        this.sheetErrors = []
         this.fileList = []
         this.selectedFile = null
         this.deletedInvoices = []
@@ -1243,6 +1300,7 @@
       // 清除预览数据
       clearPreviewData() {
         this.previewData = []
+        this.sheetErrors = []
         this.showPreview = false
         this.selectedFile = null
         this.fileList = []
@@ -1655,4 +1713,18 @@
   background-color: #FDF2F2 !important;
 }
 
+/* Sheet错误表格样式 */
+.warning-table .el-table__header {
+  background-color: #FDF6EC !important;
+}
+
+.warning-table .el-table th {
+  background-color: #FDF6EC !important;
+  color: #E6A23C !important;
+}
+
+.warning-table .el-table .el-table__row:hover > td {
+  background-color: #FEF5E7 !important;
+}
+
 </style>