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

---
 .../supplierdeliverRequestMain/index.vue      | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index b6672a658..13db1dc06 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -1208,6 +1208,7 @@ const clearInput = async (field, row, index) => {
 
 const BASE_URL = getJmreportBaseUrl()
 const src = ref(BASE_URL + '/jmreport/view/1022297965884559360?token=' + getAccessToken())
+const src1 = ref(BASE_URL + '/jmreport/view/1027757375736582144?token=' + getAccessToken())
 getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
 
 // 标签打印
@@ -1245,10 +1246,26 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-
-  await PackageApi.batchPrintingLable(val.map((item1) => item1.number).join(','))
+  let array = []//存储可采购数据
+  let arrayTool = []//存储可采购协定品数据
+  let array1 = []
+  val.forEach((item,index) => {
+    if (item.itemBasicType =='TOOL') {
+      arrayTool.push(item)
+      array1 = arrayTool
+    } else {
+      array.push(item)
+      array1 = array
+    }
+  })
+  await PackageApi.batchPrintingLable(array1.map((item1) => item1.number).join(','))
     .then((res) => {
-      window.open(src.value + '&asn_number=' + res)
+      if (array.length > 0) {
+        window.open(src.value + '&asn_number=' + res) 
+      }
+      if (array1.length > 0) {
+        window.open(src1.value + '&asn_number=' + res) 
+      }
     })
     .catch((err) => {
       message.error(t('ts.创建标签失败'))