Merge branch 'master' into master_hella

src/utils/dict.ts

@@ -273,4 +273,5 @@ export enum DICT_TYPE {
   BIND_TYPE = 'bind_type', // 器具绑定类型
   CONTAINER_STATUS = 'container_status', // 容器状态
   PREDICT_TIME_TYPE = 'predict_time_type', // 预测时间类型
+  PACK_UNIT_TYPE = 'pack_unit_type', // 包装规格类型
 }

src/views/wms/inventoryManage/balance/balance.data.ts

@@ -62,6 +62,33 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '库区类型',
+    field: 'areaType',
+    sort: 'custom',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '库位代码',
     field: 'locationCode',

src/views/wms/inventoryManage/transaction/transaction.data.ts

@@ -88,6 +88,33 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '库区类型',
+    field: 'areaType',
+    sort: 'custom',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '单价',
     field: 'singlePrice',