update

src/packages/mobile/components/base/html-container/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div ref="htmlRef" v-html="context"></div>
+    <div ref="htmlRef" v-html="context" style="line-height: 1.6;"></div>
 </template>
   
 <script lang="ts" setup>

src/packages/sbyj/assets/themes/global/global.less

@@ -454,7 +454,7 @@
     &__content {
         max-height: 50vh;
         overflow-y: auto;
-        line-height: 1.5;
+        line-height: 1.6;
         padding: 15px;
     }
 

src/packages/sbyj/views/inventory/index.vue

@@ -9,7 +9,7 @@
                 <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
                     <div class="g-order-list__titlebar">
                         <div class="left">
-                            <h4>{{ item.goodscode }}/{{ item.goodsname }}</h4>
+                            <h4>{{ item.goodsname }}</h4>
                         </div>
                         <div class="right">
                             <span>数量：{{ item.curqty }}{{ item.goodunit }}</span>

src/packages/sbyj/views/market/detail/index.vue

@@ -89,7 +89,8 @@
                         <div class="left">
                             <h4
                                 :class="selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? 'g-price-up' : 'g-price-down'">
-                                {{ selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') : $t('enum.BuyOrSell.Sell') }}{{ ':' }}
+                                {{ selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') :
+                                    $t('enum.BuyOrSell.Sell') }}{{ ':' }}
                                 {{ selectedRow.goodsCode + '/' + selectedRow.goodsName }}
                                 {{ formatDecimal(selectedRow.tHDetailEx.holderPrice, selectedRow.decimalPlace) }}
                             </h4>
@@ -156,7 +157,8 @@
                             v-if="riskType === 1 && selectedRow.tHDetailEx.holderQty">补充</Button>
                         <template v-if="enableqty(selectedRow)">
                             <Button size="small" @click="showComponent('delivery')" round>
-                                {{ selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') : $t('enum.BuyOrSell.Sell') }}
+                                {{ selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') :
+                                    $t('enum.BuyOrSell.Sell') }}
                             </Button>
                             <Button v-if="canClose" size="small" @click="showComponent('closeholder')" round>终止</Button>
                         </template>
@@ -233,18 +235,19 @@ const enableqty = (item: Model.SBYJMyOrderRsp) => {
 
 // 数量步长列表
 const qtyStepList = computed(() => {
-    // 任务 #6013
-    const param1009 = userStore.getSystemParamValue('1009') ?? 1
+    // 任务 #6640
+    const param1009 = userStore.getSystemParamValue('1009')
 
-    const { traderules = [], agreeunit = 0 } = quote.value ?? {}
-    const { ParamValue = 1 } = traderules.find((e) => e.RuleID === 103) ?? {}
-    const min = ParamValue * agreeunit // ParamValue 是数量
-    return [
-        1 * (+param1009) * min,
-        5 * (+param1009) * min,
-        10 * (+param1009) * min,
-        50 * (+param1009) * min
-    ]
+    if (param1009) {
+        const values = param1009.split(',')
+        const { traderules = [], agreeunit = 0 } = quote.value ?? {}
+        const { ParamValue = 1 } = traderules.find((e) => e.RuleID === 103) ?? {}
+        const min = ParamValue * agreeunit // ParamValue 是数量
+        
+        return values.map((value) => (+value) * min)
+    }
+
+    return []
 })
 
 const showChart = () => {

src/packages/sjgj/assets/themes/global/global.less

@@ -454,7 +454,7 @@
     &__content {
         max-height: 50vh;
         overflow-y: auto;
-        line-height: 1.5;
+        line-height: 1.6;
         padding: 15px;
     }
 

src/packages/tss/views/order/position/Index.vue

@@ -47,11 +47,16 @@
                                     </li>
                                     <li>
                                         <span>{{ $t('position.goods.preamounts') }}：</span>
-                                        <span>{{ formatDecimal(item.tHDetailEx.payedDeposit + item.tHDetailEx.restockDeposit) }}</span>
+                                        <span>
+                                            {{ formatDecimal(item.tHDetailEx.payedDeposit
+                                            +item.tHDetailEx.restockDeposit) }}
+                                        </span>
                                     </li>
                                     <li>
                                         <span>{{ $t('position.goods.closepl') }}：</span>
-                                        <span :class="handlePriceColor(item.tHDetailEx.floatPL)">{{ formatDecimal(item.tHDetailEx.floatPL) }}</span>
+                                        <span :class="handlePriceColor(item.tHDetailEx.floatPL)">
+                                            {{ formatDecimal(item.tHDetailEx.floatPL) }}
+                                        </span>
                                     </li>
                                 </ul>
                             </div>
@@ -68,11 +73,11 @@
                         </div>
                     </div>
                     <div class="order-list__btnbar" v-if="item.tHDetailEx.holderQty">
-                        <Button type="primary" v-if="enableqty(item) && [1, 3].includes(goodstradetype(item))"
+                        <Button type="primary" :disabled="!enableqty(item) || ![1, 3].includes(goodstradetype(item))"
                             @click="onCloseSumit(item)">
                             {{ $t('operation.close') }}
                         </Button>
-                        <Button type="danger" @click="showComponent('delivery', item)">
+                        <Button type="danger" :disabled="!enableqty(item)" @click="showComponent('delivery', item)">
                             {{ item.tHDetailEx.buyOrSell === 0 ? $t('operation.pickup') : $t('operation.delivery') }}
                         </Button>
                     </div>