huangbin vor 4 Jahren
Ursprung
Commit
c95fc8d7ef

+ 15 - 18
src/views/market/spot_trade/spot_trade_order_transaction/components/delisting/index.vue

@@ -115,13 +115,8 @@
 import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
-import {
-    WrOrderQuote,
-    WrOrderQuoteDetail,
-    WrTradeOrderDetailReq,
-    WrTradeOrderDetailRsp
-} from '@/services/go/wrtrade/interface';
-import {getAccount_longType, getAccountTypeList, getSelectedAccountId, getUserId} from '@/services/bus/account';
+import { WrOrderQuote, WrOrderQuoteDetail, WrTradeOrderDetailReq, WrTradeOrderDetailRsp } from '@/services/go/wrtrade/interface';
+import { getAccount_longType, getAccountTypeList, getSelectedAccountId, getUserId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { HdWRDealOrder } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';
@@ -132,15 +127,15 @@ import { _closeModal } from '@/common/setup/modal/modal';
 import { handleForm } from './setup';
 import { validateAction } from '@/common/setup/form';
 import { ListingForm, TempWrOrderQuoteDetail } from './interface';
-import {BuyOrSell, DelistingType, PriceType} from '@/common/constants/enumCommon';
+import { BuyOrSell, DelistingType, PriceType } from '@/common/constants/enumCommon';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getCanUseMoney } from '@/services/bus/account';
 import { QueryDeliveryRelationRsp } from '@/services/go/delivery/interface';
