huangbin před 4 roky
rodič
revize
7ab8f8e6ed

+ 2 - 1
src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/delisting/index.vue

@@ -81,7 +81,8 @@
                                 :max="getMaxNum()"
                                 v-model:value="formState.num" />
                 <span class="input-enumdicname-absolute">{{selectedRow.enumdicname}}</span>
-                <div class="labelTip">({{selectedRow.minivalue}}{{selectedRow.enumdicname}}起)</div>
+                <div class="labelTip">({{selectedRow.delistminqty}}{{selectedRow.enumdicname}}起)
+                </div>
               </a-form-item>
             </a-col>
           </a-row>

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

@@ -81,7 +81,8 @@
                                 :max="getMaxNum()"
                                 v-model:value="formState.num" />
                 <span class="input-enumdicname-absolute">{{selectedRow.enumdicname}}</span>
-                <div class="labelTip">({{selectedRow.minivalue}}{{selectedRow.enumdicname}}起)</div>
+                <div class="labelTip">({{selectedRow.delistminqty}}{{selectedRow.enumdicname}}起)
+                </div>
               </a-form-item>
             </a-col>
           </a-row>

+ 3 - 1
src/views/order/spot_warran/components/spot_warrant_bargain/index.vue

@@ -27,6 +27,9 @@
       <template #buyorsell="{ text }">
         <span>{{ text ? '买' : '卖' }}</span>
       </template>
+      <template #marginvalue="{ text }">
+        <span>{{ (text * 100).toFixed(2) }}%</span>
+      </template>
       <!--  委托状态-->
       <!-- <template #wrtradeorderstatus="{ record }">
         <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
@@ -77,7 +80,6 @@ export default defineComponent({
         // 表格通用逻辑
         const param: ComposeOrderTableParam = {
             queryFn: queryTableAction,
-            tableName: 'table_pcweb_spot_trade_bottom_spot_warrant_pending_order',
             recordList: getRecordItemTab(),
         };
         const {