修复多想异常处理页面填单和入仓数据不对

src/views/ecw/order/prepayDeal.vue

@@ -32,15 +32,27 @@
        <div v-if="orderExceptionData.orderExceptionType!='order_doc_exception'&&orderExceptionData.orderExceptionType!='order_consignor_exception'&&orderExceptionData.orderExceptionType!='order_other_exception'">
          <el-row>
             <el-form-item :label="$t('填单参数')+':'">
-              <template v-if="orderData && orderData.costVO">
-               {{(orderData.costVO.totalNum||0)+$t('箱 ')+(orderData.costVO.totalVolume||0)+'m³ '+(orderData.costVO.totalWeight||0)+'kg '+(orderData.costVO.totalQuantity||0)+$t('个')}}
+              <template v-if="shopData">
+                {{$t('{num}箱 {volume}m³ {weight}kg {quantity}个', {
+                  num: shopData.num || 0,
+                  volume: shopData.volume || 0,
+                  weight: shopData.weight || 0,
+                  quantity: shopData.quantity || 0
+                })}}
              </template>
             </el-form-item>
          </el-row>
-         <el-row>
-            <el-form-item :label="$t('入仓参数')+':'">
-              <span>{{(orderData.sumNum||0)+$t('箱')+(orderData.sumVolume||0)+'m³ '+(orderData.sumWeight||0)+'kg '+(orderData.sumQuantity||0) +$t('个')}}</span>
+         <el-row v-if="shopData">
+            <el-form-item :label="$t('入仓参数')+':'" v-if="shopData.warehouseInInfoVO">
+              {{$t('{num}箱 {volume}m³ {weight}kg {quantity}个', {
+                  num: shopData.warehouseInInfoVO.cartonsNum || 0,
+                  volume: shopData.warehouseInInfoVO.volume || 0,
+                  weight: shopData.warehouseInInfoVO.weight || 0,
+                  quantity: shopData.warehouseInInfoVO.quantityAll || 0
+                })}}
+              <!-- <span>{{(orderData.sumNum||0)+$t('箱')+(orderData.sumVolume||0)+'m³ '+(orderData.sumWeight||0)+'kg '+(orderData.sumQuantity||0) +$t('个')}}</span> -->
             </el-form-item>
+            <template v-else>{{$t('无入仓数据')}}</template>
          </el-row>
          <el-row :span="12">
             <el-form-item :label="$t('异常描述')+':'">