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

src/views/market/spot_trade/components/buy-sell-market/components/delisting/index.vue

@@ -75,17 +75,17 @@ export default defineComponent({
                 ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), // string 客户端委托时间
                 ClientType: 4, // uint32 终端类型
                 OperatorID: getUserId(), // uint64 操作员账号ID
-                BuyOrSell: 1, // uint32 买卖方向
+                BuyOrSell: 0, // uint32 买卖方向
                 ApplyID: 0, // uint64 申请ID
                 LadingBillId: 0, // uint64 提单id(wrholdlb的LadingBillId字段),卖的时候填写
                 SubNum: 0, // uint64 提单子单号(wrholdlb的SubNum字段),卖的时候填写
-                WRFactorTypeId: 0, // uint64 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写
+                WRFactorTypeId: props.parantSelectedRow.wrfactortypeid, // uint64 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写
                 TradeDate: moment().format('YYYYMMDD'), // string 交易日
                 DeliveryMonth: '', // string 交收月
                 HasWr: 1, // uint32 是否有仓单-0:没有仓单 1:有仓单
             };
             // console.log(param);
-            requestResultLoadingAndInfo(HdWRDealOrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
+            requestResultLoadingAndInfo(HdWRDealOrder, param, loading, ['摘牌成功', '摘牌失败:']).then(() => {
                 cancel(true);
             });
         }

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

@@ -160,7 +160,7 @@ export default defineComponent({
 
         console.log(props.selectedRow);
         requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
-            // cancel(true);
+
         });
         return {
             visible: true,

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/index.vue

@@ -157,6 +157,7 @@ import { getMarketRunByTradeMode } from '@/services/bus/market';
 import { message } from 'ant-design-vue';
 import { getGoodsGroupsByTradeMode } from '@/services/bus/goods';
 import { TradeMode } from '@/common/constants/enumCommon';
+import {WRGoodsInfo} from "@/services/proto/warehousetrade/interface";
 
 export default defineComponent({
     name: ModalEnum.spot_warrant_spot_details_listed,
@@ -179,6 +180,15 @@ export default defineComponent({
             const marketInfo = getMarketRunByTradeMode(17);
             if (marketInfo) {
                 validateAction<ListingForm>(formRef, formState).then((res) => {
+
+                    const wrGoodsInfo: WRGoodsInfo = {
+                        GoodsID: res.goodsid as number, // uint32 配置商品ID
+                        GoodsCode: "", // string 配置商品代码
+                        PriceFactor: 1, // double 商品价格系数
+                        PriceMove: 0, // double 商品升贴水值
+                        WeightRatio: 1, // double 商品重量系数
+                    }
+
                     const param = {
                         AccountID: data.accountid.toString(), // 默认内部资金账号第一个
                         ClientSerialNo: uuidv4(), // 客户端流水号
@@ -198,7 +208,7 @@ export default defineComponent({
                         DeliveryGoodsID: data.deliverygoodsid, // 交割商品商品ID
                         WRPriceType: res.WRPriceType, // 价格方式 1：固定价 2：浮动价
                         FixedPrice: res.FixedPrice, // 固定价格
-                        PriceFactor: 0, // 价格系数(浮动价时填写)
+                        PriceFactor: 1, // 价格系数(浮动价时填写)
                         PriceMove: res.PriceMove, // 升贴水(浮动价时填写)
                         TimevalidType: 4, // 时间有效类型 1：当日有效 2：本周有效 3：指定时间有效 4：一直有效
                         // ValidTime: moment('2021-08-25 00:00:00').format('YYYY-MM-DD HH:mm:ss'), // 有效期限
@@ -215,12 +225,14 @@ export default defineComponent({
                         Remark: '222', // 备注
                         ApplyID: 0, // 申请ID
                         CanPart: 1, // 是否允许部份摘牌0:不允许;1:允许
-                        WRTradeGoods: [],
+                        WRTradeGoods: [
+                            wrGoodsInfo
+                        ],
                         wrstandardid: props.selectedRow.wrstandardid,
                         HasWr: 1,
                     };
                     console.log(param);
-                    requestResultLoadingAndInfo(hdWROrder, param, loading, ['摘牌成功', '摘牌失败:']).then(() => {
+                    requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
                         cancel();
                     });
                 });