From 58378b045dd09380afaa29ebe60fd403f52fdf8e Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Sun, 15 Dec 2024 14:12:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 13db1dc06..af153e6b3 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -1208,7 +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())
+const src1 = ref(BASE_URL + '/jmreport/view/1028150465710329856?token=' + getAccessToken())
 getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
 
 // 标签打印
@@ -1263,7 +1263,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
       if (array.length > 0) {
         window.open(src.value + '&asn_number=' + res) 
       }
-      if (array1.length > 0) {
+      if (arrayTool.length > 0) {
         window.open(src1.value + '&asn_number=' + res) 
       }
     })

From 4f2ef557f266e8db8d5d8cee53fa1473e6234f81 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Sun, 15 Dec 2024 17:34:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=B6=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E4=B8=AD=E7=9A=84=E5=8C=85=E8=A3=85=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itempackage/itempackage.data.ts           | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index dd4201e32..290ca2697 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -446,7 +446,7 @@ export const PurchasePackaging = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
   },
   {
-    label: '采购计量单位',
+    label: '替代计量单位',
     field: 'purchaseUom',
     sort: 'custom',
     dictType: DICT_TYPE.UOM,
@@ -458,15 +458,15 @@ export const PurchasePackaging = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '采购数量',
+    label: '替代数量',
     field: 'purchaseQty',
     sort: 'custom',
   },
-  {
-    label: '采购标包数量',
-    field: 'purchaseStdQty',
-    sort: 'custom',
-  },
+  // {
+  //   label: '采购标包数量',
+  //   field: 'purchaseStdQty',
+  //   sort: 'custom',
+  // },
   {
     label: '转换率',
     field: 'convertRate',
@@ -592,5 +592,10 @@ export const PurchasePackaging = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
+  {
+    label: '操作',
+    field: 'aaa',
+    sort: 'custom',
+  },
  
 ]))