表格高度调整

src/assets/styles/mixin.less

@@ -2032,12 +2032,34 @@ input:-internal-autofill-selected {
     .srcollYTable {
         .ant-table {
             .ant-table-body {
+                min-height: calc(100vh - 385px);
+                background: @m-black2;
+            }
+        }
+    }
+}
+// 上半部分表格带二级tab筛选
+.topTableHeight {
+    .secondTabTable {
+        .ant-table {
+            .ant-table-body {
                 min-height: calc(100vh - 413px);
                 background: @m-black2;
             }
         }
     }
 }
+// 上半部分表格带二级tab筛选带筛选条件
+.topTableHeight {
+    .condSecondTabTable {
+        .ant-table {
+            .ant-table-body {
+                min-height: calc(100vh - 453px);
+                background: @m-black2;
+            }
+        }
+    }
+}
 // 买卖大厅表格
 .buyHallTable,.sellHallTable {
     .ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_basis_difference/index.vue

@@ -3,7 +3,7 @@
     <div class="topTableHeight">
         <a-table
             :columns="columns"
-            class="srcollYTable"
+            class="srcollYTable secondTabTable"
             :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_listing_transfer/index.vue

@@ -3,7 +3,7 @@
     <div class="topTableHeight">
         <a-table
             :columns="columns"
-            class="srcollYTable"
+            class="srcollYTable secondTabTable"
             :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"

src/views/market/spot_trade/spot_trade_reference_market/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 385px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"
@@ -155,4 +155,14 @@ export default defineComponent({
 });
 </script>
 <style lang="less">
+.topTableHeight {
+    .srcollYTable {
+        .ant-table {
+            .ant-table-body {
+                min-height: calc(100vh - 385px);
+                background: @m-black2;
+            }
+        }
+    }
+}
 </style>

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_floating_price/index.vue

@@ -4,8 +4,8 @@
         <Filter :enumName="name" @buy="buyOpen" @search="search" />
         <a-table
             :columns="columns"
-            class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
+            class="srcollYTable condSecondTabTable"
+            :scroll="{ x: '100%', y: 'calc(100vh - 453px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_price/index.vue

@@ -4,8 +4,8 @@
         <Filter :enumName="name" @search="search" @buy="buyOpen" />
         <a-table
             :columns="columns"
-            class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
+            class="srcollYTable condSecondTabTable"
+            :scroll="{ x: '100%', y: 'calc(100vh - 453px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_floating_price/index.vue

@@ -4,8 +4,8 @@
         <Filter :enumName="name" @search="search" @buy="buyOpen" />
         <a-table
             :columns="columns"
-            class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
+            class="srcollYTable condSecondTabTable"
+            :scroll="{ x: '100%', y: 'calc(100vh - 453px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_price/index.vue

@@ -4,8 +4,8 @@
         <Filter :enumName="name" @search="search" @buy="buyOpen" />
         <a-table
             :columns="columns"
-            class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
+            class="srcollYTable condSecondTabTable"
+            :scroll="{ x: '100%', y: 'calc(100vh - 453px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_pending_order/index.vue

@@ -1,44 +1,42 @@
 <template>
     <!-- 仓单预售 挂单 -->
-    <section>
-        <a-table
-            :columns="columns"
-            class="srcollYTable expandLeftTable"
-            :scroll="{ x: '100%', y: '185px' }"
-            :pagination="false"
-            :loading="loading"
-            :expandedRowKeys="expandedRowKeys"
-            :customRow="Rowclick"
-            :expandIcon="expandIcon"
-            :expandIconAsCell="false"
-            rowKey="key"
-            :data-source="tableList"
-        >
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <BtnList
-                    :btnList="filterBtnList(btnList, record)"
-                    class="btn-list-sticky"
-                    :record="record"
-                    @click="openComponent"
-                />
-            </template>
-            <!--  委托状态-->
-            <template #wrtradeorderstatus="{ record }">
-                <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
-            </template>
-            <!-- 挂牌类型 -->
-            <template #wrtradetype="{ record }">
-                <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-            </template>
-        </a-table>
-        <component
-            :is="componentId"
-            v-if="componentId"
-            :selectedRow="selectedRow"
-            @cancel="closeComponent"
-        ></component>
-    </section>
+    <a-table
+        :columns="columns"
+        class="srcollYTable expandLeftTable"
+        :scroll="{ x: '100%', y: '185px' }"
+        :pagination="false"
+        :loading="loading"
+        :expandedRowKeys="expandedRowKeys"
+        :customRow="Rowclick"
+        :expandIcon="expandIcon"
+        :expandIconAsCell="false"
+        rowKey="key"
+        :data-source="tableList"
+    >
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+            <BtnList
+                :btnList="filterBtnList(btnList, record)"
+                class="btn-list-sticky"
+                :record="record"
+                @click="openComponent"
+            />
+        </template>
+        <!--  委托状态-->
+        <template #wrtradeorderstatus="{ record }">
+            <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+        </template>
+        <!-- 挂牌类型 -->
+        <template #wrtradetype="{ record }">
+            <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+        </template>
+    </a-table>
+    <component
+        :is="componentId"
+        v-if="componentId"
+        :selectedRow="selectedRow"
+        @cancel="closeComponent"
+    ></component>
 </template>
 
 <script lang="ts">