From f78762ac51b29f66f22b2b71897ad68e2e4764ec Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 15 Dec 2024 13:16:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=88=9D=E5=A7=8B=E5=8C=96=E8=AE=B0=E5=BD=95=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/inventoryManage/package/index.vue     |  5 +++++
 .../inventoryinitRecordMain/index.vue         |  5 +++++
 .../index.vue                                 |  2 +-
 .../purchasereceiptRequestMain/index.vue      | 20 +++++++++----------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
index aff656946..0e70f3b10 100644
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -366,6 +366,11 @@ const handlePoint = async (row) => {
       //制造标签
       const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
       window.open(src.value+'&asn_number='+res.zzLabel)
+    }
+     if(res.xdpNumber){
+      //制造标签
+      const src = ref(BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken())
+      window.open(src.value+'&asn_number='+res.xdpNumber)
     }
     if (res.cgLabel) {
       //采购标签
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
index 288900b56..21c4cf420 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
@@ -218,6 +218,11 @@ const handleSelectionPoint = async ()=>{
       //制造标签
       const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
       window.open(src.value+'&asn_number='+res.zzLabel)
+    }
+     if(res.xdpNumber){
+      //制造标签
+      const src = ref(BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken())
+      window.open(src.value+'&asn_number='+res.xdpNumber)
     }
     if (res.cgLabel) {
       //采购标签
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue
index fef9f67b3..8b1a9e1cc 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue
@@ -583,7 +583,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
   let array = []//存储可采购数据
   let arrayTool = []//存储可采购协定品数据
   let array1 = []//存储可制造数据
-    let packingNumbers = []
+  let packingNumbers = []
   val.forEach((item,index) => {
     packingNumbers.push(item.number)
     if (item.itemType == '可采购') {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index b0b998599..37b3eefec 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -612,16 +612,16 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
         tableObject.loading = false
       })
     }
-      // 打印协定品采购件
-  if (arrayTool.length>0) {
-    await PackageApi.getPrintingLableId({packingNumbers:arrayTool.map(item1=>item1.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 (arrayTool.length>0) {
+      await PackageApi.getPrintingLableId({packingNumbers:arrayTool.map(item1=>item1.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 (array1.length > 0) {
       await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
         console.log(res)