Merge remote-tracking branch 'origin/master'

src/router/index.ts

@@ -1132,7 +1132,95 @@ const routes: Array<RouteRecordRaw> = [
                         ]
                     },
                 ]
-            }
+            },
+            {
+                path: '/search_capital_flow',
+                name: EnumRouterName.search_capital_flow,
+                component: Main,
+                meta: {
+                    requireAuth: true,
+                },
+                children: [
+                    {
+                        path: '/search_capital_flow/search_capital_flow_tab',
+                        name: EnumRouterName.search_capital_flow_tab,
+                        component: () => import('@/views/search/search_capital_flow/search_capital_flow_tab/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    }
+                ]
+            },
+            {
+                path: '/search_financing_inquiry',
+                name: EnumRouterName.search_financing_inquiry,
+                component: Main,
+                meta: {
+                    requireAuth: true,
+                },
+                children: [
+                    {
+                        path: '/search_financing_inquiry/search_financing_inquiry_apply_order',
+                        name: EnumRouterName.search_financing_inquiry_apply_order,
+                        component: () => import('@/views/search/search_financing_inquiry/search_financing_inquiry_apply_order/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    },
+                    {
+                        path: '/search_financing_inquiry/search_financing_inquiry_contract',
+                        name: EnumRouterName.search_financing_inquiry_contract,
+                        component: () => import('@/views/search/search_financing_inquiry/search_financing_inquiry_contract/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    }
+                ]
+            },
+            {
+                path: '/search_performance_query',
+                name: EnumRouterName.search_performance_query,
+                component: Main,
+                meta: {
+                    requireAuth: true,
+                },
+                children: [
+                    {
+                        path: '/search_performance_query/search_performance_query_buy_performance',
+                        name: EnumRouterName.search_performance_query_buy_performance,
+                        component: () => import('@/views/search/search_performance_query/search_performance_query_buy_performance/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    },
+                    {
+                        path: '/search_performance_query/search_performance_query_sell_performance',
+                        name: EnumRouterName.search_performance_query_sell_performance,
+                        component: () => import('@/views/search/search_performance_query/search_performance_query_sell_performance/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    }
+                ]
+            },
+            {
+                path: '/search_pickup_query',
+                name: EnumRouterName.search_pickup_query,
+                component: Main,
+                meta: {
+                    requireAuth: true,
+                },
+                children: [
+                    {
+                        path: '/search_pickup_query/search_pickup_query_tab',
+                        name: EnumRouterName.search_pickup_query_tab,
+                        component: () => import('@/views/search/search_pickup_query/search_pickup_query_tab/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    }
+                ]
+            },
         ],
     },
     {

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/index.vue

@@ -18,7 +18,7 @@
                  class="btn-list-sticky"
                  :record="record"
                  @click="openComponent"
-                 v-if="record.enalbeqty > 0" />
+                 v-if="record.creditenableqty > 0" />
       </template>
     </a-table>
     <component :is="componentId"

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

@@ -0,0 +1,74 @@
+<template>
+  <!-- 资金流水 -->
+  <section>
+    <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 #createtime="{ record }">
+        <a>{{ formatTime(record.createtime) }}</a>
+      </template>
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { queryTableList, BtnList, defineComponent } from '@/common/export/commonTable';
+import { WrPerformancePlan } 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 { queryAmountLog } from '@/services/go/TaAccount';
+import { QueryAmountLogReq } from '@/services/go/TaAccount/interface';
+import { getSelectedAccountId } from '@/services/bus/account';
+import { formatTime } from '@/common/methods';
+import Bus from '@/utils/eventBus/index';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_capital_flow_tab,
+    components: {
+        BtnList,
+    },
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryAmountLogReq = {
+                accountID: getSelectedAccountId().toString(),
+            };
+
+            queryTable(queryAmountLog, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_funding_info_log',
+            recordList: getRecordItemTab(),
+        };
+        // 资金变化，重新加载数据
+        Bus.$on('moneyChangedNtf_UI', () => {
+            queryTableAction();
+        });
+        return {
+            ...handleComposeOrderTable<WrPerformancePlan>(param),
+            loading,
+            tableList,
+            formatTime,
+            expandIcon,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_commission_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: '227px' }"
              :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_pre_sale_warehouse_receipt_commission_record,
     setup() {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        const { loading, tableList, queryTable } = queryTableList<WrOrderDetail>();
         // 获取列表数据
         const queryTableAction = () => {
-            const param: QueryOrderQuoteReq = {
-                wrpricetype: 1,
+            const param: QueryWrOrderDetailReq = {
                 haswr: 0,
             };
-            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_pre_sale_pending_order',
+            recordList: getRecordItemTab(),
         };
-
         return {
-            ...handleComposeTable<WrOrderQuote>(param),
+            ...handleComposeOrderTable<WrOrderDetail>(param),
             loading,
             tableList,
+            expandIcon,
+            getWrTradeOrderStatusName,
+            getWrOrderTypeName,
         };
     },
 });
 </script>
+
 <style lang="less">
-</style>
+</style>;

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_order_summary/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,43 @@
 </template>
 
 <script lang="ts">
+import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
+import { queryWrPosition } from '@/services/go/wrtrade';
+import { QueryWrPositionReq, 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';
 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_pre_sale_warehouse_receipt_order_summary,
     setup() {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        const { loading, tableList, queryTable } = queryTableList<WrPosition>();
         // 获取列表数据
         const queryTableAction = () => {
-            const param: QueryOrderQuoteReq = {
-                wrpricetype: 1,
+            const param: QueryWrPositionReq = {
                 haswr: 0,
+                querytype: 2,
             };
-            queryTable(queryOrderQuote, param);
+            queryTable(queryWrPosition, 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_pre_sale_order_summary',
+            recordList: getRecordItemTab(),
         };
-
         return {
-            ...handleComposeTable<WrOrderQuote>(param),
+            ...handleComposeOrderTable<WrPosition>(param),
             loading,
             tableList,
+            expandIcon,
         };
     },
 });
 </script>
+
 <style lang="less">
-</style>
+</style>;

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_transaction_record/index.vue

@@ -1,55 +1,60 @@
 <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>
   </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 { 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_pre_sale_warehouse_receipt_transaction_record,
     setup() {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        const { loading, tableList, queryTable } = queryTableList<WrSpecialMatchOrder>();
         // 获取列表数据
         const queryTableAction = () => {
-            const param: QueryOrderQuoteReq = {
-                wrpricetype: 1,
+            const param: QueryWrSpecialMatchOrderReq = {
                 haswr: 0,
             };
-            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_pre_sale_make_deal',
+            recordList: getRecordItemTab(),
         };
-
         return {
-            ...handleComposeTable<WrOrderQuote>(param),
+            ...handleComposeOrderTable<WrSpecialMatchOrder>(param),
             loading,
             tableList,
+            expandIcon,
         };
     },
 });
 </script>
+
 <style lang="less">
-</style>
+</style>;

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

@@ -0,0 +1,85 @@
+<template>
+  <!-- 融资查询 申请单 -->
+  <section>
+    <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 #financetype="{ record }">
+        <a>{{ getFinanceTypeName(record.financetype) }}</a>
+      </template>
+
+      <!-- 状态 -->
+      <template #applystatus="{ text }">
+        <a>{{ getApplyStatusFinanceName(text) }}</a>
+      </template>
+
+      <template #createtime="{ record }">
+        <a>{{ formatTime(record.createtime) }}</a>
+      </template>
+
+      <!-- 结算方式 1:按日结息 3:按月结息-->
+      <template #interestsettlemode="{ record }">
+        <a>{{ getInterestSettleModeName(record.interestsettlemode) }}</a>
+      </template>
+      <!-- 费用 -->
+      <template #interestsettlevalue="{ record }">
+        <a>{{ getInterestrateModeName(record.interestratemode, record.interestrate) }}</a>
+      </template>
+
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { queryTableList, defineComponent } from '@/common/export/commonTable';
+import { queryWrFinanceBuyApply } from '@/services/go/wrtrade';
+import { WrFinanceBuyApply } 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 { formatTime } from '@/common/methods';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { getApplyStatusFinanceName, getFinanceTypeName, getInterestrateModeName, getInterestSettleModeName } from '@/common/constants/enumsName';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_financing_inquiry_apply_order,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrFinanceBuyApply>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            queryTable(queryWrFinanceBuyApply);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_financing_manage_bottom_apply_order',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrFinanceBuyApply>(param),
+            loading,
+            tableList,
+            formatTime,
+            expandIcon,
+            getFinanceTypeName,
+            getApplyStatusFinanceName,
+            getInterestrateModeName,
+            getInterestSettleModeName,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -0,0 +1,77 @@
+<template>
+  <!-- 融资查询 合同 -->
+  <section>
+    <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 #financetype="{ record }">
+        <a>{{ getFinanceTypeName(record.financetype) }}</a>
+      </template>
+
+      <!-- 状态 -->
+      <template #scfcontractstatus="{ text }">
+        <a>{{ getContractName(text) }}</a>
+      </template>
+      <template #createtime="{ record }">
+        <a>{{ formatTime(record.createtime) }}</a>
+      </template>
+      <template #scfcontracttype="{ record }">
+        <a>{{ getScfContractTypeName(record.scfcontracttype) }}</a>
+      </template>
+
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { queryTableList, defineComponent } from '@/common/export/commonTable';
+import { queryWrScfContract } from '@/services/go/wrtrade';
+import { WrScfContract } 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 { formatTime } from '@/common/methods';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { getContractName, getFinanceTypeName, getScfContractTypeName } from '@/common/constants/enumsName';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_financing_inquiry_contract,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrScfContract>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            queryTable(queryWrScfContract);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_financing_manage_bottom_contract',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrScfContract>(param),
+            loading,
+            tableList,
+            formatTime,
+            expandIcon,
+            getContractName,
+            getFinanceTypeName,
+            getScfContractTypeName,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -0,0 +1,85 @@
+<template>
+  <!-- 履约查询 买履约 -->
+  <section>
+    <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>
+      </template>
+
+      <!-- 付款方式 -->
+      <template #paymenttype="{ record }">
+        <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+      </template>
+
+      <!-- 履约状态 -->
+      <template #performancestatus="{ record }">
+        <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+      </template>
+
+      <!-- 当前步骤 -->
+      <template #curstepname="{ record }">
+        <a>{{ record.curstepname }}</a>
+      </template>
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { queryTableList, defineComponent, ModalEnum } from '@/common/export/commonTable';
+import { QueryPerformancePlan } from '@/services/go/wrtrade';
+import { QueryPerformancePlanReq, WrPerformancePlan } 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 { BtnList as BtnListType } from '@/common/components/btnList/interface';
+import { BuyOrSell } from '@/common/constants/enumCommon';
+import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+export default defineComponent({
+    name: EnumRouterName.search_performance_query_buy_performance,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryPerformancePlanReq = {
+                buyorsell: 0,
+            };
+            queryTable(QueryPerformancePlan, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_performance_info_buy',
+            recordList: getRecordItemTab(),
+        };
+
+        return {
+            ...handleComposeOrderTable<WrPerformancePlan>(param),
+            loading,
+            tableList,
+            getPerformanceTypeName,
+            getPerformanceStatusName,
+            getPaymentTypeName,
+            expandIcon,
+            BuyOrSell,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;
+

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

@@ -0,0 +1,83 @@
+<template>
+  <!-- 履约查询 卖履约 -->
+  <section>
+    <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>
+      </template>
+
+      <!-- 付款方式 -->
+      <template #paymenttype="{ record }">
+        <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+      </template>
+
+      <!-- 履约状态 -->
+      <template #performancestatus="{ record }">
+        <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+      </template>
+
+      <!-- 当前步骤 -->
+      <template #curstepname="{ record }">
+        <a>{{ record.curstepname }}</a>
+      </template>
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { queryTableList, defineComponent } from '@/common/export/commonTable';
+import { QueryPerformancePlan } from '@/services/go/wrtrade';
+import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import { BuyOrSell } from '@/common/constants/enumCommon';
+import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_performance_query_sell_performance,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryPerformancePlanReq = {
+                buyorsell: 1,
+            };
+            queryTable(QueryPerformancePlan, param);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_performance_info_sale',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrPerformancePlan>(param),
+            loading,
+            tableList,
+            getPerformanceTypeName,
+            getPaymentTypeName,
+            getPerformanceStatusName,
+            expandIcon,
+            BuyOrSell,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -0,0 +1,68 @@
+<template>
+  <!-- 提货查询 -->
+  <section>
+    <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">
+      <!-- applytype 类型-->
+      <template #applytype="{ record }">
+        <span>{{ getPickUpStatusName(record.applytype) }}</span>
+      </template>
+
+      <!-- applystatus 状态 -->
+      <template #applystatus="{ record }">
+        <span>{{ getPickUpTypeName(record.applystatus) }}</span>
+      </template>
+
+    </a-table>
+  </section>
+</template>
+
+<script lang="ts">
+import { queryTableList, defineComponent } from '@/common/export/commonTable';
+import { queryWrOutInApply } from '@/services/go/wrtrade';
+import { WrOutInApply } 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 { getPickUpStatusName, getPickUpTypeName } from '@/common/constants/enumsName';
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+
+export default defineComponent({
+    name: EnumRouterName.search_pickup_query_tab,
+    setup() {
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOutInApply>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            queryTable(queryWrOutInApply);
+        };
+        // 表格通用逻辑
+        const param: ComposeOrderTableParam = {
+            queryFn: queryTableAction,
+            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_pick_up',
+            recordList: getRecordItemTab(),
+        };
+        return {
+            ...handleComposeOrderTable<WrOutInApply>(param),
+            loading,
+            tableList,
+            expandIcon,
+            getPickUpStatusName,
+            getPickUpTypeName,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;