update

src/assets/styles/mixin.less

@@ -336,6 +336,7 @@
 .srcollYTable {
     .ant-table {
         width: 100%;
+        background-color: transparent;
 
         table {
             border: 0;
@@ -2273,7 +2274,7 @@ textarea:-webkit-autofill,
 select:-webkit-autofill,
 .dialogInput:-webkit-autofill {
     box-shadow: inset 0 0 0 1000px @m-grey21;
-    -webkit-text-fill-color: @m-white1;
+    -webkit-text-fill-color: #000;
 }
 
 .dialogSpan {
@@ -2747,10 +2748,6 @@ input:-internal-autofill-selected {
 
             .ant-table-content {
                 height: 100%;
-
-                .ant-table-scroll {
-                    height: 100%;
-                }
             }
 
             .ant-table-placeholder {

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

@@ -1,42 +1,37 @@
 <template>
-  <div class="filterTable">
-    <div class="filter-custom-table">
-      <a-range-picker class="commonDatePicker" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" :placeholder="['开始时间', '结束时间']" @change="onChange" @ok="onOk" />
-      <FilterOption :selectList="selectList" :inputList="inputList" :fixedBtnList="fixedBtnList">
-      </FilterOption>
+    <div class="filterTable">
+        <div class="filter-custom-table">
+            <a-range-picker class="commonDatePicker" format="YYYY-MM-DD" :placeholder="['开始时间', '结束时间']" @change="onChange" />
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue'
-import FilterOption from '@/common/components/filter/index.vue';
-import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
+import { defineComponent } from 'vue';
 import { Moment } from 'moment';
 
 export default defineComponent({
-  components: {
-    FilterOption,
-  },
-  setup(props, context) {
-    const select: SelectList[] = [];
+    emits: ['search'],
+    setup(props, context) {
+        const onChange = (value: Moment[]) => {
+            context.emit('search', value);
+        };
 
-    const input: InputList[] = [];
+        return {
+            onChange,
+        };
+    },
+});
+</script>
 
-    const onChange = (value: Moment[], dateString: string[]) => {
-      console.log('Selected Time: ', value);
-      console.log('Formatted Selected Time: ', dateString);
-    };
-
-    const onOk = (value: Moment[]) => {
-      console.log('onOk: ', value);
-    };
-
-    return {
-      ...handleFilter(select, input, context),
-      onChange,
-      onOk,
-    };
-  }
-})
-</script>
+<style lang="less">
+.filterTable {
+    .filter-custom-table {
+        padding: 4px;
+        .commonDatePicker .ant-calendar-picker-input {
+            height: 26px;
+            line-height: 26px;
+        }
+    }
+}
+</style>

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

@@ -1,27 +1,27 @@
 <template>
-  <!-- 委托记录 - 现货仓单 - 当前记录  -->
-  <section class="topTableHeight_413 topTableHeight">
-    <Filter />
-    <a-table :columns="tableColumns" class="srcollYTable" :scroll="{ x: '100%', y: '190px' }" :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>
-      </template>
-      <!-- 挂牌类型 -->
-      <template #wrtradetype="{ record }">
-        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-      </template>
-      <!-- 挂牌方式 -->
-      <template #wrpricetype="{ record }">
-        <span>{{ getWrPriceType(record) }}</span>
-      </template>
-      <!-- 价格/基差 -->
-      <template #futushow="{ record }">
-        <span>{{ showPriceOrMove(record) }}</span>
-      </template>
-      <!-- 挂牌价格 -->
-    </a-table>
-  </section>
+    <!-- 委托记录 - 现货仓单 - 当前记录  -->
+    <section class="topTableHeight_413 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">
+            <!--  委托状态-->
+            <template #wrtradeorderstatus="{ record }">
+                <a>{{ getOrderStatusName(record.wrtradeorderstatus) }}</a>
+            </template>
+            <!-- 挂牌类型 -->
+            <template #wrtradetype="{ record }">
+                <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+            </template>
+            <!-- 挂牌方式 -->
+            <template #wrpricetype="{ record }">
+                <span>{{ getWrPriceType(record) }}</span>
+            </template>
+            <!-- 价格/基差 -->
+            <template #futushow="{ record }">
+                <span>{{ showPriceOrMove(record) }}</span>
+            </template>
+            <!-- 挂牌价格 -->
+        </a-table>
+    </section>
 </template>
 
 <script lang="ts">
@@ -36,49 +36,65 @@ import { queryWrOrderDetail } from '@/services/go/wrtrade';
 import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
 import Bus from '@/utils/eventBus';
 import { useOrderWarrant } from '@/views/order/setup';
-import moment from 'moment';
+import { getShowBottomValue } from '@/common/config/constrolBottom';
+import moment, { Moment } from 'moment';
 import Filter from '../../components/filter/index.vue';
 
 export default defineComponent({
-  name: enumOrderComponents.spot_warrant_pending_order,
-  components: {
-    Filter,
-  },
-  setup() {
-    // 表格列表数据
-    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();
-    });
+    name: enumOrderComponents.spot_warrant_pending_order,
+    components: {
+        Filter,
+    },
+    setup() {
+        const isBottom = getShowBottomValue();
 
-    const { tableColumns, getWrPriceType, isShowBarginBtn, showPriceOrMove } = useOrderWarrant(1);
-    // 表格通用逻辑
-    const param: ComposeOrderTableParam = {
-      queryFn: queryTableAction,
-      recordList: getRecordItemTab(),
-      isDetail: true,
-    };
-    return {
-      ...handleComposeOrderTable<WrOrderDetail>(param),
-      loading,
-      tableList,
-      getOrderStatusName,
-      getWrOrderTypeName,
-      expandIcon,
-      tableColumns,
-      getWrPriceType,
-      showPriceOrMove,
-    };
-  },
+        // 表格列表数据
+        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 = {
+                enddate: value[1].format('YYYYMMDD'),
+                begindate: value[0].subtract(2, 'months').startOf('month').format('YYYYMMDD'),
+                haswr: 1,
+            };
+            queryTable(queryWrOrderDetail, param);
+        };
+
+        const { tableColumns, getWrPriceType, isShowBarginBtn, showPriceOrMove } = useOrderWarrant(1);
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            recordList: getRecordItemTab(),
+            isDetail: true,
+        };
+        return {
+            ...handleComposeOrderTable<WrOrderDetail>(param),
+            isBottom,
+            loading,
+            tableList,
+            getOrderStatusName,
+            getWrOrderTypeName,
+            expandIcon,
+            tableColumns,
+            getWrPriceType,
+            showPriceOrMove,
+            search,
+        };
+    },
 });
 </script>