Handy_Cao 1 년 전
부모
커밋
4b92ed2ae9

+ 3 - 4
src/packages/mobile/views/order/position/components/pricing/detail2/components/delivery/Index.vue

@@ -25,7 +25,7 @@
                     <Cell v-if="selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Sell" :title="$t('position.goods.totalfees')" :value="formatDecimal(serivcefee+pricemove+shipping+otherfees)" />
                 </CellGroup>
                 <CellGroup :title="$t('position.goods.subtitle2')" inset>
-                    <Cell :title="$t('position.goods.deliveryqty')" :value="((formData.DeliveryLot ?? 0) * selectedRow.agreeUnit) + getGoodsUnitName(selectedRow.goodsUnitID)" />
+                    <Cell :title="$t('position.goods.deliveryqty')" :value="formData.DeliveryLot" />
                     <Field :label="selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? $t('position.goods.address') : $t('position.goods.deliveryid')"  
                         name="DeliveryInfo" v-model="formData.DeliveryInfo" type="textarea" autosize clearable
                         :rules="formRules.DeliveryInfo" maxlength="50" 
@@ -54,7 +54,6 @@ import { formatDecimal, handleRequestBigNumber } from '@/filters'
 import { useOfflineDelivery } from '@/business/trade'
 import { dialog, fullloading } from '@/utils/vant'
 import { i18n, useFuturesStore } from '@/stores'
-import { getGoodsUnitName } from '@/constants/unit'
 import AppModal from '@/components/base/modal/index.vue'
 import AppContact from '@mobile/components/modules/contact/index.vue'
 
@@ -138,8 +137,8 @@ const shipping = computed(() => {
 
 // 可用重量
 const enableqty = computed(() => {
-    const { tHDetailEx, agreeUnit } = props.selectedRow
-    return (tHDetailEx.holderQty - tHDetailEx.freezeQty) * agreeUnit
+    const { tHDetailEx } = props.selectedRow
+    return tHDetailEx.holderQty - tHDetailEx.freezeQty
 }) 
 
 // 需补足尾款

+ 4 - 4
src/packages/pc/views/footer/pricing/detail2/components/delivery/index.vue

@@ -12,10 +12,10 @@
                 <span>{{ formatDecimal(selectedRow.tHDetailEx.holderAmount, selectedRow.decimalPlace) }}</span>
             </el-form-item>
             <el-form-item :label="t('position.goods.curpositionqty')">
-                <span>{{ selectedRow.tHDetailEx.holderQty*selectedRow.agreeUnit + getGoodsUnitName(selectedRow.goodsUnitID) }}</span>
+                <span>{{ selectedRow.tHDetailEx.holderQty }}</span>
             </el-form-item>
             <el-form-item :label="t('position.goods.frozenqty')">
-                <span>{{ selectedRow.tHDetailEx.freezeQty*selectedRow.agreeUnit + getGoodsUnitName(selectedRow.goodsUnitID) }}</span>
+                <span>{{ selectedRow.tHDetailEx.freezeQty }}</span>
             </el-form-item>
             <el-form-item :label="t('position.goods.enableqty')">
                 <span>{{ enableqty }}</span>
@@ -115,8 +115,8 @@ const formRules: FormRules = {
 
 // 可用重量
 const enableqty = computed(() => {
-    const { tHDetailEx, agreeUnit } = props.selectedRow
-    return (tHDetailEx.holderQty - tHDetailEx.freezeQty) * agreeUnit
+    const { tHDetailEx } = props.selectedRow
+    return (tHDetailEx.holderQty - tHDetailEx.freezeQty)
 }) 
 
 // 选择地址