Handy_Cao 1 рік тому
батько
коміт
8294538ce1

+ 11 - 9
src/packages/mobile/views/order/position/components/pricing/detail2/components/transfer/Index.vue

@@ -38,15 +38,15 @@
                             </RadioGroup>
                             </RadioGroup>
                         </template>
                         </template>
                     </Field> 
                     </Field> 
-                    <Field name="MarketMaxSub" :rules="formRules.MarketMaxSub" :label="$t('quote.pricing.marketmaxsub1')" v-if="formData.PriceMode === PriceMode.Market">
+                    <!-- <Field name="MarketMaxSub" :rules="formRules.MarketMaxSub" :label="$t('quote.pricing.marketmaxsub1')" v-if="formData.PriceMode === PriceMode.Market">
                         <template #input>
                         <template #input>
                             <Stepper v-model="formData.MarketMaxSub" theme="round" button-size="22" :min="0" :max="999" :auto-fixed="false" />
                             <Stepper v-model="formData.MarketMaxSub" theme="round" button-size="22" :min="0" :max="999" :auto-fixed="false" />
                         </template>
                         </template>
-                    </Field>
+                    </Field> -->
                     <Field name="OrderPrice" :rules="formRules.OrderPrice" :label="$t('position.goods.transferprice')" v-if="formData.PriceMode === PriceMode.Limit">
                     <Field name="OrderPrice" :rules="formRules.OrderPrice" :label="$t('position.goods.transferprice')" v-if="formData.PriceMode === PriceMode.Limit">
                         <template #input>
                         <template #input>
                             <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :min="0"
                             <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :min="0"
-                                :decimal-length="quote?.decimalplace" :step="quote?.decimalvalue" :auto-fixed="false" />
+                                :decimal-length="decimalplace" :step="decimalplace" :auto-fixed="false" />
                         </template>
                         </template>
                     </Field>
                     </Field>
                     <Field name="OrderQty" :rules="formRules.OrderQty" :label="$t('position.goods.orderqty')">
                     <Field name="OrderQty" :rules="formRules.OrderQty" :label="$t('position.goods.orderqty')">
@@ -87,6 +87,8 @@ const positionStore = usePositionStore()
 const userStore = useUserStore()
 const userStore = useUserStore()
 const accountStore = useAccountStore()
 const accountStore = useAccountStore()
 const quote = futuresStore.getGoodsQuote(props.selectedRow.goodsCode)
 const quote = futuresStore.getGoodsQuote(props.selectedRow.goodsCode)
+// 小数位以及步进值
+const { decimalplace = 0.0 } = quote.value ?? {}
 const { global: { t } } = i18n
 const { global: { t } } = i18n
 
 
 const formRef = shallowRef<FormInstance>()
 const formRef = shallowRef<FormInstance>()
@@ -133,12 +135,12 @@ const onPriceModeChanged = () => {
 
 
 // 表单验证规则
 // 表单验证规则
 const formRules: { [key: string]: FieldRule[] } = {
 const formRules: { [key: string]: FieldRule[] } = {
-    MarketMaxSub: [{
-        message: t('position.pricing.tips3'),
-        validator: () => {
-            return !!formData.MarketMaxSub
-        }
-    }],
+    // MarketMaxSub: [{
+    //     message: t('position.pricing.tips3'),
+    //     validator: () => {
+    //         return !!formData.MarketMaxSub
+    //     }
+    // }],
     OrderPrice: [{
     OrderPrice: [{
         message: t('position.transfer.tips3'),
         message: t('position.transfer.tips3'),
         validator: () => {
         validator: () => {

+ 4 - 4
src/packages/mobile/views/pricing/trade/Index.vue

@@ -117,23 +117,23 @@
             <template v-if="formData.BuyOrSell === BuyOrSell.Buy">
             <template v-if="formData.BuyOrSell === BuyOrSell.Buy">
                 <Button type="danger" block square :disabled="!formData.OrderQty"
                 <Button type="danger" block square :disabled="!formData.OrderQty"
                     @click="onBeforeSubmit(BuildType.Open)" v-if="!quote?.iscannotbuy">{{ $t('quote.orderbuy') }}</Button>
                     @click="onBeforeSubmit(BuildType.Open)" v-if="!quote?.iscannotbuy">{{ $t('quote.orderbuy') }}</Button>
-                <Button color="#199e00" block square
+                <!-- <Button color="#199e00" block square
                     :disabled="!formData.OrderQty || !sellQty || (formData.OrderQty > sellQty)"
                     :disabled="!formData.OrderQty || !sellQty || (formData.OrderQty > sellQty)"
                     @click="onBeforeSubmit(BuildType.Close)" v-if="!isTrademode16">
                     @click="onBeforeSubmit(BuildType.Close)" v-if="!isTrademode16">
                     <span>{{ $t('quote.transferbuy') }}</span>
                     <span>{{ $t('quote.transferbuy') }}</span>
                     <span v-if="sellQty">(≤{{ sellQty }})</span>
                     <span v-if="sellQty">(≤{{ sellQty }})</span>
-                </Button>
+                </Button> -->
             </template>
             </template>
             <template v-if="formData.BuyOrSell === BuyOrSell.Sell">
             <template v-if="formData.BuyOrSell === BuyOrSell.Sell">
                 <Button type="danger" block square :disabled="!formData.OrderQty"
                 <Button type="danger" block square :disabled="!formData.OrderQty"
                     @click="onBeforeSubmit(BuildType.Open)"
                     @click="onBeforeSubmit(BuildType.Open)"
                     v-if="!isTrademode16 && !quote?.iscannotsell">{{ $t('quote.ordersell') }}</Button>
                     v-if="!isTrademode16 && !quote?.iscannotsell">{{ $t('quote.ordersell') }}</Button>
-                <Button color="#199e00" block square
+                <!-- <Button color="#199e00" block square
                     :disabled="!formData.OrderQty || !buyQty || (formData.OrderQty > buyQty)"
                     :disabled="!formData.OrderQty || !buyQty || (formData.OrderQty > buyQty)"
                     @click="onBeforeSubmit(BuildType.Close)">
                     @click="onBeforeSubmit(BuildType.Close)">
                     <span>{{ $t('quote.transfersell') }}</span>
                     <span>{{ $t('quote.transfersell') }}</span>
                     <span v-if="buyQty">(≤{{ buyQty }})</span>
                     <span v-if="buyQty">(≤{{ buyQty }})</span>
-                </Button>
+                </Button> -->
             </template>
             </template>
         </div>
         </div>
         <Tabs class="van-tabs--list" v-model:active="active">
         <Tabs class="van-tabs--list" v-model:active="active">