From f112a94e56c82fb0d318fd097d6e635bab442204 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 15 Dec 2024 12:49:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B7=E8=AF=95=E5=93=81=E5=92=8C=E5=8D=8F?=
 =?UTF-8?q?=E5=AE=9A=E5=93=81=E9=87=87=E8=B4=AD=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.vue                                 | 20 ++++++++++++++---
 .../toolPurchasereceiptRequestMain/index.vue  | 22 +++++++++++++++----
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue
index 04d7a35d0..fef9f67b3 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue
@@ -580,14 +580,18 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-let array = []//存储可采购数据
+  let array = []//存储可采购数据
+  let arrayTool = []//存储可采购协定品数据
   let array1 = []//存储可制造数据
     let packingNumbers = []
   val.forEach((item,index) => {
     packingNumbers.push(item.number)
-   
     if (item.itemType == '可采购') {
-      array.push(item)
+      if (item.itemBasicType =='TOOL') {
+        arrayTool.push(item)
+      } else {
+        array.push(item)
+      }
     }
     if (item.itemType == '可制造') {
       array1.push(item)
@@ -602,6 +606,16 @@ let array = []//存储可采购数据
       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)
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue
index 2a5343cca..0dd0504f9 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue
@@ -581,14 +581,18 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-let array = []//存储可采购数据
+  let array = []//存储可采购数据
+  let arrayTool = []//存储可采购协定品数据
   let array1 = []//存储可制造数据
     let packingNumbers = []
   val.forEach((item,index) => {
     packingNumbers.push(item.number)
-   
-    if (item.itemType == '可采购') {
-      array.push(item)
+   if (item.itemType == '可采购') {
+      if (item.itemBasicType =='TOOL') {
+        arrayTool.push(item)
+      } else {
+        array.push(item)
+      }
     }
     if (item.itemType == '可制造') {
       array1.push(item)
@@ -602,6 +606,16 @@ let array = []//存储可采购数据
       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 => {