修改 查询页面滚动条

public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl": "http://192.168.31.139:8080/cfg?key=test_139"
+    "apiUrl": "http://192.168.31.202:8080/cfg?key=test_202"
 }

src/assets/styles/mixin.less

@@ -2734,13 +2734,28 @@ input:-internal-autofill-selected {
     }
 }
 
-.topTableHeight_448 {
+.topTableHeight_441 {
     .srcollYTable {
         .ant-table {
             .ant-table-content {
                 .ant-table-body {
-                    min-height: calc(100vh - 448px);
-                    max-height: calc(100vh - 448px);
+                    min-height: calc(100vh - 414px);
+                    max-height: calc(100vh - 414px);
+                    background: @m-black2;
+                }
+            }
+
+        }
+    }
+}
+
+topTableHeight_441_no_bottom {
+    .srcollYTable {
+        .ant-table {
+            .ant-table-content {
+                .ant-table-body {
+                    min-height: calc(100vh - 201px);
+                    max-height: calc(100vh - 201px);
                     background: @m-black2;
                 }
             }

src/common/config/constrolBottom.ts

@@ -1,7 +1,7 @@
 import { Ref, ref } from "vue";
 
 // 控制显示单据底部显示全部还是部分
-const isShowBottom = ref<boolean>(true);
+export const isShowBottom = ref<boolean>(true);
 
 export function handleShowBottom(): void {
     isShowBottom.value = !isShowBottom.value

src/layout/components/bottom.vue

@@ -1,48 +1,49 @@
 <template>
-  <section :class="['layout-bottom', isShowBottom ? 'layout-bottom-all' : 'layout-bottom-hidden']">
-    <CapitalInfo class="capital-info-container"
-                 v-if="isCapitalLeft"></CapitalInfo>
-    <main :class="[isCapitalLeft ? 'main-some' : 'main-all']">
-      <firstMenu :list="orderList"
-                 :value="'title'"
-                 @selectMenu="selectMenu">
-        <div class="right-menu-content">
-          <!-- 资金信息 -->
-          <a-select class="capitalSelect"
-                    style="width: 180px"
-                    @change="accountChange"
-                    v-model:value="selectedAccountId">
-            <a-select-option v-for="item in getAllTaAccount()"
-                             :value="item.accountid"
-                             :key="item.accountid">{{item.accountid}}</a-select-option>
-          </a-select>
-          <div class="conditionIcon icon iconfont icon-shouqi"
-               @click="handleShowBottom"></div>
-        </div>
-      </firstMenu>
-      <div v-show="isShowBottom">
-        <component :is="componentId"
-                   v-if="componentId"></component>
-      </div>
-    </main>
-  </section>
+    <section
+        :class="['layout-bottom', isShowBottom ? 'layout-bottom-all' : 'layout-bottom-hidden']"
+    >
+        <CapitalInfo class="capital-info-container" v-if="isCapitalLeft"></CapitalInfo>
+        <main :class="[isCapitalLeft ? 'main-some' : 'main-all']">
+            <firstMenu :list="orderList" :value="'title'" @selectMenu="selectMenu">
+                <div class="right-menu-content">
+                    <!-- 资金信息 -->
+                    <a-select
+                        class="capitalSelect"
+                        style="width: 180px"
+                        @change="accountChange"
+                        v-model:value="selectedAccountId"
+                    >
+                        <a-select-option
+                            v-for="item in getAllTaAccount()"
+                            :value="item.accountid"
+                            :key="item.accountid"
+                        >{{ item.accountid }}</a-select-option>
+                    </a-select>
+                    <div class="conditionIcon icon iconfont icon-shouqi" @click="handleShowBottom"></div>
+                </div>
+            </firstMenu>
+            <div v-show="isShowBottom">
+                <component :is="componentId" v-if="componentId"></component>
+            </div>
+        </main>
+    </section>
 </template>
 <script lang="ts">
-import { defineAsyncComponent, defineComponent, reactive, ref } from 'vue';
 import CapitalInfo from '@/common/components/capitalInfo/index.vue';
 import firstMenu from '@/common/components/firstMenu/index.vue';
-import thirdMenu from '@/common/components/thirdMenu/index.vue';
 import quoteTable from '@/common/components/quoteTable/index.vue';
-import { OperationTabMenu } from '@/services/go/commonService/interface';
-import { handleOrderData } from '@/common/setup/order/orderData';
+import thirdMenu from '@/common/components/thirdMenu/index.vue';
+import { getShowBottomValue, handleShowBottom } from '@/common/config/constrolBottom';
+import { isOemByEnum, OemType } from '@/common/config/projectName';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { handleShowBottom, getShowBottomValue } from '@/common/config/constrolBottom';
-import { getAllTaAccount, getCanUseMoney, getFreeze, getSelectedAccount, setSelectedAccount } from '@/services/bus/account';
+import { initData } from '@/common/methods';
+import { handleOrderData } from '@/common/setup/order/orderData';
+import { getAllTaAccount, getSelectedAccount, setSelectedAccount } from '@/services/bus/account';
 import { AccountListItem } from '@/services/dataCenter/interafce/account';
+import { OperationTabMenu } from '@/services/go/commonService/interface';
 import { getTaAccount } from '@/services/go/TaAccount';
 import Bus from '@/utils/eventBus/index';
-import { isOemByEnum, OemType } from '@/common/config/projectName';
-import { initData } from '@/common/methods';
+import { defineAsyncComponent, defineComponent, ref } from 'vue';
 
 export default defineComponent({
     name: 'layout-top',
@@ -89,7 +90,6 @@ export default defineComponent({
             componentId,
             orderList,
             isShowBottom: getShowBottomValue(),
-            getShowBottomValue,
             handleShowBottom,
             getAllTaAccount,
             selectedAccountId,

src/views/search/search_capital_flow/search_capital_flow_tab/search_capital_flow_tab_history/index.vue

@@ -1,11 +1,13 @@
 <template>
     <!-- 资金流水 -->
-    <section class="topTableHeight_448 topTableHeight">
+    <section
+        :class="[isShowBottom ? 'topTableHeight_441' : 'topTableHeight_441_no_bottom', 'topTableHeight']"
+    >
         <Filter @search="search" />
         <a-table
             :columns="columns"
-            class="srcollYTable expandLeftTable"
-            :scroll="{ x: '100%', y: '190px' }"
+            class="srcollYTable"
+            :scroll="{ x: '100%' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"
@@ -23,6 +25,7 @@
 </template>
 
 <script lang="ts">
+import { isShowBottom } from '@/common/config/constrolBottom';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { defineComponent, queryTableList } from '@/common/export/commonTable';
 import { formatTime } from '@/common/methods';
@@ -67,6 +70,7 @@ export default defineComponent({
             tableList,
             formatTime,
             expandIcon,
+            isShowBottom,
         };
     },
 });

src/views/search/search_document_records_commission_record_sub/search_document_records_commodity_contract/search_document_records_done_commodity_contract_history/index.vue

@@ -1,11 +1,13 @@
 <template>
   <!-- 委托记录 - 商品合约 - 历史记录-->
-  <section class="topTableHeight_448 topTableHeight">
+  <section
+    :class="[isShowBottom ? 'topTableHeight_441' : 'topTableHeight_441_no_bottom', 'topTableHeight']"
+  >
     <Filter @search="search" />
     <a-table
       :columns="columns"
       class="srcollYTable"
-      :scroll="{ x: '100%', y: '190px' }"
+      :scroll="{ x: '100%' }"
       :pagination="false"
       :loading="loading"
       :expandedRowKeys="expandedRowKeys"
@@ -32,6 +34,7 @@
 </template>
 
 <script lang="ts">
+import { isShowBottom } from '@/common/config/constrolBottom';
 import { TradeMode } from '@/common/constants/enumCommon';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { getBuyOrSellTypeName, getOrderStatusName } from '@/common/constants/enumsName';
@@ -46,7 +49,6 @@ import { QueryTradeOrderDetailRsp } from '@/services/go/ermcp/order/interface';
 import { WrPerformancePlan } from '@/services/go/wrtrade/interface';
 import moment, { Moment } from 'moment';
 import Filter from '../../components/filter/index.vue';
-
 export default defineComponent({
   name: enumOrderComponents.commodity_contract_commission,
   components: {
@@ -81,7 +83,8 @@ export default defineComponent({
       expandIcon,
       getBuyOrSellTypeName,
       getOrderStatusName,
-      search
+      search,
+      isShowBottom
     };
   },
 });

src/views/search/search_document_records_commission_record_sub/search_document_records_spot_warrant/search_document_records_spot_warrant_history/index.vue

@@ -1,11 +1,13 @@
 <template>
     <!-- 委托记录 - 现货仓单 - 历史记录  -->
-    <section class="topTableHeight_448 topTableHeight">
+    <section
+        :class="[isShowBottom ? 'topTableHeight_441' : 'topTableHeight_441_no_bottom', 'topTableHeight']"
+    >
         <Filter @search="search" />
         <a-table
             :columns="tableColumns"
-            :class="['srcollYTable', isBottom ? 'secondTabTable' : 'secondTabTableNoBottom', tableList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"
-            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 407px)' : 'calc(100vh - 201px)' }"
+            :class="['srcollYTable', isShowBottom ? 'secondTabTable' : 'secondTabTableNoBottom', tableList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"
+            :scroll="{ x: '100%' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"
@@ -37,7 +39,7 @@
 </template>
 
 <script lang="ts">
-import { getShowBottomValue } from '@/common/config/constrolBottom';
+import { isShowBottom } from '@/common/config/constrolBottom';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { getOrderStatusName, getWrOrderTypeName } from '@/common/constants/enumsName';
 import { defineComponent, queryTableList } from '@/common/export/commonTable';
@@ -57,7 +59,6 @@ export default defineComponent({
         Filter,
     },
     setup() {
-        const isBottom = getShowBottomValue();
 
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
@@ -81,7 +82,7 @@ export default defineComponent({
         };
         return {
             ...handleComposeOrderTable<WrOrderDetail>(param),
-            isBottom,
+            isShowBottom,
             loading,
             tableList,
             getOrderStatusName,

src/views/search/search_document_records_done/search_document_records_done_commodity_contract/search_document_records_done_commodity_contract_history/index.vue

@@ -1,11 +1,13 @@
 <template>
   <!-- 商品订单 - 成交 -历史记录-->
-  <section class="topTableHeight_448 topTableHeight">
+  <section
+    :class="[isShowBottom ? 'topTableHeight_441' : 'topTableHeight_441_no_bottom', 'topTableHeight']"
+  >
     <Filter @search="search" />
     <a-table
       :columns="columns"
-      class="srcollYTable expandLeftTable"
-      :scroll="{ x: '100%', y: '190px' }"
+      class="srcollYTable"
+      :scroll="{ x: '100%' }"
       :pagination="false"
       :loading="loading"
       :expandedRowKeys="expandedRowKeys"
@@ -37,6 +39,7 @@
 </template>
 
 <script lang="ts">
+import { isShowBottom } from '@/common/config/constrolBottom';
 import { TradeMode } from '@/common/constants/enumCommon';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { getBuyOrSellTypeName, getOrderStatusName } from '@/common/constants/enumsName';
@@ -93,6 +96,7 @@ export default defineComponent({
       getBuyOrSellTypeName,
       search,
       handleType,
+      isShowBottom,
     };
   },
 });

src/views/search/search_document_records_done/search_document_records_done_search_spot_warrant/search_document_records_done_search_spot_warrant_history/index.vue

@@ -1,11 +1,11 @@
 <template>
   <!-- 成交记录 - 现货仓单 - 历史记录-->
-  <section class="topTableHeight_448 topTableHeight">
+  <section     :class="[isShowBottom ? 'topTableHeight_441' : 'topTableHeight_441_no_bottom', 'topTableHeight']">
     <Filter @search="search" />
     <a-table
       :columns="columns"
-      class="srcollYTable expandLeftTable"
-      :scroll="{ x: '100%', y: '190px' }"
+      class="srcollYTable"
+      :scroll="{ x: '100%' }"
       :pagination="false"
       :loading="loading"
       :expandedRowKeys="expandedRowKeys"
@@ -29,6 +29,7 @@
 </template>
 
 <script lang="ts">
+import { isShowBottom } from '@/common/config/constrolBottom';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { getWrOrderTypeName } from '@/common/constants/enumsName';
 import { defineComponent, queryTableList } from '@/common/export/commonTable';
@@ -75,6 +76,7 @@ export default defineComponent({
       expandIcon,
       search,
       getWrOrderTypeName,
+      isShowBottom,
     };
   },
 });

src/views/search/search_performance_query/search_performance_query_buy_performance/search_performance_query_buy_performance_done/index.vue

@@ -1,11 +1,13 @@
 <template>
   <!-- 履约查询 买履约 -->
-  <section class="topTableHeight_448 topTableHeight">
+  <section
+    :class="[isShowBottom ? 'topTableHeight_441' : 'topTableHeight_441_no_bottom', 'topTableHeight']"
+  >
     <Filter @search="search" :subtract="0" />
     <a-table
       :columns="columns"
       class="srcollYTable expandLeftTable"
-      :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+      :scroll="{ x: '100%', }"
       :pagination="false"
       :loading="loading"
       :expandedRowKeys="expandedRowKeys"
@@ -39,6 +41,7 @@
 </template>
 
 <script lang="ts">
+import { isShowBottom } from '@/common/config/constrolBottom';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
@@ -51,6 +54,7 @@ import { QueryPerformancePlan } from '@/services/go/wrtrade';
 import { WrPerformancePlan } from '@/services/go/wrtrade/interface';
 import Filter from '@/views/search/search_document_records_commission_record_sub/components/filter/index.vue';
 import moment, { Moment } from 'moment';
+
 export default defineComponent({
   name: EnumRouterName.search_performance_query_buy_performance,
   components: {
@@ -84,6 +88,7 @@ export default defineComponent({
       getPaymentTypeName,
       expandIcon,
       search,
+      isShowBottom,
     };
   },
 });

src/views/search/search_performance_query/search_performance_query_sell_performance/search_performance_query_sell_performance_done/index.vue

@@ -1,11 +1,13 @@
 <template>
   <!-- 履约查询 卖履约 -->
-  <section class="topTableHeight_448 topTableHeight">
+  <section
+    :class="[isShowBottom ? 'topTableHeight_441' : 'topTableHeight_441_no_bottom', 'topTableHeight']"
+  >
     <Filter @search="search" :subtract="0" />
     <a-table
       :columns="columns"
-      class="srcollYTable expandLeftTable"
-      :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+      class="srcollYTable"
+      :scroll="{ x: '100%' }"
       :pagination="false"
       :loading="loading"
       :expandedRowKeys="expandedRowKeys"
@@ -39,6 +41,7 @@
 </template>
 
 <script lang="ts">
+import { isShowBottom } from '@/common/config/constrolBottom';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
@@ -51,6 +54,7 @@ import { QueryPerformancePlan } from '@/services/go/wrtrade';
 import { WrPerformancePlan } from '@/services/go/wrtrade/interface';
 import Filter from '@/views/search/search_document_records_commission_record_sub/components/filter/index.vue';
 import moment, { Moment } from 'moment';
+
 export default defineComponent({
   name: EnumRouterName.search_performance_query_sell_performance,
   components: {
@@ -85,7 +89,11 @@ export default defineComponent({
       getPerformanceStatusName,
       expandIcon,
       search,
+      isShowBottom,
     };
   },
 });
-</script>
+</script>
+
+<style lang="less">
+</style>;