Merge branch 'master' into 测试

src/views/group/data-board/material-in-transit/index.vue

@@ -14,6 +14,7 @@
             action: () => deriveExcel(),
           },
         ]"
+        :tableHeight="'calc(100vh - 297px)'"
         @get-list="getList"
         @clickReset="clickReset"
         :cellClassName="cellClassName">
@@ -70,7 +71,7 @@ const config = computed(() => {
       attrs: {
         label: "品号",
         prop: "bomSpecCode",
-        width: 150,
+        width: 140,
       },
     },
     {
@@ -105,14 +106,14 @@ const config = computed(() => {
       attrs: {
         label: "采购数量",
         prop: "purchaseQuantity",
-        width: 100,
+        width: 90,
       },
     },
     {
       attrs: {
         label: "在途数量",
         prop: "inTransitQuantity",
-        width: 100,
+        width: 90,
       },
     },
     {
@@ -125,23 +126,37 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "周转率",
-        prop: "turnoverRate",
-        width: 100,
+        label: "30天销量",
+        prop: "salesQuantityThirtyDays",
+        width: 90,
+      },
+    },
+    {
+      attrs: {
+        label: "60天销量",
+        prop: "salesQuantitySixtyDays",
+        width: 90,
       },
     },
     {
       attrs: {
         label: "90天销量",
         prop: "salesQuantity",
-        width: 100,
+        width: 90,
+      },
+    },
+    {
+      attrs: {
+        label: "周转率",
+        prop: "turnoverRate",
+        width: 90,
       },
     },
     {
       attrs: {
         label: "库存数量",
         prop: "inventoryQuantity",
-        width: 100,
+        width: 90,
       },
     },
   ];