Merge remote-tracking branch 'origin/master'

src/assets/styles/mixin.less

@@ -731,6 +731,14 @@
     margin-left: 5px;
     font-size: 16px;
   }
+.input-enumdicname-absolute {
+    position: absolute;
+    top: -8px;
+    right: -23px;
+    color: #394753;
+    margin-left: 5px;
+    font-size: 16px;
+  }
 
 .dialogInput {
     background: @m-grey21;

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

@@ -72,12 +72,14 @@
           <a-row :gutter="24">
             <a-col :span="24">
               <a-form-item label="摘牌数量"
+                           class="relative"
                            name="num">
                 <a-input-number class="dialogInput yellowInput"
                                 style="width: 260px"
                                 :min="0"
                                 v-model:value="formState.num" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
+                <span class="input-enumdicname-absolute">{{selectedRow.enumdicname}}</span>
+                <div class="labelTip">({{selectedRow.minivalue}}{{selectedRow.enumdicname}}起)</div>
               </a-form-item>
             </a-col>
           </a-row>
@@ -165,6 +167,7 @@ export default defineComponent({
     },
 
     setup(props, context) {
+        console.log('props', props);
         const { visible, cancel } = _closeModal(context);
         const accountList = getAccountTypeList([2]);
         const { rules, formState, formRef } = handleForm(props.selectedRow);
@@ -331,7 +334,7 @@ export default defineComponent({
     color: @m-blue16;
     position: absolute;
     top: 15px;
-    left: -80px;
+    left: -66px;
 }
 .minusBtn,
 .plusBtn {

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

@@ -58,8 +58,8 @@ export function handleSpotWarrant(enumName: EnumRouterName, buyOrSell: BuyOrSell
         if (!isSale()) {
             queryResultLoadingAndInfo(queryHoldLB, loading).then(res => {
                 wrHoldList.value = res.filter((e: WrHoldLB) => e.wrfactortypeid === String(selectedRow.wrfactortypeid)).map((e: WrHoldLB) => {
-                    const { wrholdeno, enableqty, ladingbillid } = e
-                    return { id: ladingbillid, name: `${wrholdeno}(${enableqty})` }
+                    const { wrholdeno, enableqty, ladingbillid, enumdicname } = e
+                    return { id: ladingbillid, name: `${wrholdeno}（${enableqty}${enumdicname}）` }
                 })
             })
         }

src/views/market/spot_trade/components/buy-sell-market/components/financing_delisting/index.vue

@@ -390,7 +390,7 @@ export default defineComponent({
     color: @m-blue16;
     position: absolute;
     top: 15px;
-    left: -80px;
+    left: -66px;
 }
 .minusBtn,
 .plusBtn {