Merge branch 'dev' into test

src/mixins/tableColumnsMixin.js

@@ -60,9 +60,9 @@ export default {
           } else {
             this.columns = [...this.columns];
           }
-          // this.$message.warning(
-          //   `${requireList.toString()} 为必填项，无法隐藏！`
-          // );
+          this.$message.warning(
+            `${requireList.toString()} 为必填项，无法隐藏！`
+          );
           // console.log('为必填项，无法隐藏！~~~', requireList);
           return;
         }

src/views/warehouseManagement/stockManagement/add.vue

@@ -1134,7 +1134,8 @@
             prop: 'unit',
             slot: 'unit',
             width: 100,
-            align: 'center'
+            align: 'center',
+            headerSlot: 'headerUnit'
           },
           {
             label: '包装数量',
@@ -1254,7 +1255,8 @@
             slot: 'warehouseName',
             showOverflowTooltip: true,
             width: 300,
-            align: 'center'
+            align: 'center',
+            headerSlot: 'headerWarehouseName'
           },
           {
             minWidth: 300,