From 5c3d0825c3f38529412ba41ef296bdf0e04b335e Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 30 Apr 2024 11:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestMain/index.vue      | 40 +++++--------------
 .../purchasereceiptRequestMain.data.ts        |  2 +-
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index faa674a8f..6db8c5f17 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -418,42 +418,24 @@ const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAcces
 // 标签打印
 const searchTableRef = ref()
 const labelPrint = async (row) => {
-  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 defaultParams = {'moduleName':'supplier','recordNumber':row.number}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
 
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
   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)
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
 }
+
 // 批量打印---采购收货申请
 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
   console.log('批量打印',val)
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 8a8f397c9..c3aca280e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -802,7 +802,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   },
   {
     label: '收货数量',
-    field: 'receivedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150