订单详情中的到仓详情页面修改

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

@@ -83,13 +83,20 @@ export default {
         volume: new Decimal(0),
         quantity: new Decimal(0)
       }
-      // 入仓数据
+      // 装柜/出货数据
       let warehouseInData = {
         num: new Decimal(0),
         weight: new Decimal(0),
         volume: new Decimal(0),
         quantity: new Decimal(0)
       }
+      // 到仓数据
+      let toWarehouseData = {
+        checkNum: new Decimal(0),
+        checkWeight: new Decimal(0),
+        checkVolume: new Decimal(0),
+        checkQuantity: new Decimal(0)
+      }
       // 收费数据
       let chargeData = {
         weight: new Decimal(0),
@@ -107,19 +114,19 @@ export default {
           warehouseInData.volume = warehouseInData.volume.plus(item.warehouseInInfoVO.volume || 0)
           warehouseInData.quantity = warehouseInData.quantity.plus(item.warehouseInInfoVO.quantityAll || 0)
         }
+        toWarehouseData.checkNum = toWarehouseData.checkNum.plus(item.checkNum || 0)
+        toWarehouseData.checkWeight = toWarehouseData.checkWeight.plus(item.checkWeight || 0)
+        toWarehouseData.checkVolume = toWarehouseData.checkVolume.plus(item.checkVolume || 0)
+        toWarehouseData.checkQuantity = toWarehouseData.checkQuantity.plus(item.checkQuantity || 0)
         chargeData.weight = chargeData.weight.plus(item.chargeWeight || 0)
         chargeData.volume = chargeData.volume.plus(item.chargeVolume || 0)
       })
-      const summary = Array(19).fill(null)
+      const summary = Array(8).fill(null)
       summary[3] = this.$t("合计")
       // 入仓
       summary[4] = `${warehouseInData.num}${this.$t('箱')} ${warehouseInData.weight}KG ${warehouseInData.volume}m³ ${warehouseInData.quantity}${this.$t('个')}`
-      // 货值
-      summary[7] = worth.toNumber()
-      // 收费数九
-      summary[10] = `${chargeData.weight}KG ${chargeData.volume}m³`
-      // 填单数据
-      summary[17] = `${fillData.num}${this.$t('箱')} ${fillData.weight}KG ${fillData.volume}m³ ${fillData.quantity}${this.$t('个')}`
+      // 到仓
+      summary[5] = `${toWarehouseData.checkNum}${this.$t('箱')} ${toWarehouseData.checkWeight}KG ${toWarehouseData.checkVolume}m³ ${toWarehouseData.checkQuantity}${this.$t('个')}`
       return summary
     }
   }
@@ -137,25 +144,25 @@ export default {
       <el-table-column :label="$t('序号')" width="90px">
         <template slot-scope="scope">{{scope.$index + 1}}</template>
       </el-table-column>
-      <el-table-column prop="prodTitleZh" :label="$t('品名')">
+      <el-table-column :label="$t('品名')">
           <template slot-scope="{row}">
             <span>{{ getProdTypeName(row.prodType) }}</span>
             <span>{{row.prodTitleZh}}/{{row.prodTitleEn}}</span>
           </template>
       </el-table-column>
       <!--<el-table-column prop="prodTitleEn" :label="$t('品名')" />-->
-      <el-table-column prop="brand" :label="$t('品牌')"  width="90px">
+      <el-table-column :label="$t('品牌')"  width="90px">
         <template slot-scope="{row}">
           <template v-if="row.brandName">{{row.brandName}}</template>
           <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
         </template>
       </el-table-column>
-      <el-table-column prop="brand" :label="$t('特性')"  width="90px">
+      <el-table-column :label="$t('特性')"  width="90px">
         <template slot-scope="{row}">
           {{showAttrText(row.warehouseInInfoVO ? row.warehouseInProdAttrIds : row.prodAttrIds)}}
         </template>
       </el-table-column>
-      <el-table-column prop="sumNum" :label="$t('装柜/出货信息')"  width="90px">
+      <el-table-column  :label="$t('装柜/出货信息')"  width="90px">
         <template slot-scope="{row}">
           <div v-if="row.warehouseInInfoVO">
             {{row.warehouseInInfoVO.cartonsNum}}{{$t('箱')}}