Merge remote-tracking branch 'origin/master'

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_price/index.vue

@@ -25,7 +25,6 @@
 <script lang="ts">
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam } from '@/common/export/commonTable';
-import { queryAgreementConfig } from '@/services/go/ermcp/qhj';
 import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
 import { queryOrderQuote } from '@/services/go/wrtrade';
 import { handleComposeTable } from '@/views/market/spot_trade/setup';
@@ -44,17 +43,16 @@ export default defineComponent({
         // 获取列表数据
         const queryTableAction = () => {
             const param: QueryOrderQuoteReq = {
-                wrpricetype: 2,
+                wrpricetype: 1,
                 haswr: 1,
             };
-            // queryTable(queryOrderQuote, param);
-            queryTable(queryAgreementConfig);
+            queryTable(queryOrderQuote, param);
         };
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
             menuType: EnumRouterName.warehouse_receipt_trade_price,
-            tableName: 'table_pcweb_agreement',
+            tableName: 'table_pcweb_spot_trade_warehouse_price',
             tableFilterKey: [],
             isDetail: false,
         };