Merge branch 'test' into tg

src/utils/dict/warehouse.js

@@ -118,6 +118,10 @@ export const sceneState = [
     code: 15,
     label: '调拨入库'
   },
+  {
+    code: 16,
+    label: '异常处理入库'
+  },
   {
     code: 99,
     label: '其他入库'

src/views/warehouseManagement/inboundRequests/components/tgTable.vue

@@ -102,9 +102,9 @@
             showOverflowTooltip: true,
             align: 'center'
           },
-          { label: '型号', prop: 'modelType', width: '150' },
-          { label: '规格', prop: 'specification', width: '150' },
-          { label: '牌号', prop: 'brandNum', width: '100' },
+          // { label: '型号', prop: 'modelType', width: '150' },
+          // { label: '规格', prop: 'specification', width: '150' },
+          // { label: '牌号', prop: 'brandNum', width: '100' },
           {
             prop: 'sourceType',
             label: '出入库类型',

src/views/warehouseManagement/stockManagement/index.vue

@@ -464,6 +464,10 @@
     computed: {
       clientEnvironmentId() {
         return this.$store.state.user.info.clientEnvironmentId;
+      },
+      // 是否开启响应式布局
+      styleResponsive() {
+        return this.$store.state.theme.styleResponsive;
       }
     },
     created() {