修改 成交记录 历史记录

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

@@ -1,6 +1,7 @@
 <template>
-  <!-- 商品订单 - 成交 -->
-  <section class="topTableHeight">
+  <!-- 商品订单 - 成交 -历史记录-->
+  <section class="topTableHeight_448 topTableHeight">
+    <Filter @search="search" />
     <a-table
       :columns="columns"
       class="srcollYTable expandLeftTable"
@@ -45,26 +46,34 @@ 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 { handleNoneValue } from '@/common/setup/table/tableQuote';
 import { queryHisTradeDetail } from '@/services/go/ermcp/order';
 import { QueryTradeDetailRsp } from '@/services/go/ermcp/order/interface';
-import Bus from '@/utils/eventBus/index';
+import Filter from '@/views/search/search_document_records_commission_record_sub/components/filter/index.vue';
+import { Moment } from 'moment';
 
 export default defineComponent({
   name: enumOrderComponents.commodity_contract_make_deal,
+  components: {
+    Filter,
+  },
   setup() {
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<QueryTradeDetailRsp>();
-    // 获取列表数据
-    const queryTableAction = () => {
-      queryTable(queryHisTradeDetail, { tradeMode: TradeMode.DiaoQi.toString() });
-    };
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
-      queryFn: queryTableAction,
+      queryFn: () => { },
       tableName: 'table_pcweb_spot_trade_bottom_commodity_contract_make_deal',
       recordList: getRecordItemTab(),
     };
+    // 查询数据
+    const search = (value: Moment[]) => {
+      const param = {
+        enddate: value[1].format('YYYY-MM-DD'),
+        begindate: value[0].format('YYYY-MM-DD'),
+        tradeMode: TradeMode.DiaoQi.toString()
+      };
+      queryTable(queryHisTradeDetail, param);
+    };
     // fix: #2063
     function handleType(record: QueryTradeDetailRsp, value: string | number) {
       let result: number | string = '--';
@@ -73,9 +82,7 @@ export default defineComponent({
       }
       return result;
     }
-    Bus.$on('spotTrade', () => {
-      queryTableAction();
-    });
+
     return {
       ...handleComposeOrderTable<QueryTradeDetailRsp>(param),
       loading,
@@ -84,7 +91,7 @@ export default defineComponent({
       expandIcon,
       getOrderStatusName,
       getBuyOrSellTypeName,
-      handleNoneValue,
+      search,
       handleType,
     };
   },

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,7 +1,20 @@
 <template>
   <!-- 成交记录 - 现货仓单 - 历史记录-->
-  <section class="topTableHeight">
-    <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">
+  <section class="topTableHeight_448 topTableHeight">
+    <Filter @search="search" />
+    <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 #amount="{ record }">
         <a>{{ (record.tradeqty * record.tradeprice).toFixed(2) }}</a>
@@ -25,29 +38,33 @@ 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 { QueryWrTradeDetailReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
-import moment from 'moment';
+import { WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
+import Filter from '@/views/search/search_document_records_commission_record_sub/components/filter/index.vue';
+import { Moment } from 'moment';
 
 export default defineComponent({
   name: enumOrderComponents.spot_warrant_deal,
-
+  components: {
+    Filter,
+  },
   setup() {
     const tableName: keyof TableKey = 'table_pcweb_spot_trade_bottom_spot_warrant_deal';
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
-    // 获取列表数据
-    const queryTableAction = () => {
-      const param: QueryWrTradeDetailReq = {
-        enddate: moment().format("YYYYMMDD"),
-        begindate: moment().subtract(2, 'months').startOf('month').format("YYYYMMDD"),
+
+    // 查询数据
+    const search = (value: Moment[]) => {
+      const param = {
+        enddate: value[1].format('YYYYMMDD'),
+        begindate: value[0].format('YYYYMMDD'),
         haswr: 1,
-      }
+      };
       queryTable(queryWrTradeDetail, param);
     };
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
       tableName,
-      queryFn: queryTableAction,
+      queryFn: () => { },
       recordList: getRecordItemTab(),
     };
 
@@ -56,6 +73,7 @@ export default defineComponent({
       loading,
       tableList,
       expandIcon,
+      search,
       getWrOrderTypeName,
     };
   },