Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/wms/package/index.ts

@@ -106,6 +106,11 @@ export const getLabel = async (id: number) => {
   return await request.get({ url: `/wms/package/getLabel?id=` + id })
 }
 
+// 打印标签获取包装列表
+export const getLabelDetailPage = async (moduleType:string,number: string,) => {
+  return await request.get({ url: `/wms/package/getLabelDetailPage?moduleName=` + moduleType+ `&recordNumber=`+number})
+}
+
 // 根据库存余额获取包装信息进行打印标签
 export const getBalanceToPackage = async (packingNumber: String) => {
   return await request.get({ url: `/wms/package/getBalanceToPackage?packingNumber=` + packingNumber})

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -792,7 +792,7 @@ const searchTableRef = ref()
 const labelPrint = async (row) => {
   console.log("------------",row);
   tableObject.loading = true
-  const subTableDFata = await PackageApi.getLabel(row.masterId)
+  const subTableDFata = await PackageApi.getLabelDetailPage('supplier',row.number)
   tableObject.loading = false
   const tableObject1 = {
     // 当前页