From 40a2767745242c570bfb8322d6b4900717846a41 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 12 Aug 2025 15:24:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8F=91=E8=B4=A7=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=8D=95=EF=BC=8C=E6=88=90=E5=8A=9F=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ecss/ecss.js                         |  2 -
 src/views/modules/ecss/codelnotify.vue       | 31 ++++++++-
 src/views/modules/ecss/createDeclaration.vue |  5 +-
 src/views/modules/ecss/del_upload_excel.vue  | 71 ++++++++++++++++----
 4 files changed, 87 insertions(+), 22 deletions(-)

diff --git a/src/api/ecss/ecss.js b/src/api/ecss/ecss.js
index df87e9c..8eeb8a4 100644
--- a/src/api/ecss/ecss.js
+++ b/src/api/ecss/ecss.js
@@ -44,8 +44,6 @@ export const deleteSubPropertiesValueForAlone= data => createAPI(`/ecss/coDel/de
 
 export const deleteHsCode= data => createAPI(`/ecss/coDel/deleteHsCode`,'post',data)
 
-export const searchCoDelPalletData= data => createAPI(`/ecss/coDel/searchCoDelPalletData`,'post',data)
-
 export const searchCoDelPalletDataNew= data => createAPI(`/ecss/coDel/searchCoDelPalletDataNew`,'post',data)
 
 export const selectBoxList = data => createAPI(`/ecss/coDel/selectBoxList`,'post',data)
diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue
index a45295c..870d9a1 100644
--- a/src/views/modules/ecss/codelnotify.vue
+++ b/src/views/modules/ecss/codelnotify.vue
@@ -85,6 +85,7 @@
           <a type="text" size="small" @click="updateHeaderModelDo(scope.row)">修改</a>
           <a type="text" style="color: green" size="small" v-if="scope.row.notifyStatus==='已计划' && scope.row.notifyStatus!=='订单取消'" @click="xiadaChoose()">下达</a>
           <a type="text" style="color: orange" size="small" v-if="scope.row.notifyStatus==='已下达'&& scope.row.notifyStatus!=='订单取消'" @click="jihuaEcssDel(scope.row)">取消下达</a>
+          <a type="text" style="color: green" size="small" v-if="scope.row.notifyStatus==='已下达' && scope.row.walMartOrderFlag==='Y'" @click="declarationCompleted(scope.row)">一键结单</a>
           <a type="text" style="color: red" size="small" v-if="scope.row.notifyStatus!=='订单取消'" @click="cancelDelHeader(scope.row)">废弃</a>
           <a type="text" style="color: red" size="small" v-if="scope.row.notifyStatus==='已计划'&& scope.row.notifyStatus!=='订单取消'" @click="deleteDelHeader(scope.row)">删除</a>
         </template>
@@ -158,9 +159,9 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="装箱明细" name="pallet">
-        <packing-detail-tab 
+        <packing-detail-tab
           ref="packingDetailTab"
-          :current-row="currentRow" 
+          :current-row="currentRow"
           :height="height">
         </packing-detail-tab>
       </el-tab-pane>
@@ -653,7 +654,6 @@
     changeEcssDelStatus,
     updateEcssDelDetail,
     deleteEcssDelDetail,
-    searchCoDelPalletData,
     searchCoDelPalletDataNew,
     queryPartListAll,
     searchTemplateList,
@@ -1871,6 +1871,31 @@
           })
         })
       },
+      declarationCompleted(row){
+        let inData={
+          site:row.site,
+          delNo:row.delNo,
+          walMartOrderFlag:row.walMartOrderFlag,
+          notifyStatus:'已报关'
+        }
+        this.$confirm('确认一键结单吗？', '提示').then(() => {
+          changeEcssDelStatus(inData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.searchTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
       // 每页数
       sizeChangeHandle3 (val) {
         this.pageSize3 = val
diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue
index f6d6dbd..d8e23dd 100644
--- a/src/views/modules/ecss/createDeclaration.vue
+++ b/src/views/modules/ecss/createDeclaration.vue
@@ -132,9 +132,9 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="装箱明细" name="pallet">
-        <packing-detail-tab 
+        <packing-detail-tab
           ref="packingDetailTab"
-          :current-row="currentRow" 
+          :current-row="currentRow"
           :height="height">
         </packing-detail-tab>
       </el-tab-pane>
@@ -482,7 +482,6 @@
   import {
     searchEcssCoDelNotifyHeaderForDanZheng,
     searchEcssCoDelNotifyDetail,
-    searchCoDelPalletData,
     searchCoDelPalletDataNew,
     getDeclarationDefaultData,
     saveDeclaration,
diff --git a/src/views/modules/ecss/del_upload_excel.vue b/src/views/modules/ecss/del_upload_excel.vue
index d74f7c9..ebfa35b 100644
--- a/src/views/modules/ecss/del_upload_excel.vue
+++ b/src/views/modules/ecss/del_upload_excel.vue
@@ -262,7 +262,7 @@
         if (this.cacheTimer) {
           clearTimeout(this.cacheTimer);
         }
-        
+
         // 设置新的定时器，500ms后执行保存
         this.cacheTimer = setTimeout(() => {
           try {
@@ -315,7 +315,7 @@
       init () {
         this.fileList = []
         this.cacheKey = this.generateCacheKey();
-        
+
         let tempData = {
           username: this.$store.state.user.name,
         }
@@ -329,14 +329,14 @@
           // 在获取BU列表后尝试加载缓存
           this.loadFromCache();
         })
-        
+
         getCustomerList({}).then(({data}) => {
           //区分请求成功和失败的状况
           if (data && data.code === 0) {
             this.customerList=data.rows
           }
         });
-        
+
         // 如果没有缓存数据，则初始化为空
         if (!this.loadFromCache()) {
           this.pageData.customerName=''
@@ -346,7 +346,7 @@
           this.pageData.overseasAddress='',
           this.pageData.salesArea=''
         }
-        
+
         this.customerPersons=[]
         this.customerAddrs=[]
         // 打开页面
@@ -481,20 +481,63 @@
         formData.append("overseasAddress", this.pageData.overseasAddress)
         formData.append("cnative", this.pageData.cnative)
         formData.append("salesArea", this.pageData.salesArea)
-        saveEcssCoDelNotifyByExcel(formData).then(({data}) => {
+        saveEcssCoDelNotifyByExcel(formData).then(({ data }) => {
           if (data.code === 0) {
-            this.$message.success(data.msg)
-            // 保存成功后清除缓存
-            this.clearCache()
-            // 关闭窗口并刷新页面
-            this.closeDialog()
+            const { resultMap } = data;
+            const successList = resultMap.success || [];
+            const failList = resultMap.fail || [];
+
+            // 紧凑样式
+            let html = `
+                    <div style="max-height:380px;overflow:auto;font-size:12px;line-height:1.4;">
+                  `;
+
+            if (successList.length > 0) {
+              html += `<div style="margin-bottom:6px;">
+                      <div style="color:green;font-weight:bold;margin-bottom:3px;">
+                        ✅ 成功（${successList.length}）
+                      </div>
+                      <table border="1" cellspacing="0" cellpadding="2"
+                        style="border-collapse:collapse;width:100%;">
+                    `;
+              successList.forEach(item => {
+                html += `<tr><td style="color:green;padding:2px 4px;">${item}</td></tr>`;
+              });
+              html += `</table></div>`;
+            }
+
+            if (failList.length > 0) {
+              html += `<div>
+                  <div style="color:red;font-weight:bold;margin-bottom:3px;">
+                    ❌ 失败（${failList.length}）
+                  </div>
+                  <table border="1" cellspacing="0" cellpadding="2"
+                    style="border-collapse:collapse;width:100%;">
+                `;
+              failList.forEach(item => {
+                html += `<tr><td style="color:red;padding:2px 4px;">${item}</td></tr>`;
+              });
+              html += `</table></div>`;
+            }
+
+            html += `</div>`;
+
+            this.$alert(html, '导入结果', {
+              confirmButtonText: '确定',
+              dangerouslyUseHTMLString: true,
+              callback: () => {
+                this.clearCache();
+                this.closeDialog();
+              }
+            });
           } else {
-            //this.$message.error(data.msg)
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
-            })
+            });
           }
-        })
+        });
+
+
       },
 
       // 下载