From 33b8928a585e09585c4ac5685ae66164be691f10 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 15 Dec 2024 09:48:21 +0800
Subject: [PATCH] =?UTF-8?q?YT-1689=E9=87=87=E8=B4=AD=E4=BB=B6=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E4=B8=AD=E5=8C=85=E8=A3=85=E6=98=8E=E7=BB=86=E6=B2=A1?=
 =?UTF-8?q?=E6=8C=89=E9=9C=80=E6=B1=82=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           | 13 ++++++---
 .../inventoryManage/package/package.data.ts   | 28 +++++++++----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index dc96e4d5a..dd4201e32 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -446,8 +446,8 @@ export const PurchasePackaging = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
   },
   {
-    label: '替代计量单位',
-    field: 'altUom',
+    label: '采购计量单位',
+    field: 'purchaseUom',
     sort: 'custom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
@@ -458,8 +458,13 @@ export const PurchasePackaging = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '替代数量',
-    field: 'altQty',
+    label: '采购数量',
+    field: 'purchaseQty',
+    sort: 'custom',
+  },
+  {
+    label: '采购标包数量',
+    field: 'purchaseStdQty',
     sort: 'custom',
   },
   {
diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts
index a8d1f6955..73b5f726c 100644
--- a/src/views/wms/inventoryManage/package/package.data.ts
+++ b/src/views/wms/inventoryManage/package/package.data.ts
@@ -252,28 +252,26 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '替代计量单位',
-    field: 'altUom',
+    label: '采购计量单位',
+    field: 'purchaseUom',
     sort: 'custom',
     dictType: DICT_TYPE.UOM,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'SelectV2',
-      componentProps: {
-        disabled: true
-      }
-    },
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     table: {
-      width: 150,
+      width: 120
     },
   },
   {
-    label: '替代数量',
-    field: 'altQty',
+    label: '采购数量',
+    field: 'purchaseQty',
+    sort: 'custom',
+  },
+  {
+    label: '采购标包数量',
+    field: 'purchaseStdQty',
     sort: 'custom',
-    table: {
-      width: 150,
-    },
   },
   {
     label: '转换率',