From da48dfe6d5fef03a18ffe4dfe0ffcfca2d08b797 Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Tue, 19 Nov 2024 19:40:51 +0800
Subject: [PATCH] =?UTF-8?q?YT-1098=E7=89=A9=E6=96=99=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=BC=BA=E5=B0=91=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=81=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=9B=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E6=98=AF=E4=B8=8B=E6=8B=89=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |  1 +
 .../itemManage/itempackage/index.vue          |  1 +
 .../itempackage/itempackage.data.ts           | 36 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 8755f5c6e..57bdadce7 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -283,6 +283,7 @@ export enum DICT_TYPE {
   CONTAINER_STATUS = 'container_status', // 容器状态
   PREDICT_TIME_TYPE = 'predict_time_type', // 预测时间类型
   PACK_UNIT_TYPE = 'pack_unit_type', // 包装规格类型
+  PACK_DATA_SOURCE = 'pack_data_source', // 物料包装数据来源
   TRANSFER_REASON = 'transfer_reason', // 调拨出入库原因
   PURCHASERECEIPT_SOURCE_TYPE = 'purchasereceipt_source_type', //采购收货数据来源
   PLAN_PRODUCTION_TYPE = 'plan_production_type', // 生产计划类型
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index 6037ec1dc..358c4d3ef 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -357,6 +357,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     const setV = {}
     setV[formField] = val[0][searchField]
     if('itemCode'==formField){
+      setV['itemName'] = val[0]['name']
       setV['uom'] = val[0]['uom']
     }
     if('packUnit'==formField){
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index 2fed930a9..e9004c76c 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -46,6 +46,24 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isTable:true,
+    isTableForm:true,
+    isForm:true,
+    isDetail:true
+  },
   {
     label: '计量单位',
     field: 'uom',
@@ -56,7 +74,8 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 120
-    },form: {
+    },
+    form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         disabled: true
@@ -231,10 +250,25 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'dataSource',
     sort: 'custom',
     isForm:false,
+    dictType: DICT_TYPE.PACK_DATA_SOURCE,
+    dictClass: 'string',
     table: {
       width: 180
     },
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+    isTable:true,
+    isTableForm:true,
+    isForm:true,
+    isDetail:true
+  },
   {
     label: '创建时间',
     field: 'createTime',