Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/assets/styles/mixin.less

@@ -2053,13 +2053,28 @@ input:-internal-autofill-selected {
             }
         }
     }
+    .srcollYTableNoBottom {
+        .ant-table {
+            .ant-table-body {
+                min-height: calc(100vh - 138px);
+            }
+        }
+    }
 }
 // 上半部分表格带二级tab筛选
 .topTableHeight {
     .secondTabTable {
         .ant-table {
             .ant-table-body {
-                min-height: calc(100vh - 405px);
+                min-height: calc(100vh - 407px);
+                background: @m-black2;
+            }
+        }
+    }
+    .secondTabTableNoBottom {
+        .ant-table {
+            .ant-table-body {
+                min-height: calc(100vh - 167px);
                 background: @m-black2;
             }
         }
@@ -2075,6 +2090,14 @@ input:-internal-autofill-selected {
             }
         }
     }
+    .condSecondTabTableNoBottom {
+        .ant-table {
+            .ant-table-body {
+                min-height: calc(100vh - 196px);
+                background: @m-black2;
+            }
+        }
+    }
 }
 // 买卖大厅表格
 .buyHallTable,.sellHallTable {
@@ -2582,14 +2605,18 @@ input:-internal-autofill-selected {
     .ant-tabs-content {
         width: 100%;
         height: calc(100% - 29px);
+        min-height: calc(100% - 29px);
         margin-top: -1px;
-        .flex;
-        flex-direction: column;
+        position: relative;
         .ant-tabs-tabpane {
             height: 100%;
+            .flex;
+            flex-direction: column;
         }
         .ant-tabs-tabpane-active {
             background: @m-green1;
+            .position(absolute, 0, 0, 0, 0);
+            z-index: 2;
         }
     }
 }

src/layout/components/top.vue

@@ -197,6 +197,7 @@ export default defineComponent({
         .inlineflex;
         border-bottom: 1px solid @m-black2;
         .ant-layout-sider-has-trigger {
+            padding-bottom: 30px;
             background: @m-black4;
             .ant-layout-sider-children {
                 background: @m-grey18;
@@ -220,18 +221,19 @@ export default defineComponent({
                             line-height: 40px;
                             margin-top: 0;
                             margin-bottom: 0;
+                            padding-left: 10px !important;
                             .icon {
                                 font-size: 14px;
                             }
                             .menu-item_title {
                                 display: inline-block;
                                 font-size: 14px;
-                                margin-left: 15px;
+                                margin-left: 5px;
                             }
                         }
                         .ant-menu-sub {
                             .ant-menu-item {
-                                padding-left: 60px !important;
+                                padding-left: 28px !important;
                                 margin-top: 5px;
                                 margin-bottom: 5px;
                                 height: 30px;

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

@@ -3,8 +3,8 @@
     <div class="topTableHeight">
         <a-table
             :columns="columns"
-            class="srcollYTable secondTabTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 405px)' }"
+            :class="['srcollYTable', isBottom ? 'secondTabTable' : 'secondTabTableNoBottom']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 407px)' : 'calc(100vh - 167px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"
@@ -78,6 +78,8 @@ import { handleTableEventAndData } from '@/common/setup/table/compose';
 import { TableParam } from '@/common/setup/table/interface';
 import { BtnListType } from '@/common/components/btnList/interface';
 import { QueryQuoteDayRsp } from '@/services/go/quote/interface';
+import { getShowBottomValue } from '@/common/config/constrolBottom';
+
 export default defineComponent({
     name: EnumRouterName.spot_trade_order_transaction_basis_difference,
     components: {
@@ -87,6 +89,7 @@ export default defineComponent({
         Detail: defineAsyncComponent(() => import('../components/detail/index.vue')),
     },
     setup() {
+        const isBottom = getShowBottomValue();
         const param: TableParam = {
             columnsList,
             queryFn: () => {},
@@ -102,6 +105,7 @@ export default defineComponent({
         handleSubcriteOnDemandQuote<QueryDeliveryRelationRsp>(deliverGoods);
 
         return {
+            isBottom,
             ...handleTableEventAndData<QueryQuoteDayRsp>(param),
             deliverGoods,
             btnList,

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

@@ -3,8 +3,8 @@
     <div class="topTableHeight">
         <a-table
             :columns="columns"
-            class="srcollYTable secondTabTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 405px)' }"
+            :class="['srcollYTable', isBottom ? 'secondTabTable' : 'secondTabTableNoBottom']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 407px)' : 'calc(100vh - 167px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"
@@ -78,6 +78,7 @@ import { handleTableEventAndData } from '@/common/setup/table/compose';
 import { TableParam } from '@/common/setup/table/interface';
 import { BtnListType } from '@/common/components/btnList/interface';
 import { QueryQuoteDayRsp } from '@/services/go/quote/interface';
+import { getShowBottomValue } from '@/common/config/constrolBottom';
 
 export default defineComponent({
     name: EnumRouterName.spot_trade_order_transaction_listing_transfer,
@@ -88,6 +89,7 @@ export default defineComponent({
         Detail: defineAsyncComponent(() => import('../components/detail/index.vue')),
     },
     setup() {
+        const isBottom = getShowBottomValue();
         const param: TableParam = {
             columnsList,
             queryFn: () => {},
@@ -103,6 +105,7 @@ export default defineComponent({
         handleSubcriteOnDemandQuote<QueryDeliveryRelationRsp>(deliverGoods);
 
         return {
+            isBottom,
             ...handleTableEventAndData<QueryQuoteDayRsp>(param),
             deliverGoods,
             btnList,

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

@@ -1,65 +1,67 @@
 <template>
-  <!--参考行情-->
-  <div class="topTableHeight">
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 378px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="goodscode"
-             ref="tableRef"
-             :data-source="goodsList">
-      <template #totalturnover="{ text }">
-        <span>{{changeUnit(text)}}</span>
-      </template>
-      <!-- 涨跌 -->
-      <template #change="{ record }">
-        <span>{{quoteChange(record, record.decimalplace)}}</span>
-      </template>
-      <!-- 幅度 -->
-      <template #amplitude="{ record }">
-        <span>{{quoteAmplituOfVibration(record, record.decimalplace)}}</span>
-      </template>
-      <!-- 振幅 -->
-      <template #vibration="{ record }">
-        <span>{{quoteAmplituOfVibration(record, record.decimalplace)}}</span>
-      </template>
-      <template #index="{ index }">
-        <span>{{index + 1}}</span>
-      </template>
-      <!-- 买价 -->
-      <template #bid="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-      <!-- 卖价 -->
-      <template #ask="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-      <!-- 最新价 -->
-      <template #last="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-      <!-- 最低价 -->
-      <template #lowest="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-      <!-- 最高价 -->
-      <template #highest="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="firstBtn"></contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :enumName="name"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <!--参考行情-->
+    <div class="topTableHeight">
+        <a-table
+            :columns="columns"
+            :class="['srcollYTable', isBottom ? '' : 'srcollYTableNoBottom']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh - 378px)' :  'calc(100vh - 138px)'}"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="goodscode"
+            ref="tableRef"
+            :data-source="goodsList"
+        >
+            <template #totalturnover="{ text }">
+                <span>{{changeUnit(text)}}</span>
+            </template>
+            <!-- 涨跌 -->
+            <template #change="{ record }">
+                <span>{{quoteChange(record, record.decimalplace)}}</span>
+            </template>
+            <!-- 幅度 -->
+            <template #amplitude="{ record }">
+                <span>{{quoteAmplituOfVibration(record, record.decimalplace)}}</span>
+            </template>
+            <!-- 振幅 -->
+            <template #vibration="{ record }">
+                <span>{{quoteAmplituOfVibration(record, record.decimalplace)}}</span>
+            </template>
+            <template #index="{ index }">
+                <span>{{index + 1}}</span>
+            </template>
+            <!-- 买价 -->
+            <template #bid="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+            <!-- 卖价 -->
+            <template #ask="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+            <!-- 最新价 -->
+            <template #last="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+            <!-- 最低价 -->
+            <template #lowest="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+            <!-- 最高价 -->
+            <template #highest="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="firstBtn"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :enumName="name"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">
@@ -76,6 +78,7 @@ import { TradeMode } from '@/common/constants/enumCommon';
 import { handleTableColums } from '@/common/setup/table/clolumn';
 import { QueryQuoteDayRsp } from '@/services/go/quote/interface';
 import { changeUnit } from '@/utils/qt/common';
+import { getShowBottomValue } from '@/common/config/constrolBottom';
 
 const columnsList = [
     { title: '序号', key: 'index', width: 80 },
@@ -111,6 +114,7 @@ export default defineComponent({
         // postBuying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
     },
     setup() {
+        const isBottom = getShowBottomValue();
         // 表头
         const { columns } = handleTableColums(columnsList);
         // 表格列表数据
@@ -137,6 +141,7 @@ export default defineComponent({
             isDetail: false,
         };
         return {
+            isBottom,
             ...handleComposeTable<QueryDeliveryRelationRsp>(param),
             loading,
             tableList,

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 condSecondTabTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 443px)' }"
+            :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"
@@ -34,6 +34,7 @@ import { handleComposeTable } from '@/views/market/spot_trade/setup';
 import Filter from '../../components/filter/index.vue';
 import { Goods } from '@/services/go/ermcp/goodsInfo/interface';
 import { ref } from 'vue';
+import { getShowBottomValue } from '@/common/config/constrolBottom';
 
 export default defineComponent({
     name: EnumRouterName.warehouse_pre_sale_floating_price,
@@ -46,6 +47,7 @@ export default defineComponent({
         postBuying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
     },
     setup() {
+        const isBottom = getShowBottomValue();
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
         // 获取列表数据
@@ -94,6 +96,7 @@ export default defineComponent({
             selectedRow.value = value;
         }
         return {
+            isBottom,
             contextMenu,
             openContext,
             closeContext, // 右键

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 condSecondTabTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 443px)' }"
+            :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"
@@ -32,6 +32,7 @@ import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interfac
 import { queryOrderQuote } from '@/services/go/wrtrade';
 import { handleComposeTable } from '@/views/market/spot_trade/setup';
 import Filter from '../../components/filter/index.vue';
+import { getShowBottomValue } from '@/common/config/constrolBottom';
 
 export default defineComponent({
     name: EnumRouterName.warehouse_pre_sale_price,
@@ -44,6 +45,7 @@ export default defineComponent({
         postBuying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
     },
     setup() {
+        const isBottom = getShowBottomValue();
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
         // 获取列表数据
@@ -89,6 +91,7 @@ export default defineComponent({
             selectedRow.value = value;
         }
         return {
+            isBottom,
             contextMenu,
             openContext,
             closeContext, // 右键

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 condSecondTabTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 443px)' }"
+            :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"
@@ -33,6 +33,7 @@ import { queryOrderQuote } from '@/services/go/wrtrade';
 import { handleComposeTable } from '@/views/market/spot_trade/setup';
 import Filter from '../../components/filter/index.vue';
 import { Goods } from '@/services/go/ermcp/goodsInfo/interface';
+import { getShowBottomValue } from '@/common/config/constrolBottom';
 
 export default defineComponent({
     name: EnumRouterName.warehouse_receipt_trade_floating_price,
@@ -45,6 +46,7 @@ export default defineComponent({
         postBuying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
     },
     setup() {
+        const isBottom = getShowBottomValue();
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
         // 获取列表数据
@@ -92,6 +94,7 @@ export default defineComponent({
             selectedRow.value = value;
         }
         return {
+            isBottom,
             contextMenu,
             openContext,
             closeContext, // 右键

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 condSecondTabTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 443px)' }"
+            :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"
@@ -33,6 +33,7 @@ import { queryOrderQuote } from '@/services/go/wrtrade';
 import { handleComposeTable } from '@/views/market/spot_trade/setup';
 import Bus from '@/utils/eventBus/index';
 import Filter from '../../components/filter/index.vue';
+import { getShowBottomValue } from '@/common/config/constrolBottom';
 
 export default defineComponent({
     name: EnumRouterName.warehouse_receipt_trade_price,
@@ -45,6 +46,7 @@ export default defineComponent({
         postBuying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
     },
     setup() {
+        const isBottom = getShowBottomValue();
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
         // 获取列表数据
@@ -92,6 +94,7 @@ export default defineComponent({
         }
 
         return {
+            isBottom,
             contextMenu,
             openContext,
             closeContext, // 右键