Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/router/index.ts

@@ -1332,6 +1332,14 @@ const routes: Array<RouteRecordRaw> = [
                                     requireAuth: true,
                                 },
                             },
+                            {
+                                path: '/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs',
+                                name: 'warehouse_receipt_trade_blocs',
+                                component: () => import('@/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/index.vue'),
+                                meta: {
+                                    requireAuth: true,
+                                },
+                            },
                         ]
                     },
                     {

src/services/go/wrtrade/index.ts

@@ -9,6 +9,8 @@ import {
     QueryFilterItemReq,
     QueryHoldLBReq,
     QueryOrderQuoteDetailReq,
+    QueryOrderQuoteMyqQsp,
+    QueryOrderQuoteMyqQsq,
     QueryOrderQuoteReq,
     QueryPerformancePlanReq,
     QueryWrBuybackDetailReq,
@@ -332,4 +334,18 @@ export function queryWrDeliveryAvalidHoldLB(param: QueryWrDeliveryAvalidHoldLBRe
     return commonSearch_go('/WrTrade2/QueryWrDeliveryAvalidHoldLB', param).catch((err) => {
         throw new Error(`查询合约交收可点选仓单: ${err}`);
     });
-}
+}
+
+/**
+ * /WrTrade2/QueryOrderQuoteMyq 查询贸易圈挂牌大厅
+ * @param QueryOrderQuoteMyq
+ */
+export function queryQueryOrderQuoteMyq(param: QueryOrderQuoteMyqQsq): Promise<QueryOrderQuoteMyqQsp[]> {
+    if (!param.userid) {
+        param.userid = getUsrId()
+    }
+    return commonSearch_go('/WrTrade2/QueryOrderQuoteMyq', param).catch((err) => {
+        throw new Error(`查询贸易圈挂牌大厅: ${err}`);
+    });
+}
+

src/services/go/wrtrade/interface.ts

@@ -1009,4 +1009,56 @@ export interface WrAverageTradePriceQsq {
 export interface WrAverageTradePriceQsp {
     averageprice: number; 	//  成交均价
     tradedate: string; // 交易日yyyymm
+}
+
+export interface QueryOrderQuoteMyqQsp {
+    buyorsell: number;//买卖 - number;
+    //:买 1:卖
+    canbargain: number;//是否可议价 - number;
+    //:不可 1:可
+    canpart: number;//是否允许部份摘牌 - number;
+    //:不允许 1:允许
+    delistminqty: number;//起摘数量
+    deliverygoodscode: string;//品种代码
+    deliverygoodsid: number;//品种ID
+    deliverygoodsname: string;//品种名称
+    deliverymonth: string;//交收月
+    enumdicname: string;//单位名称
+    fixedprice: number;//买(卖)价
+    goodscode: string;//商品合约代码
+    marginflag: number;//挂牌是否指定保证金 - number;
+    //:未指定 1:指定
+    marginvalue: number;//保证金设置值
+    minivalue: number;//现货商品最小变动值
+    orderqty: number;//买(卖)量(=委托量-成交量)
+    ordertime: string;//委托时间
+    performancetemplateid: number;//履约模板id
+    pricemove: number;//买(卖)升贴水- 基差
+    templatename: string;//履约模板名称
+    userid: number;//购买方(销售方)用户ID
+    username: string;//购买方(销售方)
+    validtime: string;//有效期限
+    validtype: number;//有效类型 - 1当日有效 2本周有效 3指定日期有效 4一直有效
+    warehousename: string;//仓库名称
+    wrfactortypeid: string;//仓单要素id
+    wrstandardcode: string;//现货商品代码
+    wrstandardid: number;//现货商品ID
+    wrstandardname: string;//商品名称
+    wrtradeorderid: string;//仓单贸易委托单ID(32number;
+    //+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    wrtypename: string;//商品
+}
+
+export interface QueryOrderQuoteMyqQsq {
+    page?: number; // 页码
+    pagesize?: number; // 每页条数
+    userid?: number; // 用户id
+    marketid?: number; // 仓单贸易市场id
+    haswr: 0 | 1; // 0:仓单预售 1:仓单贸易
+    buyorsell: 0 | 1; // 买卖方向 0-买 1-卖
+    deliverygoodsid?: number; // 品种id
+    wrstandardid?: number; // 品类id
+    deliverymonth?: number; // 交收月(yyyy-mm) 仓单预售填写
+    dgitemname?: number; // 商品要素项名称模糊匹配, 逗号隔开, 如 产地1,品牌1,规格12mm
 }

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

@@ -0,0 +1,120 @@
+<template>
+  <!-- 仓单贸易 贸易圈挂牌-->
+  <div class="topTableHeight">
+    <Filter :enumName="name"
+            @search="search"
+            @buy="buyOpen" />
+    <a-table :columns="columns"
+             :class="['srcollYTable', isBottom ? 'condSecondTabTable' : 'condSecondTabTableNoBottom']"
+             :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 443px)' : 'calc(100vh - 196px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList"></a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu"
+                 @cancel="closeContext"
+                 :list="firstBtn"></contextMenu>
+    <component :is="componentId"
+               v-if="componentId"
+               :enumName="name"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </div>
+</template>
+
+<script lang="ts">
+import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, 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 Bus from '@/utils/eventBus/index';
+import Filter from '../../components/filter/index.vue';
+import { getShowBottomValue } from '@/common/config/constrolBottom';
+
+export default defineComponent({
+    name: 'warehouse_receipt_trade_blocs',
+    components: {
+        contextMenu,
+        Filter,
+        // [ModalEnum.spot_trade_warehouse_detail]: defineAsyncComponent(() => import('../../components/detail/index.vue')),
+        // [ModalEnum.spot_trade_warehouse_post_buying]: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
+        // buyAndSell: defineAsyncComponent(() => import('../../components/buy-sell-market/index.vue')),
+        // postBuying: defineAsyncComponent(() => import('../../components/post_buying/index.vue')),
+    },
+    setup() {
+        const isBottom = getShowBottomValue();
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
+        // 获取列表数据
+        const queryTableAction = () => {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 1,
+                haswr: 1,
+            };
+            queryTable(queryOrderQuote, param);
+        };
+        Bus.$on('spotTrade', queryTableAction);
+        // 表格通用逻辑
+        const param: ComposeTableParam = {
+            queryFn: queryTableAction,
+            menuType: EnumRouterName.warehouse_receipt_trade_price,
+            tableName: 'table_pcweb_spot_trade_warehouse_price',
+            tableFilterKey: [],
+            isDetail: false,
+        };
+        const {
+            contextMenu,
+            openContext,
+            closeContext, // 右键
+            columns,
+            registerColumn,
+            updateColumn, // 表头
+            expandedRowKeys,
+            selectedRow,
+            Rowclick, // 表格折腾面板数据与单击、双击事件
+            componentId,
+            closeComponent, // 控制异步组件
+            firstBtn, // 表格按钮
+        } = handleComposeTable<WrOrderQuote>(param);
+        function search(value: Object) {
+            const param: QueryOrderQuoteReq = {
+                wrpricetype: 1,
+                haswr: 1,
+            };
+            Object.assign(param, value);
+            queryTable(queryOrderQuote, param);
+        }
+        function buyOpen(value: any, goods: any) {
+            componentId.value = 'postBuying';
+            selectedRow.value = value;
+        }
+
+        return {
+            isBottom,
+            contextMenu,
+            openContext,
+            closeContext, // 右键
+            columns,
+            registerColumn,
+            updateColumn, // 表头
+            expandedRowKeys,
+            selectedRow,
+            Rowclick, // 表格折腾面板数据与单击、双击事件
+            componentId,
+            closeComponent, // 控制异步组件
+            firstBtn, // 表格按钮
+            name: EnumRouterName.warehouse_receipt_trade_price,
+            loading,
+            tableList,
+            search,
+            buyOpen,
+        };
+    },
+});
+</script>
+<style lang="less">
+</style>

swagger-to-ts/swagger.ts

@@ -1,9 +1,38 @@
 export interface Name{
-    buyorsell	:number;//买卖方向 number;
-//-买 1-卖
-goodsid	:number;//商品id
-orderid	:string;//委托单号
-orderprice	:number;//委托价格
-userid	:number;//用户id
-username	:string;//用户名称(已脱敏)
+    buyorsell	:number;//买卖 - number;
+//:买 1:卖
+canbargain	:number;//是否可议价 - number;
+//:不可 1:可
+canpart	:number;//是否允许部份摘牌 - number;
+//:不允许 1:允许
+delistminqty	:number;//起摘数量
+deliverygoodscode	:string;//品种代码
+deliverygoodsid	:number;//品种ID
+deliverygoodsname	:string;//品种名称
+deliverymonth	:string;//交收月
+enumdicname	:string;//单位名称
+fixedprice	:number;//买(卖)价
+goodscode	:string;//商品合约代码
+marginflag	:number;//挂牌是否指定保证金 - number;
+//:未指定 1:指定
+marginvalue	:number;//保证金设置值
+minivalue	:number;//现货商品最小变动值
+orderqty	:number;//买(卖)量(=委托量-成交量)
+ordertime	:string;//委托时间
+performancetemplateid	:number;//履约模板id
+pricemove	:number;//买(卖)升贴水- 基差
+templatename	:string;//履约模板名称
+userid	:number;//购买方(销售方)用户ID
+username	:string;//购买方(销售方)
+validtime	:string;//有效期限
+validtype	:number;//有效类型 - 1当日有效 2本周有效 3指定日期有效 4一直有效
+warehousename	:string;//仓库名称
+wrfactortypeid	:string;//仓单要素id
+wrstandardcode	:string;//现货商品代码
+wrstandardid	:number;//现货商品ID
+wrstandardname	:string;//商品名称
+wrtradeorderid	:string;//仓单贸易委托单ID(32number;
+//+Unix秒时间戳(1number;
+//位)+xxxxxx)
+wrtypename	:string;//商品
 }

swagger-to-ts/swagger.txt

@@ -1,19 +1,91 @@
 {
     buyorsell	integer
-买卖方向 0-买 1-卖
+买卖 - 0:买 1:卖
 
-goodsid	integer
-商品id
+canbargain	integer
+是否可议价 - 0:不可 1:可
 
-orderid	string
-委托单号
+canpart	integer
+是否允许部份摘牌 - 0:不允许 1:允许
 
-orderprice	number
-委托价格
+delistminqty	number
+起摘数量
+
+deliverygoodscode	string
+品种代码
+
+deliverygoodsid	integer
+品种ID
+
+deliverygoodsname	string
+品种名称
+
+deliverymonth	string
+交收月
+
+enumdicname	string
+单位名称
+
+fixedprice	number
+买(卖)价
+
+goodscode	string
+商品合约代码
+
+marginflag	integer
+挂牌是否指定保证金 - 0:未指定 1:指定
+
+marginvalue	number
+保证金设置值
+
+minivalue	integer
+现货商品最小变动值
+
+orderqty	number
+买(卖)量(=委托量-成交量)
+
+ordertime	string
+委托时间
+
+performancetemplateid	integer
+履约模板id
+
+pricemove	number
+买(卖)升贴水- 基差
+
+templatename	string
+履约模板名称
 
 userid	integer
-用户id
+购买方(销售方)用户ID
 
 username	string
-用户名称(已脱敏)
+购买方(销售方)
+
+validtime	string
+有效期限
+
+validtype	integer
+有效类型 - 1当日有效 2本周有效 3指定日期有效 4一直有效
+
+warehousename	string
+仓库名称
+
+wrfactortypeid	string
+仓单要素id
+
+wrstandardcode	string
+现货商品代码
+
+wrstandardid	integer
+现货商品ID
+
+wrstandardname	string
+商品名称
+
+wrtradeorderid	string
+仓单贸易委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
+
+wrtypename	string
+商品
 }