huangbin 4 роки тому
батько
коміт
aeb4608851

+ 3 - 2
src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/buy/index.vue

@@ -32,9 +32,9 @@
                  :list="filterBtn(firstBtn)"></contextMenu>
     <component :is="componentId"
                v-if="componentId"
-               :enumName="name"
+               :componentId="componentId"
                :selectedRow="selectedRow"
-               :buyOrSell="BuyOrSell.sell"
+               :buyOrSell="BuyOrSell.Buy"
                @cancel="closeComponent"></component>
   </div>
 </template>
@@ -57,6 +57,7 @@ export default defineComponent({
     components: {
         contextMenu,
         warehouse_receipt_trade_blocs_delisting: defineAsyncComponent(() => import('../delisting/index.vue')),
+        warehouse_receipt_trade_blocs_bargain_delisting: defineAsyncComponent(() => import('../delisting/index.vue')),
         warehouse_receipt_trade_blocs_detail: defineAsyncComponent(() => import('@/views/market/spot_trade/components/detail/index.vue')),
     },
     setup() {

+ 9 - 0
src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/delisting/index.vue

@@ -172,6 +172,10 @@ export default defineComponent({
             type: Number as PropType<BuyOrSell>,
             default: BuyOrSell.buy,
         },
+        componentId: {
+            type: String,
+            default: '',
+        },
     },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
@@ -188,6 +192,10 @@ export default defineComponent({
         function isBuy() {
             return props.buyOrSell === BuyOrSell.buy;
         }
+        // 是否议价 摘牌
+        function isBargin() {
+            return props.componentId === 'warehouse_receipt_trade_blocs_bargain_delisting';
+        }
         // 现货仓单
         const { wrHoldList } = handleSpotWarrant(props.buyOrSell, props.selectedRow, loading);
         function submit() {
@@ -269,6 +277,7 @@ export default defineComponent({
             getCanUseMoney,
             getMoney,
             isBuy,
+            isBargin,
             wrHoldList,
         };
     },

+ 2 - 1
src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/sell/index.vue

@@ -32,7 +32,7 @@
                  :list="filterBtn(firstBtn)"></contextMenu>
     <component :is="componentId"
                v-if="componentId"
-               :enumName="name"
+               :componentId="componentId"
                :selectedRow="selectedRow"
                :buyOrSell="BuyOrSell.sell"
                @cancel="closeComponent"></component>
@@ -57,6 +57,7 @@ export default defineComponent({
     components: {
         contextMenu,
         warehouse_receipt_trade_blocs_delisting: defineAsyncComponent(() => import('../delisting/index.vue')),
+        warehouse_receipt_trade_blocs_bargain_delisting: defineAsyncComponent(() => import('../delisting/index.vue')),
         warehouse_receipt_trade_blocs_detail: defineAsyncComponent(() => import('@/views/market/spot_trade/components/detail/index.vue')),
     },
     setup() {