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

src/views/ecw/order/exception/index.vue

@@ -98,7 +98,8 @@
       </el-table-column>
       <el-table-column :label="$t('体积/重量')" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
+            <span v-if="scope.row.orderStatus >= 5 ">{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
+            <span v-else>{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
           </template>
       </el-table-column>
       <el-table-column :label="$t('运输方式/目的地')" align="center">