update

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

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

src/views/search/search_document_records/search_spot_warrant/search_spot_warrant_listing_record/index.vue

@@ -1,55 +1,73 @@
 <template>
-  <!-- 单据记录 商品合约-->
+  <!-- 单据记录 现货仓单 挂牌记录 -->
   <div class="topTableHeight">
     <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             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 #wrtradeorderstatus="{ record }">
+        <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+      </template>
+      <!-- 挂牌类型 -->
+      <template #wrtradetype="{ record }">
+        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+      </template>
+      <!-- 挂牌价格 -->
     </a-table>
   </div>
 </template>
 
 <script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
+import { queryWrOrderDetail } from '@/services/go/wrtrade';
+import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { getWrOrderTypeName, getWrTradeOrderStatusName } from '@/common/constants/enumsName';
+import { BtnList as btnType } from '@/common/components/btnList/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { queryTableList, defineComponent, 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';
 
 export default defineComponent({
     name: EnumRouterName.search_spot_warrant_listing_record,
     setup() {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
         // 获取列表数据
         const queryTableAction = () => {
-            const param: QueryOrderQuoteReq = {
-                wrpricetype: 1,
-                haswr: 0,
+            const param: QueryWrOrderDetailReq = {
+                haswr: 1,
             };
-            queryTable(queryOrderQuote, param);
+            queryTable(queryWrOrderDetail, param);
         };
         // 表格通用逻辑
-        const param: ComposeTableParam = {
+        const param: ComposeOrderTableParam = {
             queryFn: queryTableAction,
-            menuType: EnumRouterName.warehouse_pre_sale_price,
-            tableName: 'table_pcweb_spot_trade_warehouse_sale_price',
-            tableFilterKey: [],
-            isDetail: false,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_pending_order',
+            recordList: getRecordItemTab(),
         };
 
         return {
-            ...handleComposeTable<WrOrderQuote>(param),
+            ...handleComposeOrderTable<WrOrderDetail>(param),
             loading,
             tableList,
+            getWrTradeOrderStatusName,
+            getWrOrderTypeName,
+            expandIcon,
         };
     },
 });
 </script>
+
 <style lang="less">
-</style>
+</style>;

src/views/search/search_document_records/search_spot_warrant/search_spot_warrant_transaction_record/index.vue

@@ -1,55 +1,71 @@
 <template>
-  <!-- 单据记录 商品合约-->
+  <!-- 单据记录 现货仓单 成交记录 -->
   <div class="topTableHeight">
     <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             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 #amount="{ record }">
+        <a>{{ record.tradeqty * record.tradeprice }}</a>
+      </template>
+
+      <!-- 挂牌类型 -->
+      <template #wrtradetype="{ record }">
+        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+      </template>
     </a-table>
   </div>
 </template>
 
 <script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+import { queryWrTradeDetail } from '@/services/go/wrtrade';
+import { QueryWrSpecialMatchOrderReq, WrSpecialMatchOrder } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { getWrOrderTypeName } from '@/common/constants/enumsName';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { queryTableList, defineComponent, 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';
 
 export default defineComponent({
     name: EnumRouterName.search_spot_warrant_transaction_record,
     setup() {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
         // 获取列表数据
         const queryTableAction = () => {
-            const param: QueryOrderQuoteReq = {
-                wrpricetype: 1,
-                haswr: 0,
+            const param: QueryWrSpecialMatchOrderReq = {
+                haswr: 1,
             };
-            queryTable(queryOrderQuote, param);
+            queryTable(queryWrTradeDetail, param);
         };
         // 表格通用逻辑
-        const param: ComposeTableParam = {
+        const param: ComposeOrderTableParam = {
             queryFn: queryTableAction,
-            menuType: EnumRouterName.warehouse_pre_sale_price,
-            tableName: 'table_pcweb_spot_trade_warehouse_sale_price',
-            tableFilterKey: [],
-            isDetail: false,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_deal',
+            recordList: getRecordItemTab(),
         };
-
         return {
-            ...handleComposeTable<WrOrderQuote>(param),
+            ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
             loading,
             tableList,
+            expandIcon,
+            getWrOrderTypeName,
         };
     },
 });
 </script>
+
 <style lang="less">
-</style>
+</style>;

src/views/search/search_document_records/search_spot_warrant/search_spot_warrant_warehouse_receipt_details/index.vue

@@ -1,13 +1,15 @@
 <template>
-  <!-- 单据记录 商品合约-->
+  <!-- 单据记录 现货仓单 现货明细 -->
   <div class="topTableHeight">
     <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: '227px' }"
              :pagination="false"
              :loading="loading"
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
              rowKey="key"
              :data-source="tableList">
     </a-table>
@@ -15,41 +17,39 @@
 </template>
 
 <script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { queryTableList, defineComponent, 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 { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam, handleComposeTable } from '@/common/export/commonTable';
+import { queryHoldLB, queryWrOrderDetail, queryWrPosition } from '@/services/go/wrtrade';
+import { QueryHoldLBReq, QueryWrOrderDetailReq, QueryWrPositionReq, WrHoldLB, WrOrderDetail, WrPosition } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { expandIcon } from '@/common/setup/table/clolumn';
 export default defineComponent({
     name: EnumRouterName.search_spot_warrant_warehouse_receipt_details,
     setup() {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        const { loading, tableList, queryTable } = queryTableList<WrHoldLB>();
         // 获取列表数据
         const queryTableAction = () => {
-            const param: QueryOrderQuoteReq = {
-                wrpricetype: 1,
-                haswr: 0,
-            };
-            queryTable(queryOrderQuote, param);
+            queryTable(queryHoldLB);
         };
         // 表格通用逻辑
-        const param: ComposeTableParam = {
+        const param: ComposeOrderTableParam = {
             queryFn: queryTableAction,
-            menuType: EnumRouterName.warehouse_pre_sale_price,
-            tableName: 'table_pcweb_spot_trade_warehouse_sale_price',
-            tableFilterKey: [],
-            isDetail: false,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_spot_detail',
+            recordList: getRecordItemTab(),
         };
-
         return {
-            ...handleComposeTable<WrOrderQuote>(param),
+            ...handleComposeOrderTable<WrHoldLB>(param),
             loading,
             tableList,
+            expandIcon,
         };
     },
 });
 </script>
+
 <style lang="less">
-</style>
+</style>;

src/views/search/search_financing_inquiry/search_financing_inquiry_apply_order/index.vue

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

src/views/search/search_financing_inquiry/search_financing_inquiry_contract/index.vue

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

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

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

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

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

src/views/search/search_pickup_query/search_pickup_query_tab/index.vue

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