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

src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts

@@ -70,21 +70,12 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.ITEM_STATUS,
     dictClass: 'string',
-    isForm: true,
+    isSearch: true,
-    isSearch: false,
     isTable: true,
     table: {
-      width: 100
+      width: 120
-    } ,
-    form: {
-      component: 'Switch',
-      value: 'ENABLE',
-      componentProps: {
-        inactiveValue: 'DISABLE',
-        activeValue: 'ENABLE'
     }
   },
-  },
   {
     label: '计量单位',
     field: 'uom',

src/views/wms/basicDataManage/itemManage/packageunit/index.vue

@@ -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)