修改 查询委托记录

src/assets/styles/index.less

@@ -6,17 +6,17 @@
 
 // globals
 html {
-    font-family                : @font-family;
-    -webkit-text-size-adjust   : 100%;
+    font-family: @font-family;
+    -webkit-text-size-adjust: 100%;
     -webkit-tap-highlight-color: @m-black;
     // better Font Rendering
-    -webkit-font-smoothing     : antialiased;
-    -moz-osx-font-smoothing    : grayscale;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
 
 body {
-    margin          : 0;
-    overflow        : hidden;
+    margin: 0;
+    overflow: hidden;
     background-color: @body-bg;
 }
 
@@ -37,7 +37,7 @@ body {
     >section {
         header {
             background: @m-white0;
-            padding   : 0;
+            padding: 0;
         }
 
         main {
@@ -57,11 +57,11 @@ body {
         border-bottom: 1px solid @m-white2;
 
         .ant-card-head-title {
-            text-align : left;
-            font-size  : 16px;
+            text-align: left;
+            font-size: 16px;
             font-family: Source Han Sans CN;
             font-weight: 500;
-            color      : @m-grey24;
+            color: @m-grey24;
         }
     }
 }
@@ -77,16 +77,16 @@ body {
 }
 
 .ant-modal-title {
-    font-size  : 18px;
+    font-size: 18px;
     font-family: Source Han Sans CN;
     font-weight: 500;
-    color      : @m-green3;
+    color: @m-green3;
 }
 
 .submit {
-    background   : @m-green3;
+    background: @m-green3;
     border-radius: 3px;
-    color        : @m-white0;
+    color: @m-white0;
 }
 
 .ant-btn-primary {
@@ -141,7 +141,7 @@ body {
 }
 
 ::selection {
-    color     : @m-white0;
+    color: @m-white0;
     background: @m-white2;
 }
 
@@ -154,11 +154,11 @@ body {
 }
 
 .icon {
-    width         : 1em;
-    height        : 1em;
+    width: 1em;
+    height: 1em;
     vertical-align: -0.15em;
-    fill          : currentColor;
-    overflow      : hidden;
+    fill: currentColor;
+    overflow: hidden;
 }
 
 .ant-spin-nested-loading>div>.ant-spin {
@@ -167,12 +167,12 @@ body {
 }
 
 .ant-spin-nested-loading {
-    width : 100%;
+    width: 100%;
     height: 100%;
 
     .ant-spin-container {
-        width  : 100%;
-        height : 100%;
+        width: 100%;
+        height: 100%;
         display: flex;
     }
 }
@@ -186,11 +186,11 @@ body {
 }
 
 .ant-empty {
-    height         : 100%;
-    display        : flex;
-    flex-direction : column;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
     justify-content: center;
-    align-items    : center;
+    align-items: center;
 }
 
 .mt15 {
@@ -202,21 +202,21 @@ body {
 }
 
 .ellipsis {
-    font-size    : 12px;
-    display      : block/inline-block;
-    overflow     : hidden;
-    white-space  : nowrap;
+    font-size: 12px;
+    display: block/inline-block;
+    overflow: hidden;
+    white-space: nowrap;
     text-overflow: ellipsis;
-    width        : 120px;
-    display      : inline-block;
+    width: 120px;
+    display: inline-block;
 }
 
 .ellipsis_temp {
-    white-space  : nowrap;
-    overflow     : hidden;
+    white-space: nowrap;
+    overflow: hidden;
     text-overflow: ellipsis;
-    width        : 250px;
-    display      : inline-block;
+    width: 250px;
+    display: inline-block;
 }
 
 
@@ -225,7 +225,7 @@ body {
     background-color: @m-grey18;
 
     .ant-menu-submenu-title {
-        font-size : 16px;
+        font-size: 16px;
         text-align: left;
     }
 
@@ -233,10 +233,10 @@ body {
         background-color: @m-black4;
 
         .ant-menu-item {
-            font-size  : 14px;
+            font-size: 14px;
             font-family: @menu-item-family;
-            color      : @menu-item-color;
-            text-align : left;
+            color: @menu-item-color;
+            text-align: left;
         }
 
         .ant-menu-item-selected {
@@ -258,7 +258,7 @@ body {
 
 .mine_layout .ant-menu .ant-menu-item-selected,
 .mine_layout .ant-menu .ant-menu-item:hover {
-    color        : @theme;
+    color: @theme;
     border-bottom: 2px solid @theme;
 }
 
@@ -269,9 +269,9 @@ body {
 .ant-table-wrapper {
     .ant-table-thead {
         tr th {
-            background : @m-black8;
-            color      : @m-grey17;
-            font-size  : 14px;
+            background: @m-black8;
+            color: @m-grey17;
+            font-size: 14px;
             font-family: Adobe Heiti Std;
         }
 
@@ -292,25 +292,25 @@ body {
 
     .ant-table-body tr td {
         background-color: @m-black2;
-        color           : white;
-        cursor          : pointer;
+        color: white;
+        cursor: pointer;
     }
 
     .ant-table-bordered .ant-table-thead>tr>th,
     .ant-table-bordered .ant-table-tbody>tr>td {
-        padding     : 0;
-        height      : 34px;
-        line-height : 34px;
+        padding: 0;
+        height: 34px;
+        line-height: 34px;
         border-color: @m-black9;
-        font-family : Adobe Heiti Std;
-        font-size   : 16px;
+        font-family: Adobe Heiti Std;
+        font-size: 16px;
     }
 
     .ant-table-fixed {
-        width            : max-content !important;
-        color            : @m-white1;
-        background       : @m-black2;
-        border-top-color : @m-black2  !important;
+        width: max-content !important;
+        color: @m-white1;
+        background: @m-black2;
+        border-top-color: @m-black2  !important;
         border-left-color: @m-black9  !important;
     }
 }
@@ -329,7 +329,7 @@ body {
 
     >iframe {
         border: 0;
-        width : 100%;
+        width: 100%;
         height: 100%;
     }
 }
@@ -346,4 +346,11 @@ body {
 // 不可复制
 .not-copy {
     user-select: none
+}
+
+.filer-containter {
+    text-align: left;
+    margin-left: 5px;
+    padding-top: 5px;
+    padding-bottom: 5px;
 }

src/assets/styles/mixin.less

@@ -2734,6 +2734,21 @@ input:-internal-autofill-selected {
     }
 }
 
+.topTableHeight_448 {
+    .srcollYTable {
+        .ant-table {
+            .ant-table-content {
+                .ant-table-body {
+                    min-height: calc(100vh - 448px);
+                    max-height: calc(100vh - 448px);
+                    background: @m-black2;
+                }
+            }
+
+        }
+    }
+}
+
 // 上半部分表格高度
 .topTableHeight {
     .srcollYTable {

src/views/search/search_document_records_commission_record_sub/components/filter/index.vue

@@ -1,24 +1,43 @@
 <template>
     <div class="filterTable">
         <div class="filter-custom-table">
-            <a-range-picker class="commonDatePicker" format="YYYY-MM-DD" :placeholder="['开始时间', '结束时间']" @change="onChange" />
+            <a-range-picker
+                class="commonDatePicker"
+                format="YYYY-MM-DD"
+                v-model:value="time"
+                :disabled-date="disabledDate"
+                :placeholder="['开始时间', '结束时间']"
+                @change="onChange"
+            />
         </div>
     </div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import { Moment } from 'moment';
-
+import { initData } from '@/common/export/table';
+import moment, { Moment } from 'moment';
+import { defineComponent, ref } from 'vue';
 export default defineComponent({
     emits: ['search'],
     setup(props, context) {
         const onChange = (value: Moment[]) => {
             context.emit('search', value);
         };
-
+        const time = ref<Moment[]>([
+            moment(moment().subtract(7, 'day')),
+            moment(moment().subtract(1, 'day'))
+        ])
+        initData(() => {
+            onChange(time.value)
+        })
+        function disabledDate(current: Moment) {
+            // Can not select days before today and today
+            return current && current > moment(moment().subtract(1, 'day')).endOf('day');
+        }
         return {
             onChange,
+            time,
+            disabledDate,
         };
     },
 });

src/views/search/search_document_records_commission_record_sub/search_document_records_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"
@@ -43,29 +44,35 @@ import { ComposeOrderTableParam } from '@/common/setup/table/interface';
 import { queryHisTradeOrderDetail } from '@/services/go/ermcp/order';
 import { QueryTradeOrderDetailRsp } from '@/services/go/ermcp/order/interface';
 import { WrPerformancePlan } from '@/services/go/wrtrade/interface';
-import moment from 'moment';
+import moment, { Moment } from 'moment';
+import Filter from '../../components/filter/index.vue';
 
 export default defineComponent({
   name: enumOrderComponents.commodity_contract_commission,
+  components: {
+    Filter,
+  },
   setup() {
     // 表格列表数据
     const { loading, tableList, queryTable } = queryTableList<QueryTradeOrderDetailRsp>();
-    // 获取列表数据
-    const queryTableAction = () => {
-      const param = {
-        endDate: moment().format("YYYY-MM-DD"),
-        startDate: moment().subtract(2, 'months').startOf('month').format("YYYY-MM-DD"),
-        tradeMode: TradeMode.DiaoQi.toString()
-      }
-      queryTable(queryHisTradeOrderDetail, param);
-    };
+
     // 表格通用逻辑
     const param: ComposeOrderTableParam = {
-      queryFn: queryTableAction,
+      queryFn: () => { },
       tableName: 'table_pcweb_spot_trade_bottom_commodity_contract_commission',
       recordList: getRecordItemTab(),
     };
 
+    // 查询数据
+    const search = (value: Moment[]) => {
+      const param = {
+        endDate: moment(value[1]).format("YYYY-MM-DD"),
+        startDate: moment(value[0]).format("YYYY-MM-DD"),
+        tradeMode: TradeMode.DiaoQi.toString()
+      }
+      queryTable(queryHisTradeOrderDetail, param);
+    };
+
     return {
       ...handleComposeOrderTable<WrPerformancePlan>(param),
       loading,
@@ -74,6 +81,7 @@ export default defineComponent({
       expandIcon,
       getBuyOrSellTypeName,
       getOrderStatusName,
+      search
     };
   },
 });

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

@@ -1,8 +1,20 @@
 <template>
-    <!-- 委托记录 - 现货仓单 - 当前记录  -->
-    <section class="topTableHeight_413 topTableHeight">
+    <!-- 委托记录 - 现货仓单 - 历史记录  -->
+    <section class="topTableHeight_448 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)' }"  :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+        <a-table
+            :columns="tableColumns"
+            :class="['srcollYTable', isBottom ? 'secondTabTable' : 'secondTabTableNoBottom', tableList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"
+            :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 407px)' : 'calc(100vh - 201px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            :expandIcon="expandIcon"
+            :expandIconAsCell="false"
+            rowKey="key"
+            :data-source="tableList"
+        >
             <!--  委托状态-->
             <template #wrtradeorderstatus="{ record }">
                 <a>{{ getOrderStatusName(record.wrtradeorderstatus) }}</a>
@@ -25,6 +37,7 @@
 </template>
 
 <script lang="ts">
+import { getShowBottomValue } from '@/common/config/constrolBottom';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { getOrderStatusName, getWrOrderTypeName } from '@/common/constants/enumsName';
 import { defineComponent, queryTableList } from '@/common/export/commonTable';
@@ -33,11 +46,9 @@ 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 Bus from '@/utils/eventBus';
+import { WrOrderDetail } from '@/services/go/wrtrade/interface';
 import { useOrderWarrant } from '@/views/order/setup';
-import { getShowBottomValue } from '@/common/config/constrolBottom';
-import moment, { Moment } from 'moment';
+import { Moment } from 'moment';
 import Filter from '../../components/filter/index.vue';
 
 export default defineComponent({
@@ -50,25 +61,12 @@ export default defineComponent({
 
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
-        // 获取列表数据
-        const queryTableAction = () => {
-            const param: QueryWrOrderDetailReq = {
-                enddate: moment().format('YYYYMMDD'),
-                begindate: moment().subtract(2, 'months').startOf('month').format('YYYYMMDD'),
-                haswr: 1,
-            };
-            queryTable(queryWrOrderDetail, param);
-        };
-
-        Bus.$on('blocsTrade', () => {
-            queryTableAction();
-        });
 
         // 查询数据
         const search = (value: Moment[]) => {
-            const param: QueryWrOrderDetailReq = {
+            const param = {
                 enddate: value[1].format('YYYYMMDD'),
-                begindate: value[0].subtract(2, 'months').startOf('month').format('YYYYMMDD'),
+                begindate: value[0].format('YYYYMMDD'),
                 haswr: 1,
             };
             queryTable(queryWrOrderDetail, param);
@@ -77,7 +75,7 @@ export default defineComponent({
         const { tableColumns, getWrPriceType, isShowBarginBtn, showPriceOrMove } = useOrderWarrant(1);
         // 表格通用逻辑
         const param: ComposeOrderTableParam = {
-            queryFn: queryTableAction,
+            queryFn: () => { },
             recordList: getRecordItemTab(),
             isDetail: true,
         };

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

@@ -1,10 +1,22 @@
 <template>
   <!-- 履约查询 买履约 -->
   <section class="topTableHeight">
-    <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+    <a-table
+      :columns="columns"
+      class="srcollYTable expandLeftTable"
+      :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+      :pagination="false"
+      :loading="loading"
+      :expandedRowKeys="expandedRowKeys"
+      :customRow="Rowclick"
+      :expandIcon="expandIcon"
+      :expandIconAsCell="false"
+      rowKey="key"
+      :data-source="tableList"
+    >
       <!-- 履约类型 -->
       <template #performancetype="{ record }">
-        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+        <a>{{ getPerformanceTypeName(record.performancetype, 1) }}</a>
       </template>
 
       <!-- 付款方式 -->

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

@@ -16,7 +16,7 @@
     >
       <!-- 履约类型 -->
       <template #performancetype="{ record }">
-        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+        <a>{{ getPerformanceTypeName(record.performancetype, 1) }}</a>
       </template>
 
       <!-- 付款方式 -->

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

@@ -1,10 +1,22 @@
 <template>
   <!-- 履约查询 卖履约 -->
   <section class="topTableHeight">
-    <a-table :columns="columns" class="srcollYTable expandLeftTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :expandIcon="expandIcon" :expandIconAsCell="false" rowKey="key" :data-source="tableList">
+    <a-table
+      :columns="columns"
+      class="srcollYTable expandLeftTable"
+      :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+      :pagination="false"
+      :loading="loading"
+      :expandedRowKeys="expandedRowKeys"
+      :customRow="Rowclick"
+      :expandIcon="expandIcon"
+      :expandIconAsCell="false"
+      rowKey="key"
+      :data-source="tableList"
+    >
       <!-- 履约类型 -->
       <template #performancetype="{ record }">
-        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+        <a>{{ getPerformanceTypeName(record.performancetype, 1) }}</a>
       </template>
 
       <!-- 付款方式 -->

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

@@ -16,7 +16,7 @@
     >
       <!-- 履约类型 -->
       <template #performancetype="{ record }">
-        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+        <a>{{ getPerformanceTypeName(record.performancetype, 1) }}</a>
       </template>
 
       <!-- 付款方式 -->