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

src/views/ecw/order/batchSingleApplication.vue

@@ -19,8 +19,12 @@
           <template v-slot="{row}">
             <div v-if="row.costVO">
               {{$t('箱数')}}：{{ row.costVO.totalNum }}
-              {{ row.costVO.totalVolume }}m³
-              {{ row.costVO.totalWeight }}kg
+               <div>
+                 体积：{{ row.costVO.totalVolume }}CBM
+               </div>
+                <div>
+                  重量：{{ row.costVO.totalWeight }}kg
+                </div>
             </div>
           </template>
         </el-table-column>

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

@@ -20,9 +20,9 @@
       :label="$t('下单统计')">
       <template v-slot="{row}">
         <div v-if="row.costVO">
-          箱数：{{row.costVO.totalNum}}
-          {{row.costVO.totalVolume}}m³
-          {{row.costVO.totalWeight}}kg
+          <div>箱数：{{row.costVO.totalNum}}</div>
+           <div>体积：{{row.costVO.totalVolume}}CMB</div>
+           <div>重量：{{row.costVO.totalWeight}}kg</div>
         </div>
       </template>
     </el-table-column>

src/views/ecw/order/transferWarehousing.vue

@@ -366,8 +366,8 @@ export default {
           Wweight += Number(m.weight || 0)
         })
        })
-      let text = `${this.$t('下单统计')}：${num}${this.$t('箱')} ${volume}m³ ${weight}Kg`
-      let text2 =` ${this.$t('入仓统计')}：${Wnum}${this.$t('箱')} ${Wvolume}m³ ${Wweight}Kg`
+      let text = `${this.$t('下单统计')}：${num}${this.$t('箱')} ${volume.toFixed(2)}m³ ${weight.toFixed(2)}Kg`
+      let text2 =` ${this.$t('入仓统计')}：${Wnum}${this.$t('箱')} ${Wvolume.toFixed(2)}m³ ${Wweight.toFixed(2)}Kg`
       return [this.$t('合计：'),text,text2]
     },
     cancellationOfOrder(){