Merge remote-tracking branch 'origin/master_hella' into master_hella

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: '计量单位',

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)