From 53d6ecbf2df32c3b5f98029a546c91115f3e89b6 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Wed, 31 Jul 2024 09:22:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/basicDataManage/itemManage/packageunit/index.vue     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
index d3f58ad70..5904d8b09 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
@@ -180,7 +180,7 @@ const openForm = (type: string, row?: any) => {
             if (item.field == 'type') {
               item.componentProps.disabled = true
             }
-          })       
+          })
   }else {
     Packageunit.allSchemas.formSchema.forEach((item) => {
       if (item.field == 'code') {
@@ -195,7 +195,7 @@ const openForm = (type: string, row?: any) => {
       if (item.field == 'type') {
         item.componentProps.disabled = false
       }
-    })  
+    })
   }
   basicFormRef.value.open(type, row)
 }
@@ -213,6 +213,7 @@ const formsSuccess = async (formType,data) => {
   }
   if(data.activeTime==0)data.activeTime = null;
   if(data.expireTime==0)data.expireTime = null;
+  data.parentCode = data.parentCode === '' ? null : data.parentCode;
   basicFormRef.value.formLoading = true
   if (formType === 'create') {
     await PackageunitApi.createPackageunit(data)

From d3df0963b4ea0eb6730dd9bd2a031b820928dcda Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 31 Jul 2024 09:31:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E7=94=B1?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itembasic/itembasic.data.ts        | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index d3a40ba36..70754360d 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -70,20 +70,11 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.ITEM_STATUS,
     dictClass: 'string',
-    isForm: true,
-    isSearch: false,
+    isSearch: true,
     isTable: true,
     table: {
-      width: 100
-    } ,
-    form: {
-      component: 'Switch',
-      value: 'ENABLE',
-      componentProps: {
-        inactiveValue: 'DISABLE',
-        activeValue: 'ENABLE'
-      }
-    },
+      width: 120
+    }
   },
   {
     label: '计量单位',