From c7be87fb7a3887189b0010529fc45a48ba2582ce Mon Sep 17 00:00:00 2001
From: liushiwei <499672082@qq.com>
Date: Tue, 12 Sep 2023 08:52:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/shipping/NormalSendGoods.vue | 2 ++
 src/view/shipping/ShippingDesk.vue    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/view/shipping/NormalSendGoods.vue b/src/view/shipping/NormalSendGoods.vue
index e5943d4..65b8364 100644
--- a/src/view/shipping/NormalSendGoods.vue
+++ b/src/view/shipping/NormalSendGoods.vue
@@ -463,9 +463,11 @@
                     this.getList(data, this.mallList[this.loadMallIndex].mallId, this.mallList[this.loadMallIndex].mallName, 1)
                   } else {
                     this.isLoading = false
+                    this.isDlgLoading = false
                     Message.success("所有店铺备货单已加载完成")
                   }
                 } else {
+                  this.isLoading = false
                   this.isDlgLoading = false
                 }
               }
diff --git a/src/view/shipping/ShippingDesk.vue b/src/view/shipping/ShippingDesk.vue
index 9b909f0..1609c53 100644
--- a/src/view/shipping/ShippingDesk.vue
+++ b/src/view/shipping/ShippingDesk.vue
@@ -72,7 +72,7 @@
           <el-table-column slot="options" label="操作" width="80px" v-if="!isBegin" show-overflow-tooltip align="center" fixed="right">
             <template slot-scope="{ row }">
               <div class="table-options">
-                <el-button type="text" @click="remove(row.subPurchaseOrderSn)">移除</el-button>
+                <el-button type="text" @click="remove(row.subPurchaseOrderBasicVO.subPurchaseOrderSn)">移除</el-button>
               </div>
             </template>
             </el-table-column>
@@ -331,9 +331,11 @@
                     this.getList(data, this.mallList[this.loadMallIndex].mallId, this.mallList[this.loadMallIndex].mallName, 1)
                   } else {
                     this.isLoading = false
+                  this.isDlgLoading = false
                     Message.success("所有店铺备货单已加载完成")
                   }
                 } else {
+                  this.isLoading = false
                   this.isDlgLoading = false
                 }
               }