huangbin 4 anni fa
parent
commit
fdb1a925c7

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

@@ -46,7 +46,8 @@
     </a-row>
     <component :is="componentId"
                v-if="componentId"
-               :selectedRow="deliverGoods"
+               :selectedRow="selectedRow"
+               :parantSelectedRow="deliverGoods"
                @cancel="closeComponent"></component>
   </div>
 </template>

+ 3 - 6
src/views/market/spot_trade/spot_trade_order_transaction/components/delisting/index.vue

@@ -130,21 +130,18 @@ import { ListingForm, TempWrOrderQuoteDetail } from './interface';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getCanUseMoney } from '@/services/bus/account';
+import { QueryDeliveryRelationRsp } from '@/services/go/delivery/interface';
 export default defineComponent({
     name: ModalEnum.spot_trade_warehouse_financing_delisting,
     components: { Drawer, PlusOutlined, MinusOutlined },
     emits: ['cancel', 'update'],
     props: {
-        enumName: {
-            default: '',
-            type: String as PropType<EnumRouterName>,
-        },
         selectedRow: {
-            type: Object as PropType<TempWrOrderQuoteDetail>,
+            type: Object as PropType<WrOrderQuoteDetail>,
             default: {},
         },
         parantSelectedRow: {
-            type: Object as PropType<WrOrderQuote>,
+            type: Object as PropType<QueryDeliveryRelationRsp>,
             default: {},
         },
         buyOrSell: {

+ 3 - 2
src/views/market/spot_trade/spot_trade_order_transaction/components/detail/index.vue

@@ -18,14 +18,15 @@ import Drawer from '@/common/components/drawer/index.vue';
 import { WrOrderQuote } from '@/services/go/wrtrade/interface';
 
 import { _closeModal } from '@/common/setup/modal/modal';
+import { QueryDeliveryRelationRsp } from '@/services/go/delivery/interface';
 
 export default defineComponent({
     name: 'detail',
     components: { Drawer },
     emits: ['cancel', 'update'],
     props: {
-        selectedRow: {
-            type: Object as PropType<WrOrderQuote>,
+        parantSelectedRow: {
+            type: Object as PropType<QueryDeliveryRelationRsp>,
             default: {},
         },
     },

+ 10 - 5
src/views/market/spot_trade/spot_trade_order_transaction/components/listing/index.vue

@@ -50,7 +50,7 @@
                                 :min="0"
                                 :max="99999"
                                 v-model:value="formState.num" />
-                <span class="input-enumdicname-absolute">{{selectedRow.enumdicname}}</span>
+                <span class="input-enumdicname-absolute">{{parantSelectedRow.enumdicname}}</span>
                 <!-- <div class="labelTip">({{selectedRow.minivalue}}{{selectedRow.enumdicname}}起)</div> -->
               </a-form-item>
             </a-col>
@@ -61,12 +61,12 @@
               <a-form-item>
                 <a-slider ::min="0"
                           v-model:value="formState.num"
-                          :max="selectedRow.orderqty"
+                          :max="parantSelectedRow.orderqty"
                           class="formSlider"
                           style="width: 260px" />
                 <div class="unit">
                   <span>0</span>
-                  <span>99999{{selectedRow.enumdicname}}</span>
+                  <span>99999{{parantSelectedRow.enumdicname}}</span>
                 </div>
               </a-form-item>
             </a-col>
@@ -125,13 +125,18 @@ import { FormState } from './interface';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getCanUseMoney } from '@/services/bus/account';
+import { QueryDeliveryRelationRsp } from '@/services/go/delivery/interface';
 export default defineComponent({
     name: ModalEnum.spot_trade_warehouse_financing_delisting,
     components: { Drawer, PlusOutlined, MinusOutlined },
     emits: ['cancel', 'update'],
     props: {
-        selectedRow: {
-            type: Object as PropType<WrOrderQuote>,
+        // selectedRow: {
+        //     type: Object as PropType<WrOrderQuote>,
+        //     default: {},
+        // },
+        parantSelectedRow: {
+            type: Object as PropType<QueryDeliveryRelationRsp>,
             default: {},
         },
     },