Merge branch 'dev' into test

src/views/warehouseManagement/inventoryAllocation/index.vue

@@ -116,6 +116,18 @@
         allocationType,
         groupName: '',
         saveLoading: false,
+        inventoryDimensionOp: [{
+          code: '1',
+          label: '物品维度'
+        },
+        {
+          code: '2',
+          label: '批次维度'
+        },
+        {
+          code: '3',
+          label: '包装维度'
+        }],
         stutusOptions: {
           0: '未提交',
           1: '审核中',
@@ -181,6 +193,18 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'inventoryDimension',
+            label: '列表维度',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110,
+            formatter: (row, column, cellValue) => {
+              return this.inventoryDimensionOp.filter(
+                (item) => item.code == row.inventoryDimension
+              )[0].label;
+            }
+          },
           {
             prop: 'categoryName',
             label: '物品名称',
@@ -272,6 +296,13 @@
           this.$message.warning('请选择已完成的调拨单生成对账单');
           return;
         }
+
+        // 检查选中的列表维度是否包含物品维度
+        const dimensionRecords = this.selection.filter(item => item.inventoryDimension == 1);
+        if (dimensionRecords.length > 0) {
+          this.$message.warning('请选择批次维度或包装维度调拨单生成对账单');
+          return;
+        }
         
         this.generateStatementFlag = true;
         this.$nextTick(() => {