|
@@ -154,7 +154,7 @@ import { useListingTradeNumAndPrice } from '@/common/setup/trade';
|
|
|
import { ListingTradeNumAndPrice } from '@/common/setup/trade/interface';
|
|
import { ListingTradeNumAndPrice } from '@/common/setup/trade/interface';
|
|
|
import { useTodayMargin } from '@/hooks/margin';
|
|
import { useTodayMargin } from '@/hooks/margin';
|
|
|
import { getSelectedAccountId } from '@/services/bus/account';
|
|
import { getSelectedAccountId } from '@/services/bus/account';
|
|
|
-import { getGoodsAgreeunitByGoodsCode, getGoodsByCode, getQuoteDayInfoByCodeFindPrice } from '@/services/bus/goods';
|
|
|
|
|
|
|
+import { getGoodsAgreeunitByGoodsCode, getQuoteDayInfoByCodeFindPrice } from '@/services/bus/goods';
|
|
|
import { geLoginID_number } from '@/services/bus/login';
|
|
import { geLoginID_number } from '@/services/bus/login';
|
|
|
import { getMarketByTradeMode, getMarketIdsByTradeMode } from '@/services/bus/market';
|
|
import { getMarketByTradeMode, getMarketIdsByTradeMode } from '@/services/bus/market';
|
|
|
import { queryTradePosition } from '@/services/go/ermcp/order';
|
|
import { queryTradePosition } from '@/services/go/ermcp/order';
|
|
@@ -162,6 +162,7 @@ import { QueryTradePositionRsp } from '@/services/go/ermcp/order/interface';
|
|
|
import { QueryTjmdTodayAccountMarginReq } from '@/services/go/Tjmd/interface';
|
|
import { QueryTjmdTodayAccountMarginReq } from '@/services/go/Tjmd/interface';
|
|
|
import { diaoQiOrder } from '@/services/socket/order';
|
|
import { diaoQiOrder } from '@/services/socket/order';
|
|
|
import { OrderReq } from '@/services/socket/order/interface';
|
|
import { OrderReq } from '@/services/socket/order/interface';
|
|
|
|
|
+import Bus from '@/utils/eventBus';
|
|
|
import { MinusOutlined, PlusOutlined, SwapOutlined } from '@ant-design/icons-vue';
|
|
import { MinusOutlined, PlusOutlined, SwapOutlined } from '@ant-design/icons-vue';
|
|
|
import moment from 'moment';
|
|
import moment from 'moment';
|
|
|
import { v4 as uuidv4 } from 'uuid';
|
|
import { v4 as uuidv4 } from 'uuid';
|
|
@@ -170,7 +171,6 @@ import { RefGoodsList } from '../../interface';
|
|
|
import { useUserType } from '../setup';
|
|
import { useUserType } from '../setup';
|
|
|
import { FormParam } from './interface';
|
|
import { FormParam } from './interface';
|
|
|
import { handleForm, isFloat, useBuySellDirection, useNum, usePrice } from './setup';
|
|
import { handleForm, isFloat, useBuySellDirection, useNum, usePrice } from './setup';
|
|
|
-import Bus from '@/utils/eventBus';
|
|
|
|
|
|
|
|
|
|
export default defineComponent({
|
|
export default defineComponent({
|
|
|
emits: ['cancel', 'update'],
|
|
emits: ['cancel', 'update'],
|
|
@@ -267,14 +267,14 @@ export default defineComponent({
|
|
|
}
|
|
}
|
|
|
function submit() {
|
|
function submit() {
|
|
|
validateAction<FormParam>(formRef, formState).then((res) => {
|
|
validateAction<FormParam>(formRef, formState).then((res) => {
|
|
|
- const { goodscode, orderid } = props.selectedRow;
|
|
|
|
|
|
|
+ const { goodsid, orderid } = props.selectedRow;
|
|
|
const param: OrderReq = {
|
|
const param: OrderReq = {
|
|
|
ClientSerialNo: uuidv4(), // 客户端流水号
|
|
ClientSerialNo: uuidv4(), // 客户端流水号
|
|
|
ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), // 客户端委托时间
|
|
ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), // 客户端委托时间
|
|
|
ClientType: 4, // 终端类型
|
|
ClientType: 4, // 终端类型
|
|
|
LoginID: geLoginID_number()!, // 登陆账号
|
|
LoginID: geLoginID_number()!, // 登陆账号
|
|
|
AccountID: res.accountid, // 交易账号
|
|
AccountID: res.accountid, // 交易账号
|
|
|
- GoodsID: getGoodsByCode(goodscode)?.goodsid, // 商品ID
|
|
|
|
|
|
|
+ GoodsID: goodsid, // 商品ID
|
|
|
MarketID: getMarketByTradeMode(TradeMode.DiaoQi)?.marketid, // 市场ID
|
|
MarketID: getMarketByTradeMode(TradeMode.DiaoQi)?.marketid, // 市场ID
|
|
|
ValidType: 1, // 校验类型 当日有效
|
|
ValidType: 1, // 校验类型 当日有效
|
|
|
OperateType: 1, // 操作类型: 申请
|
|
OperateType: 1, // 操作类型: 申请
|
huangbin