From 84a3a81aa6465dbdacfc8ad6a05a9e627681212c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 28 Nov 2024 16:53:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventoryManage/package/index.vue      | 11 +++++++++--
 .../productreceiptRequestMain/index.vue              | 12 ++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
index d0bc30b50..43f32ad4a 100644
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -364,8 +364,15 @@ const handlePoint = async (row) => {
     console.log('批量打印res',res);
     if(res.zzLabel){
       //制造标签
-      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-      window.open(src.value+'&asn_number='+res.zzLabel)
+       PackageApi.getPrintingLableId({packingNumbers:[row.number]}).then(res => {
+        console.log(res)
+        window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
+      }).catch(err => {
+        console.log(err)
+        message.error('创建标签失败')
+      })
+      // const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      // window.open(src.value+'&asn_number='+res.zzLabel)
     }
     if (res.cgLabel) {
       //采购标签
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 483e8fb4f..b298c5ab3 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -624,19 +624,19 @@ const buttonTableClick = async (val, row) => {
           return
         }
       })
-       ruleApi.getManagementPrecision({
+      ruleApi.getManagementPrecision({
         	itemCodes: [item['itemCode']],
 		      locationCode: item.toLocationCode
         }).then((res) => {
           toManagementPrecision.value = res[0].ManagementPrecision
-          if ( toManagementPrecision.value == 'BY_BATCH') {
+        })
+        if ( toManagementPrecision.value == 'BY_BATCH') {
           // row['fromBatchFormItemType'] = 'FormDate'
-          item['disabled_batch'] = true
-        } else if(toManagementPrecision.value == 'BY_QUANTITY') {
+          row['disabled_batch'] = false
+        } else {
           // row['fromBatchFormItemType'] = ''
-            item['disabled_batch'] = false
+          row['disabled_batch'] = true
         }
-     })  
     })
   } else if (val == 'mainHandle') {
     // 处理