Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/order/components/PackHistoryDetail.vue

@@ -9,10 +9,10 @@
                 <template v-if="orderItem.brandName">{{orderItem.brandName}}</template>
                 <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="orderItem.brandType" />
             </el-descriptions-item>
-            <el-descriptions-item :label="$t('箱数')">{{orderItem.num+$t('箱')}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('箱数')">{{(orderItem.warehouseInInfoVO ? orderItem.warehouseInInfoVO.cartonsNum : 0)+$t('箱')}}</el-descriptions-item>
             <el-descriptions-item :label="$t('体积')">{{orderItem.warehouseInInfoVO ? orderItem.warehouseInInfoVO.volume : orderItem.volume}}m³</el-descriptions-item>
             <el-descriptions-item :label="$t('重量')">{{orderItem.warehouseInInfoVO ? orderItem.warehouseInInfoVO.weight : orderItem.weight}}kg</el-descriptions-item>
-            <el-descriptions-item :label="$t('数量')">{{orderItem.warehouseInInfoVO ? orderItem.warehouseInInfoVO.quantityAll : orderItem.quantity}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('数量')">{{orderItem.warehouseInInfoVO ? orderItem.warehouseInInfoVO.quantityAll : orderItem.quantity}}{{$t('个')}}</el-descriptions-item>
             <el-descriptions-item :label="$t('备货状态')">{{airShipmentData[info.airShipment]}}</el-descriptions-item>
             <el-descriptions-item :label="$t('商品特性')">{{productAttr}}</el-descriptions-item>
           </el-descriptions>
@@ -112,8 +112,8 @@
       <el-card style="margin-bottom:10px">
         <el-descriptions :title="$t('打包数据')" :column="2" :labelStyle="{width:'120px'}">
           <el-descriptions-item :label="$t('打包后箱数')">{{packData.cartonsNum+$t('箱')}}</el-descriptions-item>
-          <el-descriptions-item :label="$t('打包后体积')">{{packData.volume}}m³</el-descriptions-item>
-          <el-descriptions-item :label="$t('打包后重量')">{{packData.weight}}kg</el-descriptions-item>
+          <el-descriptions-item :label="$t('打包后体积')">{{packData.volume.toFixed(2)}}m³</el-descriptions-item>
+          <el-descriptions-item :label="$t('打包后重量')">{{packData.weight.toFixed(2)}}kg</el-descriptions-item>
           <el-descriptions-item :label="$t('打包后数量（个）')" >{{packData.quantityAll}}</el-descriptions-item>
           <el-descriptions-item :label="$t('打包人')">{{packAfterData.creatorName}}</el-descriptions-item>
           <el-descriptions-item :label="$t('打包时间')">{{packAfterData.createTime|parseTime}}</el-descriptions-item>