update

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>;