From 44fbc733e0589e5135ab4da306a0e7f1459f5c4a Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 7 Feb 2024 15:02:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itempackage/itempackage.data.ts           | 30 ++++++++++++++-----
 .../packageunit/packageunit.data.ts           | 25 +++++++++-------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index ae214a18f..87c40736f 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -2,6 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '../itembasic/itembasic.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '../packageunit/packageunit.data'
 
 const { t } = useI18n() // 国际化
 
@@ -50,16 +52,30 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '包装单位',
+    label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
     table: {
-      width: 120
-    } 
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
   },
   { 
     label: '包装数量', 
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index 291d3d961..cec3bc81d 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -1,13 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { fa } from 'element-plus/es/locale'
 
 export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: 'id',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '包装代码',
     field: 'code',
@@ -175,11 +170,6 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -190,11 +180,20 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: dateFormatter,
     isForm: false,
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '删除时间',
     field: 'deletionTime',
     sort: 'custom',
     isForm: false,
+    isTable: false,
     table: {
       width: 180
     },
@@ -212,6 +211,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deleterId',
     sort: 'custom',
     isForm: false,
+    isTable: false,
     table: {
       width: 150
     },
@@ -221,6 +221,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'extraProperties',
     sort: 'custom',
     isForm: false,
+    isTable: false,
     table: {
       width: 150
     },
@@ -230,6 +231,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'concurrencyStamp',
     sort: 'custom',
     isForm: false,
+    isTable: false,
     table: {
       width: 150
     },
@@ -243,6 +245,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'siteId',
     sort: 'custom',
     isForm: false,
+    isTable: false,
     table: {
       width: 150
     },