From 78f67bbfac045e27f14f10ae591a28fa314a72dc Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 19:58:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue    | 6 ++++--
 .../supplierdeliverRequestMain/labelForm.vue                | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 0a3bff66d..1a82e289a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -1023,6 +1023,7 @@ const submitFormLabel = async (data) => {
     
     console.log(data1)
     await message.confirm(t('ts.是否为此数据生成标签？'))
+    labelFormRef.value.isLoading = true
     await SupplierdeliverRequestMainApi.genLabel(data1)
     isCreateLabel.value = true
     message.success(t('ts.创建标签成功'))
@@ -1031,8 +1032,9 @@ const submitFormLabel = async (data) => {
     formLabelRef.value.formLoading = false
     formLabelRef.value.dialogVisible = false
     labelFormRef.value.formLoading = false
-    labelFormRef.value.dialogVisible = false
-
+    labelFormRef.value.dialogTableVisible = false
+    labelFormRef.value.isLoading = false
+    
   }
 }
 const clearInput = async (field, row, index) => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index ce6f5bb86..71dd6a519 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -6,6 +6,7 @@
       row-key="id"
       style="width: 1050px; max-height: 70vh; overflow-y: auto"
       v-if="tableData.length > 0 && dialogTableVisible == true"
+      v-loading='isLoading'
     >
       <el-table-column type="expand" width="50">
         <template #default="scope">
@@ -150,6 +151,7 @@ const dialogTableVisible = ref(false)
 const defaultExpandAll = ref(false)
 
 const tableData = ref([])
+const isLoading = ref(false)
 const openLabel = (tableList) => {
   dialogTableVisible.value = true
   tableData.value = tableList
@@ -317,7 +319,6 @@ const submitForm = () => {
     return
   }
   console.log(343546568678)
- 
   emit('submitForm', tableData.value)
 }
 // 添加托
@@ -467,7 +468,7 @@ const blurThree = (oneRow, twoRow) => {
 }
 // 传递给父类
 const emit = defineEmits(['submitForm'])
-defineExpose({ openLabel }) // 提供 open 方法，用于打开弹窗
+defineExpose({ openLabel,dialogTableVisible,isLoading }) // 提供 open 方法，用于打开弹窗
 </script>
 <style lang="scss" scoped>
 ::v-deep .row-expand-cover td .el-table__expand-icon {