huangbin 4 yıl önce
ebeveyn
işleme
fc2e272ad8

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

@@ -222,7 +222,7 @@ export default defineComponent({
         function getPrice() {
             let result = '--';
             const goodsPrice = getQuoteDayInfoByCodeFindPrice(props.parantSelectedRow.goodscode);
-            if (goodsPrice && goodsPrice !== '--') {
+            if (goodsPrice && goodsPrice !== '--' && props.selectedRow.pricemove !== null) {
                 // 有实时行情价格
                 result = ((goodsPrice as number) + props.selectedRow.pricemove).toFixed(2);
             }

+ 2 - 2
src/views/market/spot_trade/components/buy-sell-market/components/delisting/setup.ts

@@ -89,7 +89,7 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
                 if (isFloat()) {
                     const goodsPrice = getQuoteDayInfoByCodeFindPrice(parantSelectedRow.goodscode);
                     // 估算总价=挂牌基差+期货合约价;
-                    if (goodsPrice && goodsPrice !== '--') {   // 有实时行情价格
+                    if (goodsPrice && goodsPrice !== '--' && pricemove !== null) {   // 有实时行情价格
                         // 估算总价
                         const predictTotal = pricemove + (goodsPrice as number);
                         // 买方履约保证金比例*估算总价
@@ -130,7 +130,7 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
         if (isFloat()) {
             const goodsPrice = getQuoteDayInfoByCodeFindPrice(parantSelectedRow.goodscode);
             const agreeunit = getGoodsAgreeunitByGoodsCode(parantSelectedRow.goodscode);
-            if (goodsPrice && goodsPrice !== '--') {   // 有实时行情价格
+            if (goodsPrice && goodsPrice !== '--' && pricemove !== null) {   // 有实时行情价格
                 // 估算总价=挂牌基差+期货合约价;
                 const predictTotal = pricemove + (goodsPrice as number);
                 // 估算总额=估算总价*摘牌数量;

+ 1 - 1
src/views/market/spot_trade/components/buy-sell-market/components/financing_delisting/setup.ts

@@ -111,7 +111,7 @@ export function handleNumAndMoney(enumName: EnumRouterName, buyOrSell: BuyOrSell
                 if (isFloat()) {
                     const goodsPrice = getQuoteDayInfoByCodeFindPrice(parantSelectedRow.goodscode);
                     // 估算总价=挂牌基差+期货合约价;
-                    if (goodsPrice && goodsPrice !== '--') {   // 有实时行情价格
+                    if (goodsPrice && goodsPrice !== '--' && pricemove !== null) {   // 有实时行情价格
                         // 估算总价
                         const predictTotal = pricemove + (goodsPrice as number);
                         // 买方履约保证金比例*估算总价

+ 1 - 1
src/views/market/spot_trade/components/post_buying/setup.ts

@@ -107,7 +107,7 @@ export function handleNumAndPrice(enumName: EnumRouterName, selectedRow: WrOrder
     function getPrice() {
         let result = '--'
         const goodsPrice = getGoodsPrice()
-        if (goodsPrice.value && goodsPrice.value !== '--' && formState.PriceMove) {   // 有实时行情价格
+        if (goodsPrice.value && goodsPrice.value !== '--' && formState.PriceMove !== null) {   // 有实时行情价格
             result = ((goodsPrice.value as number) + formState.PriceMove).toFixed(2)
         }
         return result