commit 提交代买

src/services/go/wrtrade/interface.ts

@@ -131,6 +131,7 @@ export interface WrOrderDetail {
 export interface QueryWrPositionReq {
     userid?: number //       用户id
     querytype: 1 | 2 //    查询类型 1-现货汇总 2-库存汇总(订单汇总)
+    haswr: number //        0:仓单预售 1:仓单贸易
 }
 
 /**

src/views/market/spot_trade/components/post_buying/index.vue

@@ -159,7 +159,7 @@ export default defineComponent({
                         // MatchUserIDs: 0, // 仓单贸易对手资金账号ID集合(指定对手时填写) uint32
                         OrderQty: res.OrderQty, // 委托数量(可挂部分数据量) ======
                         DeliveryGoodsID: props.selectedRow.deliverygoodsid, // 交割商品商品ID  // 有仓单求购
-                        WRPriceType: 1, // 价格方式 1：固定价 2：浮动价
+                        WRPriceType: isFixed() ? 1 : 2, // 价格方式 1：固定价 2：浮动价
                         FixedPrice: res.FixedPrice, // 固定价格
                         PriceFactor: 1, // 价格系数(浮动价时填写)
                         PriceMove: res.PriceMove, // 升贴水(浮动价时填写)

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

@@ -44,6 +44,7 @@ export default defineComponent({
         // 获取列表数据
         const queryTableAction = () => {
             const param: QueryWrPositionReq = {
+                haswr: 0,
                 querytype: 2,
             };
             queryTable(queryWrPosition, param);

src/views/order/spot_warran/components/spot_warrant_inventory_summary/index.vue

@@ -45,6 +45,7 @@ export default defineComponent({
         // 获取列表数据
         const queryTableAction = () => {
             const param: QueryWrPositionReq = {
+                haswr: 1,
                 querytype: 2,
             };
             queryTable(queryWrPosition, param);

src/views/order/spot_warran/components/spot_warrant_spot_summary/index.vue

@@ -43,6 +43,7 @@ export default defineComponent({
         // 获取列表数据
         const queryTableAction = () => {
             const param: QueryWrPositionReq = {
+                haswr: 1,
                 querytype: 1,
             };
             queryTable(queryWrPosition, param);