update

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

@@ -29,7 +29,8 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :span="12">
+            <a-col :span="12"
+                   v-if="formState.WRPriceType === 1">
               <a-form-item label="挂牌价"
                            name="FixedPrice">
                 <a-input class="commonInput"
@@ -37,6 +38,15 @@
                          style="width: 140px" />
               </a-form-item>
             </a-col>
+            <a-col :span="12"
+                   v-if="formState.WRPriceType === 2">
+              <a-form-item label="升贴水"
+                           name="PriceMove">
+                <a-input class="commonInput"
+                         v-model:value="formState.PriceMove"
+                         style="width: 140px" />
+              </a-form-item>
+            </a-col>
           </a-row>
           <a-row :gutter="24">
             <a-col :span="12">
@@ -46,7 +56,6 @@
                          :suffix="selectedRow.enumdicname"
                          v-model:value="formState.OrderQty"
                          style="width: 140px" />
-
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -76,7 +85,8 @@
             </a-col>
             <a-col :span="12">&nbsp;</a-col>
           </a-row>
-          <a-row :gutter="24">
+          <a-row :gutter="24"
+                 v-if="formState.WRPriceType === 2">
             <a-col :span="24">
               <a-form-item label="行情商品">
                 <a-select class="inlineFormSelect"
@@ -141,57 +151,57 @@ export default defineComponent({
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
         console.log('selectedRow', props.selectedRow);
-        const { rules, formState, formRef } = handlePasswordForm();
+        const { rules, formState, formRef } = handlePasswordForm(props.selectedRow);
         const data = props.selectedRow;
         const loading = ref<boolean>(false);
         function submit() {
-            // validateAction<ListingForm>(formRef, formState).then((res) => {
-            //     debugger;
-            const param = {
-                AccountID: data.accountid.toString(),
-                ClientSerialNo: uuidv4(), // 客户端流水号
-                // OperateSrc: 2,
-                ClientType: 4,
-                // MarketID: 17201,
-                LadingBillId: props.selectedRow.ladingbillid.toString(), // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
-                // LadingBillId: 'uint642081626946446000001', // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
-                TradeDate: moment('20210727').format('YYYYMMDD'), // 交易日 string
-                // SubNum: '0', // 提单子单号
-                SubNum: props.selectedRow.subnum,
-                // WRFactorTypeId: '2121626946446000001', // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
-                WRFactorTypeId: props.selectedRow.wrfactortypeid, // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
-                IsSpecified: 0, // 是否指定对手 0：不指定 1：指定 uint32
-                // MatchUserIDs: 0, // 仓单贸易对手资金账号ID集合(指定对手时填写) uint32
-                OrderQty: 1, // 委托数量(可挂部分数据量) ======
-                DeliveryGoodsID: data.deliverygoodsid, // 交割商品商品ID
-                WRPriceType: 1, // 价格方式 1：固定价 2：浮动价
-                FixedPrice: 10, // 固定价格
-                PriceFactor: 0, // 价格系数(浮动价时填写)
-                PriceMove: 0, // 升贴水(浮动价时填写)
-                TimevalidType: 4, // 时间有效类型 1：当日有效 2：本周有效 3：指定时间有效 4：一直有效
-                // ValidTime: moment('2021-08-25 00:00:00').format('YYYY-MM-DD HH:mm:ss'), // 有效期限
-                ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'),
-                FirstRatio: 0, // 首付比例
-                PerformanceTemplateID: 0, // 履约计划模板ID
-                UserID: getUserId(),
-                OperatorID: getUserId(), // 操作员账号ID
-                BuyOrSell: 1, // 买卖方向 0买1卖
-                PriceDisplayMode: 1, // 浮动价显示方式 1：合并显示 2：分开显示
-                CanBargain: 0, // 挂牌是否可议价0:不可1:可-摘牌是否议价
-                Attachment1: '', // 附件1
-                Attachment2: '', // 附件2
-                Remark: '222', // 备注
-                ApplyID: 0, // 申请ID
-                CanPart: 1, // 是否允许部份摘牌0:不允许;1:允许
-                WRTradeGoods: [],
-                wrstandardid: 1,
-                HasWr: 1,
-            };
-            console.log(param);
-            requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
-                // cancel(true);
+            validateAction<ListingForm>(formRef, formState).then((res) => {
+                debugger;
+                const param = {
+                    AccountID: data.accountid.toString(), // 默认内部资金账号第一个
+                    ClientSerialNo: uuidv4(), // 客户端流水号
+                    // OperateSrc: 2,
+                    ClientType: 4,
+                    // MarketID: 17201,
+                    LadingBillId: props.selectedRow.ladingbillid.toString(), // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
+                    // LadingBillId: 'uint642081626946446000001', // 提单id(wrholdlb的LadingBillId字段),卖的时候填写 uint64
+                    TradeDate: moment('20210727').format('YYYYMMDD'), // 交易日 string
+                    // SubNum: '0', // 提单子单号
+                    SubNum: props.selectedRow.subnum,
+                    // WRFactorTypeId: '2121626946446000001', // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
+                    WRFactorTypeId: props.selectedRow.wrfactortypeid, // 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写 uint64
+                    IsSpecified: 0, // 是否指定对手 0：不指定 1：指定 uint32
+                    // MatchUserIDs: 0, // 仓单贸易对手资金账号ID集合(指定对手时填写) uint32
+                    OrderQty: 1, // 委托数量(可挂部分数据量) ======
+                    DeliveryGoodsID: data.deliverygoodsid, // 交割商品商品ID
+                    WRPriceType: 1, // 价格方式 1：固定价 2：浮动价
+                    FixedPrice: 10, // 固定价格
+                    PriceFactor: 0, // 价格系数(浮动价时填写)
+                    PriceMove: 0, // 升贴水(浮动价时填写)
+                    TimevalidType: 4, // 时间有效类型 1：当日有效 2：本周有效 3：指定时间有效 4：一直有效
+                    // ValidTime: moment('2021-08-25 00:00:00').format('YYYY-MM-DD HH:mm:ss'), // 有效期限
+                    ClientOrderTime: moment().format('YYYY-MM-DD HH:mm:ss'),
+                    FirstRatio: 0, // 首付比例
+                    PerformanceTemplateID: 0, // 履约计划模板ID
+                    UserID: getUserId(),
+                    OperatorID: getUserId(), // 操作员账号ID
+                    BuyOrSell: 1, // 买卖方向 0买1卖
+                    PriceDisplayMode: 1, // 浮动价显示方式 1：合并显示 2：分开显示
+                    CanBargain: 0, // 挂牌是否可议价0:不可1:可-摘牌是否议价
+                    Attachment1: '', // 附件1
+                    Attachment2: '', // 附件2
+                    Remark: '222', // 备注
+                    ApplyID: 0, // 申请ID
+                    CanPart: 1, // 是否允许部份摘牌0:不允许;1:允许
+                    WRTradeGoods: [],
+                    wrstandardid: 1,
+                    HasWr: 1,
+                };
+                console.log(param);
+                requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
+                    // cancel(true);
+                });
             });
-            // });
         }
 
         return {

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/setup.ts

@@ -1,7 +1,8 @@
+import { WrHoldLB } from "@/services/go/wrtrade/interface";
 import { reactive, ref, UnwrapRef } from "vue";
 import { ListingForm } from "./interface";
 
-export function handlePasswordForm() {
+export function handlePasswordForm(data: WrHoldLB) {
     const formRef = ref();
     const formState: UnwrapRef<ListingForm> = reactive({
         WRPriceType: 1,
@@ -10,8 +11,8 @@ export function handlePasswordForm() {
         PriceMove: 1,
     })
     const rules = {
-        FixedPrice: [{ required: true, message: '请输入挂牌价格', trigger: 'blur', type: 'number' }],
-        OrderQty: [{ required: true, message: '请输入挂牌数量', trigger: 'blur', type: 'number' }],
+        FixedPrice: [{ required: true, message: '请输入挂牌价格', trigger: 'blur', type: 'number', min: 1, }],
+        OrderQty: [{ required: true, message: '请输入挂牌数量', trigger: 'blur', type: 'number', min: 1, ma: data.enableqty }],
         // comfirePassword: [{ required: true, validator: validatePassword, trigger: 'blur' }],
 
     }