From a36dce9f7f480c6b9933cd237a4fef69bd142129 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 24 Apr 2024 08:45:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      | 67 ++++++++++---------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index c449b614b..d502407d3 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -772,40 +772,41 @@ const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAcces
 // 标签打印
 const searchTableRef = ref()
 const labelPrint = async (row) => {
-  // tableObject.loading = true
-  // const subTableDFata = await PackageApi.getLabel(row.masterId)
-  // tableObject.loading = false
-  // const tableObject1 = {
-  //   // 当前页
-  //   currentPage: 1,
-  //   // 导出加载中
-  //   exportLoading: false,
-  //   // 加载中
-  //   loading: false,
-  //   // 页数
-  //   pageSize: subTableDFata.length,
-  //   params:null,
-  //   // 排序
-  //   sort: {
-  //     order: '', // 排序规则
-  //     prop: '' // 排序字段
-  //   },
-  //   // 总条数
-  //   total: subTableDFata.length,
-  //   // 表格数据
-  //   tableList: subTableDFata,
-  //   currentRow:null
-  // }
-  // console.log("标签打印",subTableDFata,tableObject1,SupplierdeliverRequestPackage.allSchemas)
-
-  // const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
-
-  // tableColumns.forEach((item) => {
-  //   item.width = item.table?.width || 150
-  // })
-  // searchTableRef.value.openData("采购收货记录单号",tableObject1,{tableColumns},true)
+  console.log("------------",row);
+  tableObject.loading = true
+  const subTableDFata = await PackageApi.getLabel(row.masterId)
+  tableObject.loading = false
+  const tableObject1 = {
+    // 当前页
+    currentPage: 1,
+    // 导出加载中
+    exportLoading: false,
+    // 加载中
+    loading: false,
+    // 页数
+    pageSize: subTableDFata.length,
+    params:null,
+    // 排序
+    sort: {
+      order: '', // 排序规则
+      prop: '' // 排序字段
+    },
+    // 总条数
+    total: subTableDFata.length,
+    // 表格数据
+    tableList: subTableDFata,
+    currentRow:null
+  }
+  console.log("标签打印",subTableDFata,tableObject1,SupplierdeliverRequestPackage.allSchemas)
+
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("采购收货记录单号",tableObject1,{tableColumns},true)
 
-  window.open(src.value + '&asn_number=' + row.asnNumber)
+  // window.open(src.value + '&asn_number=' + row.asnNumber)
 }
 // 批量打印
 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {