高度调整

src/assets/styles/mixin.less

@@ -248,7 +248,7 @@
         .ant-table-placeholder {
             border: 0;
             background: @m-black2;
-            min-height: 185px;
+            min-height: 190px;
         }
     }
     .ant-table-row-expand-icon {
@@ -1846,12 +1846,9 @@ input:-internal-autofill-selected {
 
 .topTableHeight {
     height: calc(100% - 28px);
-    // .srcollYTable {
-    //     display: none;
-    // }
 }
 .topTableHeight40 {
-    height: calc(100% - 40px);
+    height: calc(100% - 35px);
 }
 
 // 折叠底部上面左边菜单高度
@@ -1940,10 +1937,10 @@ input:-internal-autofill-selected {
             min-width: 80px;
             margin-left: 15px;
             .first {
-                font-size: 12px;
+                font-size: 14px;
             }
             .last {
-                font-size: 16px;
+                font-size: 14px;
                 margin-left: 10px;
             }
         }
@@ -2032,7 +2029,7 @@ input:-internal-autofill-selected {
     .srcollYTable {
         .ant-table {
             .ant-table-body {
-                min-height: calc(100vh - 385px);
+                min-height: calc(100vh - 378px);
                 background: @m-black2;
             }
         }
@@ -2043,7 +2040,7 @@ input:-internal-autofill-selected {
     .secondTabTable {
         .ant-table {
             .ant-table-body {
-                min-height: calc(100vh - 413px);
+                min-height: calc(100vh - 405px);
                 background: @m-black2;
             }
         }
@@ -2054,7 +2051,7 @@ input:-internal-autofill-selected {
     .condSecondTabTable {
         .ant-table {
             .ant-table-body {
-                min-height: calc(100vh - 453px);
+                min-height: calc(100vh - 443px);
                 background: @m-black2;
             }
         }
@@ -2166,11 +2163,11 @@ input:-internal-autofill-selected {
 }
 .buyHallTable,.sellHallTable {
     .ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
-        min-height: calc(100vh - 385px);
+        min-height: calc(100vh - 378px);
     }
     .ant-table {
         .ant-table-tbody {
-            min-height: calc(100vh - 385px);
+            min-height: calc(100vh - 378px);
         }
     }
 }
@@ -2186,11 +2183,11 @@ input:-internal-autofill-selected {
 // 没有底部时买卖大厅表格高度
 .buyHallTableHigh,.sellHallTableHigh {
     .ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
-        min-height: calc(100vh - 145px);
+        min-height: calc(100vh - 135px);
     }
     .ant-table {
         .ant-table-tbody {
-            min-height: calc(100vh - 145px);
+            min-height: calc(100vh - 135px);
         }
     }
 }

src/common/components/drawer/index.vue

@@ -5,7 +5,7 @@
         :visible="visible"
         :destroyOnClose="true"
         class="bottomListed"
-        height="406px"
+        height="405px"
     >
         <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
         <div class="collapse" @click="cancel">
@@ -220,7 +220,7 @@ export default defineComponent({
 .ant-drawer.ant-drawer-bottom.ant-drawer-open.bottomListed {
     .position(fixed, auto, 0, 0, auto);
     width: 566px;
-    height: 406px !important;
+    height: 405px !important;
     background: transparent;
     z-index: 10;
     .ant-drawer-content-wrapper {

src/common/components/filter/index.vue

@@ -64,8 +64,8 @@ export default defineComponent({
 <style lang="less">
 .filter-custom-table {
     display: inline-flex;
-    padding-top: 5px;
-    padding-bottom: 1px;
+    padding-top: 2.5px;
+    height: 35px;
     .conditionSelect:first-child {
         margin-right: 10px;
     }

src/layout/components/bottom.vue

@@ -104,11 +104,12 @@ export default defineComponent({
 .right-menu-content {
     display: flex;
     .capitalSelect {
-        margin-top: 3px;
+        margin-top: 2px;
         margin-right: 10px;
         .ant-select-selector {
             background-color: @m-grey6;
             border: none;
+            height: 28px;
         }
         .ant-select-arrow {
             top: 15px;

src/layout/components/main.vue

@@ -52,21 +52,21 @@ export default defineComponent({
 }
 .first-menu {
     width: 100%;
-    height: 40px;
+    height: 35px;
     border-bottom: 1px solid @m-blue0 !important;
     background-color: @m-black1;
     .flex;
     justify-content: space-between;
     .a-menu_container {
-        padding-top: 5px;
+        padding-top: 2px;
         .flex();
-        height: 34px;
-        line-height: 34px;
+        height: 32px;
+        line-height: 32px;
         background: transparent;
         .ant-menu-item {
             min-width: 120px;
-            height: 34px;
-            line-height: 34px;
+            height: 32px;
+            line-height: 32px;
             background: linear-gradient(0deg, @m-grey35 0%, @m-grey36 100%);
             margin-left: 3px;
             font-size: 14px;

src/views/market/spot_trade/components/buy-sell-market/components/buy/index.vue

@@ -3,7 +3,7 @@
     <a-table
         :columns="handleColumn(columns)"
         :class="['buyHallTable', isBottom ? '' : 'buyHallTableHigh', tableList.length ? '' : 'noDataTable']"
-        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 385px)' : 'calc(100vh - 145px)' }"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 378px)' : 'calc(100vh - 135px)' }"
         :pagination="false"
         :loading="loading"
         :expandedRowKeys="expandedRowKeys"

src/views/market/spot_trade/components/buy-sell-market/components/sell/index.vue

@@ -3,7 +3,7 @@
     <a-table
         :columns="handleColumn(columns)"
         :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']"
-        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 385px)' : 'calc(100vh - 145px)' }"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 378px)' : 'calc(100vh - 135px)' }"
         :pagination="false"
         :loading="loading"
         :expandedRowKeys="expandedRowKeys"

src/views/market/spot_trade/spot_trade_order_transaction/components/buy-market/index.vue

@@ -3,7 +3,7 @@
     <a-table
         :columns="handleColumn(columns)"
         :class="['buyHallTable', isBottom ? '' : 'buyHallTableHigh', tableList.length ? '' : 'noDataTable']"
-        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 385px)' : 'calc(100vh - 145px)' }"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 378px)' : 'calc(100vh - 135px)' }"
         :pagination="false"
         :loading="loading"
         :expandedRowKeys="expandedRowKeys"

src/views/market/spot_trade/spot_trade_order_transaction/components/sell-market/index.vue

@@ -3,7 +3,7 @@
     <a-table
         :columns="handleColumn(columns)"
         :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']"
-        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 385px)' : 'calc(100vh - 145px)' }"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 378px)' : 'calc(100vh - 135px)' }"
         :pagination="false"
         :loading="loading"
         :expandedRowKeys="expandedRowKeys"

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

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

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

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

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 - 385px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 378px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"
@@ -155,14 +155,4 @@ 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

@@ -5,7 +5,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable condSecondTabTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 453px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 443px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

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

@@ -5,7 +5,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable condSecondTabTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 453px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 443px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

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

@@ -5,7 +5,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable condSecondTabTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 453px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 443px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

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

@@ -5,7 +5,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable condSecondTabTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 453px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 443px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/order/commodity_contract/components/commodity_contract_commission/index.vue

@@ -1,43 +1,48 @@
 <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 v-if="btnList.length"
-                #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-        <!-- 类型 -->
-        <template #buildtype="{ record }">
-            <a>{{ getBuildTypeName(record.buildtype) }}</a>
-        </template>
-        <!-- 状态 -->
-        <template #orderstatus="{ record }">
-            <a>{{ getOrderStatusName(record.orderstatus) }}</a>
-        </template>
+    <!-- 商品订单 - 委托 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template v-if="btnList.length" #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="btnList"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
+            <!-- 类型 -->
+            <template #buildtype="{ record }">
+                <a>{{ getBuildTypeName(record.buildtype) }}</a>
+            </template>
+            <!-- 状态 -->
+            <template #orderstatus="{ record }">
+                <a>{{ getOrderStatusName(record.orderstatus) }}</a>
+            </template>
 
-      <template #createtime="{ record }">
-        <a>{{ formatTime(record.createtime) }}</a>
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+            <template #createtime="{ record }">
+                <a>{{ formatTime(record.createtime) }}</a>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">
@@ -51,17 +56,12 @@ import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { queryAmountLog } from '@/services/go/TaAccount';
 import { QueryAmountLogReq } from '@/services/go/TaAccount/interface';
 import { getSelectedAccountId } from '@/services/bus/account';
-import {
-    getBuildTypeName,
-    getOperateTypeEnumItemName,
-    getOperateTypeName,
-    getOrderStatusName
-} from '@/common/constants/enumsName';
+import { getBuildTypeName, getOperateTypeEnumItemName, getOperateTypeName, getOrderStatusName } from '@/common/constants/enumsName';
 import { formatTime } from '@/common/methods';
 import Bus from '@/utils/eventBus/index';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { queryTradeOrderDetail } from '@/services/go/ermcp/order';
-import {QueryTradeOrderDetailRsp} from "@/services/go/ermcp/order/interface";
+import { QueryTradeOrderDetailRsp } from '@/services/go/ermcp/order/interface';
 
 export default defineComponent({
     name: enumOrderComponents.commodity_contract_commission,
@@ -88,7 +88,7 @@ export default defineComponent({
             formatTime,
             expandIcon,
             getBuildTypeName,
-            getOrderStatusName
+            getOrderStatusName,
         };
     },
 });

src/views/order/commodity_contract/components/commodity_contract_make_deal/index.vue

@@ -1,42 +1,47 @@
 <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 v-if="btnList.length"
-                #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-        <!-- 类型 -->
-        <template #buildtype="{ record }">
-            <a>{{ getBuildTypeName(record.buildtype) }}</a>
-        </template>
-        <!-- 状态 -->
-        <template #orderstatus="{ record }">
-            <a>{{ getOrderStatusName(record.orderstatus) }}</a>
-        </template>
-      <template #createtime="{ record }">
-        <a>{{ formatTime(record.createtime) }}</a>
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 商品订单 - 成交 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template v-if="btnList.length" #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="btnList"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
+            <!-- 类型 -->
+            <template #buildtype="{ record }">
+                <a>{{ getBuildTypeName(record.buildtype) }}</a>
+            </template>
+            <!-- 状态 -->
+            <template #orderstatus="{ record }">
+                <a>{{ getOrderStatusName(record.orderstatus) }}</a>
+            </template>
+            <template #createtime="{ record }">
+                <a>{{ formatTime(record.createtime) }}</a>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">
@@ -50,12 +55,7 @@ import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { queryAmountLog } from '@/services/go/TaAccount';
 import { QueryAmountLogReq } from '@/services/go/TaAccount/interface';
 import { getSelectedAccountId } from '@/services/bus/account';
-import {
-    getBuildTypeName,
-    getOperateTypeEnumItemName,
-    getOperateTypeName,
-    getOrderStatusName
-} from '@/common/constants/enumsName';
+import { getBuildTypeName, getOperateTypeEnumItemName, getOperateTypeName, getOrderStatusName } from '@/common/constants/enumsName';
 import { formatTime } from '@/common/methods';
 import Bus from '@/utils/eventBus/index';
 import { expandIcon } from '@/common/setup/table/clolumn';
@@ -87,7 +87,7 @@ export default defineComponent({
             formatTime,
             expandIcon,
             getBuildTypeName,
-            getOrderStatusName
+            getOrderStatusName,
         };
     },
 });

src/views/order/commodity_contract/components/commodity_contract_settlement/index.vue

@@ -1,42 +1,47 @@
 <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 v-if="btnList.length"
-                #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-      <template #createtime="{ record }">
-        <a>{{ formatTime(record.createtime) }}</a>
-      </template>
-        <!-- 类型 -->
-        <template #buildtype="{ record }">
-            <a>{{ getBuildTypeName(record.buildtype) }}</a>
-        </template>
-        <!-- 状态 -->
-        <template #orderstatus="{ record }">
-            <a>{{ getOrderStatusName(record.orderstatus) }}</a>
-        </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 商品订单 - 交收 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template v-if="btnList.length" #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="btnList"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
+            <template #createtime="{ record }">
+                <a>{{ formatTime(record.createtime) }}</a>
+            </template>
+            <!-- 类型 -->
+            <template #buildtype="{ record }">
+                <a>{{ getBuildTypeName(record.buildtype) }}</a>
+            </template>
+            <!-- 状态 -->
+            <template #orderstatus="{ record }">
+                <a>{{ getOrderStatusName(record.orderstatus) }}</a>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">
@@ -50,12 +55,7 @@ import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { queryAmountLog } from '@/services/go/TaAccount';
 import { QueryAmountLogReq } from '@/services/go/TaAccount/interface';
 import { getSelectedAccountId } from '@/services/bus/account';
-import {
-    getBuildTypeName,
-    getOperateTypeEnumItemName,
-    getOperateTypeName,
-    getOrderStatusName
-} from '@/common/constants/enumsName';
+import { getBuildTypeName, getOperateTypeEnumItemName, getOperateTypeName, getOrderStatusName } from '@/common/constants/enumsName';
 import { formatTime } from '@/common/methods';
 import Bus from '@/utils/eventBus/index';
 import { expandIcon } from '@/common/setup/table/clolumn';
@@ -85,7 +85,7 @@ export default defineComponent({
             formatTime,
             expandIcon,
             getBuildTypeName,
-            getOrderStatusName
+            getOrderStatusName,
         };
     },
 });

src/views/order/commodity_contract/components/commodity_contract_summary/index.vue

@@ -1,47 +1,52 @@
 <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 v-if="btnList.length"
-                #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-      <template #createtime="{ record }">
-        <a>{{ formatTime(record.createtime) }}</a>
-      </template>
-      <!-- 现价 -->
-      <template #lastprice="{ record }">
-        <a>{{ getLastprice(record) }}</a>
-      </template>
-      <!-- 持仓金额  -->
-      <template #holderprice="{ record }">
-        <a>{{ getHolderprice(record) }}</a>
-      </template>
-      <!-- 持仓盈亏 -->
-      <template #profitloss="{ record }">
-        <a>{{ getProfitloss(record) }}</a>
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               :tableList="tableList"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 商品订单 - 合约汇总 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template v-if="btnList.length" #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="btnList"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
+            <template #createtime="{ record }">
+                <a>{{ formatTime(record.createtime) }}</a>
+            </template>
+            <!-- 现价 -->
+            <template #lastprice="{ record }">
+                <a>{{ getLastprice(record) }}</a>
+            </template>
+            <!-- 持仓金额  -->
+            <template #holderprice="{ record }">
+                <a>{{ getHolderprice(record) }}</a>
+            </template>
+            <!-- 持仓盈亏 -->
+            <template #profitloss="{ record }">
+                <a>{{ getProfitloss(record) }}</a>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            :tableList="tableList"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/financing_manager/components/financing_manager_apply_order/index.vue

@@ -1,54 +1,58 @@
 <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 v-if="btnList.length"
-                #expandedRowRender="{ record }">
-        <BtnList :btnList="handleBtnList(btnList, record)"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-      <!-- 类型 -->
-      <template #financetype="{ record }">
-        <a>{{ getFinanceTypeName(record.financetype) }}</a>
-      </template>
+    <!-- 申请单 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template v-if="btnList.length" #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="handleBtnList(btnList, record)"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
+            <!-- 类型 -->
+            <template #financetype="{ record }">
+                <a>{{ getFinanceTypeName(record.financetype) }}</a>
+            </template>
 
-      <!-- 状态 -->
-      <template #applystatus="{ text }">
-        <a>{{ getApplyStatusFinanceName(text) }}</a>
-      </template>
+            <!-- 状态 -->
+            <template #applystatus="{ text }">
+                <a>{{ getApplyStatusFinanceName(text) }}</a>
+            </template>
 
-      <template #createtime="{ record }">
-        <a>{{ formatTime(record.createtime) }}</a>
-      </template>
+            <template #createtime="{ record }">
+                <a>{{ formatTime(record.createtime) }}</a>
+            </template>
 
-      <!-- 结算方式 1:按日结息 3:按月结息-->
-      <template #interestsettlemode="{ record }">
-        <a>{{ getInterestSettleModeName(record.interestsettlemode) }}</a>
-      </template>
-      <!-- 费用 -->
-      <template #interestsettlevalue="{ record }">
-        <a>{{ getInterestrateModeName(record.interestratemode, record.interestrate) }}</a>
-      </template>
-
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+            <!-- 结算方式 1:按日结息 3:按月结息-->
+            <template #interestsettlemode="{ record }">
+                <a>{{ getInterestSettleModeName(record.interestsettlemode) }}</a>
+            </template>
+            <!-- 费用 -->
+            <template #interestsettlevalue="{ record }">
+                <a>{{ getInterestrateModeName(record.interestratemode, record.interestrate) }}</a>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/financing_manager/components/financing_manager_contract/index.vue

@@ -1,47 +1,51 @@
 <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 v-if="btnList.length"
-                #expandedRowRender="{ record }">
-        <BtnList :btnList="handleBtnList(btnList, record)"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-      <!-- 类型 -->
-      <template #financetype="{ record }">
-        <a>{{ getFinanceTypeName(record.financetype) }}</a>
-      </template>
+    <!-- 合同 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template v-if="btnList.length" #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="handleBtnList(btnList, record)"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
+            <!-- 类型 -->
+            <template #financetype="{ record }">
+                <a>{{ getFinanceTypeName(record.financetype) }}</a>
+            </template>
 
-      <!-- 状态 -->
-      <template #scfcontractstatus="{ text }">
-        <a>{{ getContractName(text) }}</a>
-      </template>
-      <template #createtime="{ record }">
-        <a>{{ formatTime(record.createtime) }}</a>
-      </template>
-      <template #scfcontracttype="{ record }">
-        <a>{{ getScfContractTypeName(record.scfcontracttype) }}</a>
-      </template>
-
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+            <!-- 状态 -->
+            <template #scfcontractstatus="{ text }">
+                <a>{{ getContractName(text) }}</a>
+            </template>
+            <template #createtime="{ record }">
+                <a>{{ formatTime(record.createtime) }}</a>
+            </template>
+            <template #scfcontracttype="{ record }">
+                <a>{{ getScfContractTypeName(record.scfcontracttype) }}</a>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/funding_information/components/funding_information_funding_log/index.vue

@@ -1,34 +1,39 @@
 <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 v-if="btnList.length"
-                #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-      <template #createtime="{ record }">
-        <a>{{ formatTime(record.createtime) }}</a>
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 资金流水 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template v-if="btnList.length" #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="btnList"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
+            <template #createtime="{ record }">
+                <a>{{ formatTime(record.createtime) }}</a>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/funding_information/components/funding_information_funding_summary/index.vue

@@ -1,37 +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 v-if="btnList.length"
-                #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-      <template #balance="{record}">
-        <span>{{getCanUseMoney(record)}}</span>
-      </template>
-      <template #freezemargin="{record}">
-        <span>{{getFreeze(record, true)}}</span>
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 资金汇总 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template v-if="btnList.length" #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="btnList"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
+            <template #balance="{record}">
+                <span>{{getCanUseMoney(record)}}</span>
+            </template>
+            <template #freezemargin="{record}">
+                <span>{{getFreeze(record, true)}}</span>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/performance_information/components/performance_information_buy_performance/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable expandLeftTable"
-            :scroll="{ x: '100%', y: '185px' }"
+            :scroll="{ x: '100%', y: '190px' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/order/performance_information/components/performance_information_sell_performance/index.vue

@@ -3,7 +3,7 @@
   <section>
     <a-table :columns="columns"
              class="srcollYTable expandLeftTable"
-             :scroll="{ x: '100%', y: '185px' }"
+             :scroll="{ x: '100%', y: '190px' }"
              :pagination="false"
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"

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

@@ -1,30 +1,36 @@
 <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="btnList"
-                 class="btn-list-sticky"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 成交 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="btnList"
+                    class="btn-list-sticky"
+                    :record="record"
+                    @click="openComponent"
+                />
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

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

@@ -1,30 +1,36 @@
 <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="btnList"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 指定成交 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="btnList"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

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

@@ -1,31 +1,37 @@
 <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="btnList"
-                 class="btn-list-sticky"
-                 :record="record"
-                 @click="openComponent"
-                 v-if="record.creditenableqty > 0" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 订单汇总 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="btnList"
+                    class="btn-list-sticky"
+                    :record="record"
+                    @click="openComponent"
+                    v-if="record.creditenableqty > 0"
+                />
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

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

@@ -3,7 +3,7 @@
     <a-table
         :columns="columns"
         class="srcollYTable expandLeftTable"
-        :scroll="{ x: '100%', y: '185px' }"
+        :scroll="{ x: '100%', y: '190px' }"
         :pagination="false"
         :loading="loading"
         :expandedRowKeys="expandedRowKeys"

src/views/order/spot_warran/components/spot_warrant_deal/index.vue

@@ -1,41 +1,46 @@
 <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="btnList"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
+    <!-- 成交 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="btnList"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
 
-        <!-- 成交金额 -->
-        <template #amount="{ record }">
-            <a>{{ record.tradeqty * record.tradeprice }}</a>
-        </template>
+            <!-- 成交金额 -->
+            <template #amount="{ record }">
+                <a>{{ record.tradeqty * record.tradeprice }}</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>
+            <!-- 挂牌类型 -->
+            <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>
 </template>
 
 <script lang="ts">

src/views/order/spot_warran/components/spot_warrant_in_and_out_warehouse/index.vue

@@ -1,41 +1,46 @@
 <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="handleBtnList(btnList, record)"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
+    <!-- 提货 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="handleBtnList(btnList, record)"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
 
-      <!-- applytype 类型-->
-      <template #applytype="{ record }">
-        <span>{{ getPickUpStatusName(record.applytype) }}</span>
-      </template>
+            <!-- applytype 类型-->
+            <template #applytype="{ record }">
+                <span>{{ getPickUpStatusName(record.applytype) }}</span>
+            </template>
 
-      <!-- applystatus 状态 -->
-      <template #applystatus="{ record }">
-        <span>{{ getPickUpTypeName(record.applystatus) }}</span>
-      </template>
-
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+            <!-- applystatus 状态 -->
+            <template #applystatus="{ record }">
+                <span>{{ getPickUpTypeName(record.applystatus) }}</span>
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/spot_warran/components/spot_warrant_inventory_summary/index.vue

@@ -1,31 +1,36 @@
 <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 v-if="btnList.length"
-                #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 库存汇总 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template v-if="btnList.length" #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="btnList"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/order/spot_warran/components/spot_warrant_pending_order/index.vue

@@ -3,7 +3,7 @@
   <section>
     <a-table :columns="columns"
              class="srcollYTable expandLeftTable"
-             :scroll="{ x: '100%', y: '185px' }"
+             :scroll="{ x: '100%', y: '190px' }"
              :pagination="false"
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"

src/views/order/spot_warran/components/spot_warrant_spot_details/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable expandLeftTable"
-            :scroll="{ x: '100%', y: '185px' }"
+            :scroll="{ x: '100%', y: '190px' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/order/spot_warran/components/spot_warrant_spot_summary/components/index.vue

@@ -1,6 +1,6 @@
 <template>
     <!-- 现货仓单 现货明细 提货 -->
-    <Drawer :title="'提货'" :placement="'bottom'" :visible="visible" width="566px" height="406px">
+    <Drawer :title="'提货'" :placement="'bottom'" :visible="visible" width="566px" height="405px">
         <div class="listed">
             <div class="condition">
                 <a-button class="conditionBtn">螺纹钢</a-button>

src/views/order/spot_warran/components/spot_warrant_spot_summary/index.vue

@@ -1,31 +1,36 @@
 <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 v-if="btnList.length"
-                #expandedRowRender="{ record }">
-        <BtnList :btnList="btnList"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-    </a-table>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </section>
+    <!-- 现货汇总 -->
+    <section>
+        <a-table
+            :columns="columns"
+            class="srcollYTable expandLeftTable"
+            :scroll="{ x: '100%', y: '190px' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
+            <!-- 额外的展开行 -->
+            <template v-if="btnList.length" #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="btnList"
+                    :record="record"
+                    class="btn-list-sticky"
+                    @click="openComponent"
+                />
+            </template>
+        </a-table>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </section>
 </template>
 
 <script lang="ts">

src/views/search/search_document_records/search_commodity_contract/search_document_records_commission_record/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 - 405px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_commodity_contract/search_document_records_contract_summary/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 - 405px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_commodity_contract/search_document_records_delivery_record/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 - 405px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_commodity_contract/search_document_records_transaction_record/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 - 405px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_commission_record/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable expandLeftTable"
-            :scroll="{ x: '100%', y: '185px' }"
+            :scroll="{ x: '100%', y: '190px' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_order_summary/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable expandLeftTable"
-            :scroll="{ x: '100%', y: '185px' }"
+            :scroll="{ x: '100%', y: '190px' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_protocol_specified_record/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 - 405px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_transaction_record/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable expandLeftTable"
-            :scroll="{ x: '100%', y: '185px' }"
+            :scroll="{ x: '100%', y: '190px' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_spot_warrant/search_spot_warrant_protocol_specified_record/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 - 405px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_spot_warrant/search_spot_warrant_warehouse_receipt_details/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable expandLeftTable"
-            :scroll="{ x: '100%', y: '185px' }"
+            :scroll="{ x: '100%', y: '190px' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"