From 9f00b72ddfd6554451d7de5ccec7abe0e22cbbfe Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 15 Dec 2024 13:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventoryManage/package/index.vue     | 13 ++++++++++---
 .../inventoryinitRecordMain/index.vue               |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
index 245b50ddd..de25d59ad 100644
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -368,9 +368,16 @@ const handlePoint = async (row) => {
       window.open(src.value+'&asn_number='+res.zzLabel)
     }
      if(res.xdpLabel){
-      //制造标签
-      const src = ref(BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken())
-      window.open(src.value+'&asn_number='+res.xdpLabel)
+       //协定品标签
+      // const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      // window.open(src.value+'&asn_number='+res.cgLabel)
+       PackageApi.getPrintingLableId({packingNumbers:[row.number]}).then(res => {
+        console.log(res)
+        window.open(BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken()+'&id=' + res)
+      }).catch(err => {
+        console.log(err)
+        message.error('创建标签失败')
+      })
     }
     if (res.cgLabel) {
       //采购标签
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
index 8d05a5d68..6177df724 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
@@ -220,8 +220,8 @@ const handleSelectionPoint = async ()=>{
       window.open(src.value+'&asn_number='+res.zzLabel)
     }
      if(res.xdpLabel){
-      //制造标签
-      const src = ref(BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken())
+      //协定品标签
+      const src = ref(BASE_URL + '/jmreport/view/1027757375736582144?token=' + getAccessToken())
       window.open(src.value+'&asn_number='+res.xdpLabel)
     }
     if (res.cgLabel) {