From 831677852d712c144b6e12938b94f1c85b2ca8c9 Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Tue, 11 Nov 2025 09:51:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/views/wms/coil/merge.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue
index 6fc10513..06d645cd 100644
--- a/klp-ui/src/views/wms/coil/merge.vue
+++ b/klp-ui/src/views/wms/coil/merge.vue
@@ -730,6 +730,7 @@ export default {
         return;
       }
 
+      let loadingInstance = null;
       try {
         this.loading = true;
 
@@ -759,11 +760,12 @@ export default {
         };
 
         console.log('提交的合卷数据:', mergeData);
-        const loadingInstance = this.$loading({
+        loadingInstance = this.$loading({
           lock: true,
           text: '正在合卷，请稍后...',
           background: 'rgba(0, 0, 0, 0.7)'
-        })
+        });
+        
         const response = await mergeMaterialCoil(mergeData);
         if (response.code === 200) {
           this.$message.success('合卷保存成功');
@@ -783,7 +785,9 @@ export default {
         console.error(error);
       } finally {
         this.loading = false;
-        loadingInstance.close();
+        if (loadingInstance) {
+          loadingInstance.close();
+        }
       }
     },