修改 查询 样式

src/assets/styles/mixin.less

@@ -2703,6 +2703,36 @@ input:-internal-autofill-selected {
     border-left: 1PX solid @m-grey31;
 }
 
+.topTableHeight_413 {
+    .srcollYTable {
+        .ant-table {
+            .ant-table-content {
+                .ant-table-body {
+                    min-height: calc(100vh - 413px);
+                    max-height: calc(100vh - 413px);
+                    background: @m-black2;
+                }
+            }
+
+        }
+    }
+}
+
+.topTableHeight_379 {
+    .srcollYTable {
+        .ant-table {
+            .ant-table-content {
+                .ant-table-body {
+                    min-height: calc(100vh - 379px);
+                    max-height: calc(100vh - 379px);
+                    background: @m-black2;
+                }
+            }
+
+        }
+    }
+}
+
 // 上半部分表格高度
 .topTableHeight {
     .srcollYTable {
@@ -2710,8 +2740,8 @@ input:-internal-autofill-selected {
 
         .ant-table {
             .ant-table-body {
-                min-height: calc(100vh - 378px);
-                max-height: calc(100vh - 378px);
+                min-height: calc(100vh - 407px);
+                max-height: calc(100vh - 407px);
                 background: @m-black2;
             }
 
@@ -2725,6 +2755,9 @@ input:-internal-autofill-selected {
 
             .ant-table-placeholder {
                 height: calc(100vh - 378px);
+                position: absolute;
+                top: 30px;
+                right: 50%;
 
                 .ant-empty.ant-empty-normal {
                     margin: 0;

src/services/go/wrtrade/interface.ts

@@ -218,9 +218,11 @@ export interface WrPosition {
 export interface QueryWrTradeDetailReq {
     page?: number//         页码
     pagesize?: number//     每页条数
-    userid: number//        用户id
+    userid?: number//        用户id
     marketid?: number//     仓单贸易市场id
     haswr: number//         是否有仓单 0-没有 1-有(仓单贸易填1,仓单预售填0)
+    begindate?: string // 开始交易日(yyyymmdd)
+    enddate?: string // 结束交易日(yyyymmdd)
 }
 
 /**

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

@@ -112,12 +112,10 @@ import { getShowBottomValue } from '@/common/config/constrolBottom';
 import { contextMenu, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
 import { handleTableEventAndData } from '@/common/setup/table/compose';
 import { TableParam } from '@/common/setup/table/interface';
-import { handleQuotePriceColor_out, handleSubcriteOnDemandQuote, quoteAmplitude_out, quoteAmplituOfVibration, quoteChange_out, getQuoteValue_out } from '@/common/setup/table/tableQuote';
+import { getQuoteValue_out, handleQuotePriceColor_out, handleSubcriteOnDemandQuote, quoteAmplitude_out, quoteAmplituOfVibration, quoteChange_out } from '@/common/setup/table/tableQuote';
 import { QueryQuoteDayRsp } from '@/services/go/quote/interface';
-import { RefGoodsList } from './interface';
-import { columnsList, getBtnList, useSwapList } from './setup';
-import { getAllQuoteDayInfo, getQuoteDayInfoByCode } from '@/services/bus/goods';
 import { QueryQuoteGoodsListRsp } from '@/services/go/Tjmd/interface';
+import { columnsList, getBtnList, useSwapList } from './setup';
 
 export default defineComponent({
   name: 'spot_trade_order_transaction_swap',

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

@@ -1,6 +1,6 @@
 <template>
   <!--参考行情-->
-  <div class="topTableHeight">
+  <div class="topTableHeight topTableHeight_379">
     <a-table
       :columns="columns"
       :class="['srcollYTable', isBottom ? '' : 'srcollYTableNoBottom', goodsList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"

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

@@ -1,34 +1,32 @@
 <template>
-  <!-- 仓单贸易 贸易圈挂牌-->
-  <div class="topTableHeight">
-    <Filter :enumName="name"
-            @search="search"
-            @buy="buyOpen" />
-    <div>
-      <Sell isWR="1"
-            IsSpecified="1" />
-      <Buy isWR="1"
-           IsSpecified="1" />
+    <!-- 仓单贸易 贸易圈挂牌-->
+    <div class="topTableHeight topTableHeight_413">
+        <Filter :enumName="name" @search="search" @buy="buyOpen" />
+        <div>
+            <Sell isWR="1" IsSpecified="1" />
+            <Buy isWR="1" IsSpecified="1" />
+        </div>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            isWR="1"
+            IsSpecified="1"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
     </div>
-    <component :is="componentId"
-               v-if="componentId"
-               isWR="1"
-               IsSpecified="1"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
 </template>
 
 <script lang="ts">
-import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { defineComponent, defineAsyncComponent, ModalEnum } from '@/common/export/commonTable';
-import Filter from '../../components/filter/index.vue';
 import { getShowBottomValue } from '@/common/config/constrolBottom';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { handleModalComponent } from '@/common/setup/asyncComponent';
+import Bus from '@/utils/eventBus';
 import Buy from '@/views/market/spot_trade/components/designate-buy/index.vue';
 import Sell from '@/views/market/spot_trade/components/designate-sell/index.vue';
-import { handleModalComponent } from '@/common/setup/asyncComponent';
 import { ref } from 'vue';
-import Bus from '@/utils/eventBus';
+import Filter from '../../components/filter/index.vue';
 
 export default defineComponent({
     name: EnumRouterName.warehouse_receipt_trade_blocs,
@@ -46,7 +44,7 @@ export default defineComponent({
         }
         // 控制异步组件
         const { componentId, closeComponent } = handleModalComponent(queryFn, selectedRow);
-        function search() {}
+        function search() { }
         function buyOpen(value: any) {
             componentId.value = 'postBuying';
             selectedRow.value = value;

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

@@ -1,42 +1,41 @@
 <template>
-  <!-- 仓单贸易 浮动价挂牌-->
-  <div class="topTableHeight">
-    <Filter :enumName="name"
-            @search="search"
-            @filterGoods="filterGoods"
-            @buy="buyOpen" />
-    <a-table :columns="columns"
-             :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom', tableList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"
-             :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList"></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 topTableHeight_413">
+        <Filter :enumName="name" @search="search" @filterGoods="filterGoods" @buy="buyOpen" />
+        <a-table
+            :columns="columns"
+            :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom', tableList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        ></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">
+import { getShowBottomValue } from '@/common/config/constrolBottom';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { queryTableList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam } from '@/common/export/commonTable';
-import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
-import { queryOrderQuote } from '@/services/go/wrtrade';
-import { handleComposeTable } from '@/views/market/spot_trade/setup';
-import Filter from '../../components/filter/index.vue';
+import { ComposeTableParam, contextMenu, defineAsyncComponent, defineComponent, queryTableList } from '@/common/export/commonTable';
 import { Goods } from '@/services/go/ermcp/goodsInfo/interface';
-import { getShowBottomValue } from '@/common/config/constrolBottom';
+import { queryOrderQuote } from '@/services/go/wrtrade';
+import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
 import Bus from '@/utils/eventBus/index';
+import { handleComposeTable } from '@/views/market/spot_trade/setup';
 import { ref } from 'vue';
+import Filter from '../../components/filter/index.vue';
 
 export default defineComponent({
     name: EnumRouterName.warehouse_receipt_trade_floating_price,

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

@@ -1,39 +1,39 @@
 <template>
-  <!-- 仓单贸易 一口价挂牌-->
-  <div class="topTableHeight">
-    <Filter :enumName="name"
-            @search="search"
-            @buy="buyOpen" />
-    <a-table :columns="columns"
-             :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom', tableList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"
-             :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList"></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_413 topTableHeight">
+        <Filter :enumName="name" @search="search" @buy="buyOpen" />
+        <a-table
+            :columns="columns"
+            :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom', tableList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+        ></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">
+import { getShowBottomValue } from '@/common/config/constrolBottom';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam } from '@/common/export/commonTable';
-import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
+import { ComposeTableParam, contextMenu, defineAsyncComponent, defineComponent, queryTableList } from '@/common/export/commonTable';
 import { queryOrderQuote } from '@/services/go/wrtrade';
-import { handleComposeTable } from '@/views/market/spot_trade/setup';
+import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
 import Bus from '@/utils/eventBus/index';
+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_receipt_trade_price,

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

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

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

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

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

@@ -44,7 +44,7 @@ import { expandIcon } from '@/common/setup/table/clolumn';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { queryWrOrderDetail } from '@/services/go/wrtrade';
-import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { QueryWrTradeDetailReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
 import Bus from '@/utils/eventBus';
 import { useOrderWarrant } from '@/views/order/setup';
 
@@ -55,7 +55,7 @@ export default defineComponent({
     const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
     // 获取列表数据
     const queryTableAction = () => {
-      const param: QueryWrOrderDetailReq = {
+      const param: QueryWrTradeDetailReq = {
         haswr: 1,
       };
       queryTable(queryWrOrderDetail, param);

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,10 +1,10 @@
 <template>
   <!-- 成交记录 - 现货仓单 - 历史记录-->
-  <div class="topTableHeight">
+  <section class="topTableHeight">
     <a-table
       :columns="columns"
       class="srcollYTable expandLeftTable"
-      :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+      :scroll="{ x: '100%', y: '190px' }"
       :pagination="false"
       :loading="loading"
       :expandedRowKeys="expandedRowKeys"
@@ -16,51 +16,53 @@
     >
       <!-- 成交金额 -->
       <template #amount="{ record }">
-        <a>{{ record.tradeqty * record.tradeprice }}</a>
-      </template>
-      <template #wrtradedetailid="{ record }">
-        <span>{{ record.wrtradeorderid }}</span>
-      </template>
-      <template #tradetime="{ record }">
-        <span>{{ record.ordertime }}</span>
+        <a>{{ (record.tradeqty * record.tradeprice).toFixed(2) }}</a>
       </template>
+
       <!-- 挂牌类型 -->
       <template #wrtradetype="{ record }">
         <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
       </template>
     </a-table>
-  </div>
+  </section>
 </template>
 
 <script lang="ts">
-import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { getWrOrderTypeName } from '@/common/constants/enumsName';
 import { defineComponent, queryTableList } from '@/common/export/commonTable';
+import { TableKey } from '@/common/methods/table/interface';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { queryWrTradeDetail } from '@/services/go/wrtrade';
-import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
+import { QueryWrTradeDetailReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
+import moment from 'moment';
 
 export default defineComponent({
-  name: EnumRouterName.search_spot_warrant_transaction_record,
+  name: enumOrderComponents.spot_warrant_deal,
+
   setup() {
+    const tableName: keyof TableKey = 'table_pcweb_spot_trade_bottom_spot_warrant_deal';
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
     // 获取列表数据
     const queryTableAction = () => {
-      const param: QueryWrSpecialMatchOrderReq = {
+      const param: QueryWrTradeDetailReq = {
+        enddate: moment().format("YYYYMMDD"),
+        begindate: moment().subtract(2, 'months').startOf('month').format("YYYYMMDD"),
         haswr: 1,
-      };
+      }
       queryTable(queryWrTradeDetail, param);
     };
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
+      tableName,
       queryFn: queryTableAction,
-      tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_deal',
       recordList: getRecordItemTab(),
     };
+
     return {
       ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
       loading,

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

@@ -1,10 +1,10 @@
 <template>
   <!-- 成交记录 - 现货仓单 - 当前记录-->
-  <div class="topTableHeight">
+  <section class="topTableHeight">
     <a-table
       :columns="columns"
       class="srcollYTable expandLeftTable"
-      :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+      :scroll="{ x: '100%', y: '190px' }"
       :pagination="false"
       :loading="loading"
       :expandedRowKeys="expandedRowKeys"
@@ -16,51 +16,50 @@
     >
       <!-- 成交金额 -->
       <template #amount="{ record }">
-        <a>{{ record.tradeqty * record.tradeprice }}</a>
-      </template>
-      <template #wrtradedetailid="{ record }">
-        <span>{{ record.wrtradeorderid }}</span>
-      </template>
-      <template #tradetime="{ record }">
-        <span>{{ record.ordertime }}</span>
+        <a>{{ (record.tradeqty * record.tradeprice).toFixed(2) }}</a>
       </template>
+
       <!-- 挂牌类型 -->
       <template #wrtradetype="{ record }">
         <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
       </template>
     </a-table>
-  </div>
+  </section>
 </template>
 
 <script lang="ts">
-import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { getWrOrderTypeName } from '@/common/constants/enumsName';
 import { defineComponent, queryTableList } from '@/common/export/commonTable';
+import { TableKey } from '@/common/methods/table/interface';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { queryWrTradeDetail } from '@/services/go/wrtrade';
-import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
+import { QueryWrTradeDetailReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
 
 export default defineComponent({
-  name: EnumRouterName.search_spot_warrant_transaction_record,
+  name: enumOrderComponents.spot_warrant_deal,
+
   setup() {
+    const tableName: keyof TableKey = 'table_pcweb_spot_trade_bottom_spot_warrant_deal';
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
     // 获取列表数据
     const queryTableAction = () => {
-      const param: QueryWrSpecialMatchOrderReq = {
+      const param: QueryWrTradeDetailReq = {
         haswr: 1,
       };
       queryTable(queryWrTradeDetail, param);
     };
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
+      tableName,
       queryFn: queryTableAction,
-      tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_deal',
       recordList: getRecordItemTab(),
     };
+
     return {
       ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
       loading,