-import {Order} from "@/services/socket/order";
-import {OrderReq} from "@/services/socket/order/interface";
-import {getLongTypeLoginID} from "@/services/bus/login";
-import {LongType} from "@/services/socket/login/interface";
-import * as Long from "long";
+import { Order } from '@/services/socket/order';
+import { OrderReq } from '@/services/socket/order/interface';
+import { getLongTypeLoginID } from '@/services/bus/login';
+import { LongType } from '@/services/socket/login/interface';
+import * as Long from 'long';
 export default defineComponent({
     name: ModalEnum.spot_trade_warehouse_financing_delisting,
     components: { Drawer, PlusOutlined, MinusOutlined },
@@ -175,7 +170,9 @@ export default defineComponent({
         function isBuy() {
             return props.buyOrSell === BuyOrSell.buy;
         }
-        function getMoney() {}
+        function getMoney() {
+            // return (formState.price * formState.num).toFixed(2);
+        }
         // const { getMaxNum, getMoney, getMargin } = handleNumAndMoney(props.enumName, props.buyOrSell, props.selectedRow, props.parantSelectedRow, formState);
         function submit() {
             validateAction<ListingForm>(formRef, formState).then((res) => {
@@ -196,8 +193,8 @@ export default defineComponent({
                     OperatorID: Number(getLongTypeLoginID()),
                     // MarketMaxSub: number // 市价允许最大偏差(做市)
                     OrderQty: res.num, // 委托数量
-                    BuyOrSell: props.selectedRow.buyorsell === 1 ? 0 : 1 ,  // 买卖方向  0 买 1 卖
-                    BuildType: props.selectedRow.buyorsell === 1 ? 1 : 2 ,  // 下单类型  1 建 2 平
+                    BuyOrSell: props.selectedRow.buyorsell === 1 ? 0 : 1, // 买卖方向  0 买 1 卖
+                    BuildType: props.selectedRow.buyorsell === 1 ? 1 : 2, // 下单类型  1 建 2 平
                     // CurtQuotePrice: 0, // 保留,计算冻结金额使用
                     // SpPrice: 0 ,// 止盈价格
                     // SlPrice: 0 , // 止损价格
@@ -206,7 +203,7 @@ export default defineComponent({
                     TriggerType: 1, // 预埋单触发类型
                     // TriggerPrice: number // 预埋单触发价格
                     ListingSelectType: 2, // 挂牌点选类型 1:挂牌 2:摘牌 3:先摘后挂
-                    DelistingType:  DelistingType.selected, // 摘牌类型 2:点选成交
+                    DelistingType: DelistingType.selected, // 摘牌类型 2:点选成交
                     // RelatedID: number // 关联单号
                     OptionType: 1, // 期权类型(1:认购(看涨)2:认沽(看跌))
                     // Premium: number // 权利金
@@ -216,7 +213,7 @@ export default defineComponent({
                     // UsedQty: number // 使用数量
                     // ValidTime: string // 指定有效日期
                     // ReceiveInfoID: number // 收货地址ID
-                }
+                };
                 requestResultLoadingAndInfo(Order, param, loading, ['摘牌成功', '摘牌失败:']).then(() => {
                     cancel(true);
                 });

+ 16 - 14
src/views/market/spot_trade/spot_trade_order_transaction/components/listing/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <!-- 贸易圈挂牌 -->
+  <!-- 贸易圈挂牌 -->
   <Drawer :title="'挂牌'"
           :placement="'right'"
           :visible="visible"
@@ -120,14 +120,14 @@ import { validateAction } from '@/common/setup/form';
 import { FormState } from './interface';
 import { getCanUseMoney } from '@/services/bus/account';
 import { QueryDeliveryRelationRsp } from '@/services/go/delivery/interface';
-import {OrderReq} from "@/services/socket/order/interface";
-import {Order} from "@/services/socket/order";
-import {DelistingType, PriceType} from "@/common/constants/enumCommon";
-import {getLongTypeLoginID} from "@/services/bus/login";
-import {LongType} from "@/services/socket/login/interface";
-import {v4 as uuidv4} from "uuid";
-import moment from "moment";
-import Long from "long";
+import { OrderReq } from '@/services/socket/order/interface';
+import { Order } from '@/services/socket/order';
+import { DelistingType, PriceType } from '@/common/constants/enumCommon';
+import { getLongTypeLoginID } from '@/services/bus/login';
+import { LongType } from '@/services/socket/login/interface';
+import { v4 as uuidv4 } from 'uuid';
+import moment from 'moment';
+import Long from 'long';
 export default defineComponent({
     name: ModalEnum.spot_trade_warehouse_financing_delisting,
     components: { Drawer, PlusOutlined, MinusOutlined },
@@ -151,7 +151,9 @@ export default defineComponent({
             return accountList.find((e) => e.accountid === formState.accountid);
         }
         const loading = ref<boolean>(false);
-        function getMoney() {}
+        function getMoney() {
+            return (formState.price * formState.num).toFixed(2);
+        }
         // const { getMaxNum, getMoney, getMargin } = handleNumAndMoney(props.enumName, props.buyOrSell, props.selectedRow, props.parantSelectedRow, formState);
         function submit() {
             validateAction<FormState>(formRef, formState).then((res) => {
@@ -171,8 +173,8 @@ export default defineComponent({
                     OperatorID: Number(getLongTypeLoginID()),
                     // MarketMaxSub: number // 市价允许最大偏差(做市)
                     OrderQty: res.num, // 委托数量
-                    BuyOrSell: 0 ,  // 买卖方向  0 买 1 卖
-                    BuildType: 1 ,  // 下单类型  1 建 2 平
+                    BuyOrSell: 0, // 买卖方向  0 买 1 卖
+                    BuildType: 1, // 下单类型  1 建 2 平
                     // CurtQuotePrice: 0, // 保留,计算冻结金额使用
                     // SpPrice: 0 ,// 止盈价格
                     // SlPrice: 0 , // 止损价格
@@ -181,7 +183,7 @@ export default defineComponent({
                     TriggerType: 1, // 预埋单触发类型
                     // TriggerPrice: number // 预埋单触发价格
                     ListingSelectType: 1, // 挂牌点选类型 1:挂牌 2:摘牌 3:先摘后挂
-                    DelistingType:  DelistingType.selected, // 摘牌类型 2:点选成交
+                    DelistingType: DelistingType.selected, // 摘牌类型 2:点选成交
                     // RelatedID: number // 关联单号
                     OptionType: 1, // 期权类型(1:认购(看涨)2:认沽(看跌))
                     // Premium: number // 权利金
@@ -192,7 +194,7 @@ export default defineComponent({
                     // ValidTime: string // 指定有效日期
                     // ReceiveInfoID: number // 收货地址ID
                     OrderFlag: 1,
-                }
+                };
                 requestResultLoadingAndInfo(Order, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
                     cancel(true);
                 });