Commit eed1600a authored by dragondean@qq.com's avatar dragondean@qq.com

修复几个bug

parent 6f641352
......@@ -145,7 +145,7 @@
{{order.inWarehouseState > 1 && row.warehouseInInfoVO ? row.warehouseInInfoVO.weight : row.weight}}
</template>
</el-table-column>
<el-table-column prop="quantity" :label="$t('数量') + '(个)'" width="90px"/>
<el-table-column prop="warehouseInInfoVO.quantityAll" :label="$t('数量') + '(个)'" width="90px"/>
<el-table-column prop="" :label="$t('费用类型')">
<template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_PAY_ADVANCE" :value="row.isPayAdvance" />
......
......@@ -270,7 +270,7 @@
</el-form-item>
<!--代收货款,只有非控货订单、并且线路开通了代收货款后,才显示是否代收货款选项-->
<el-form-item :label="$t('代收货款金额')" v-if="collectionProxy && form.isCollection" prop="collectionProxy" class="ml-20">
<el-input v-model="form.collectionProxy" class="w-200 mr-10" :disabled="false"></el-input>
<el-input type="number" v-model="form.collectionProxy" class="w-200 mr-10" :disabled="false"></el-input>
<selector v-model="form.collectionProxyCurrency" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100" :disabled="false"/>
</el-form-item>
</div>
......
......@@ -40,7 +40,7 @@
{{(orderData.costVO.totalNum||0)+$t('')+(orderData.costVO.totalVolume||0)+''+(orderData.costVO.totalWeight||0)+'kg '+(orderData.costVO.totalQuantity||0)+$t('')}}
</template>
</el-form-item>
<el-form-item :label="$t('代收金额')+':'">
<el-form-item :label="$t('代收金额')+':'" v-if="orderExceptionData.orderExceptionType == 'order_cod_exception'">
<template v-if="orderData && orderData.costVO">
{{orderExceptionData.orderExceptionAmount}} {{currencyMap[orderExceptionData.orderExceptionCurrencyId]}}
</template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment