1、已到箱数/总箱数、送货日期、填单货物属性、入库货物属性/体积/重量、货物状态为空；2、顶部文案要改为调拨到仓；3、出货渠道目测写死了 bug修复

src/views/ecw/order/transferWarehousing.vue

@@ -8,7 +8,7 @@
     <el-divider content-position="left">
       货物信息
     </el-divider>
-    <el-table :show-summary="true" :summary-method="totalFn" :data=" orderDetails.orderItemVOList &&  orderDetails.orderItemVOList.length > 0  ? orderDetails.orderItemVOList : [] ">
+    <el-table :show-summary="true" :summary-method="totalFn" :data="orderItemVOList">
       <el-table-column width="80" type="index" label="序号"></el-table-column>
       <el-table-column label="品名">
         <template v-slot="{row}">
@@ -18,32 +18,30 @@
       </el-table-column>
       <el-table-column label="填单货物属性">
         <template v-slot="{row}">
-          <el-descriptions size="mini" :column="2">
-            <el-descriptions-item label="品牌">{{ row.brand }}</el-descriptions-item>
-            <el-descriptions-item label="箱数">{{ row.num }}</el-descriptions-item>
-            <el-descriptions-item label="体积">{{ row.volume }}m³</el-descriptions-item>
-            <el-descriptions-item label="重量">{{row.weight}}Kg</el-descriptions-item>
-          </el-descriptions>
+        <div>品牌：{{ row.brand }}</div><div>箱数：{{row.num}}</div><div>体积：{{ row.volume }}m³</div><div>重量{{row.weight}}Kg</div>
         </template>
       </el-table-column>
       <el-table-column label="入库货物属性">
         <template v-slot="{row}">
-          <el-descriptions size="mini" :column="2">
-            <el-descriptions-item label="品牌">{{ row.brand }}</el-descriptions-item>
-            <el-descriptions-item label="箱数"> {{  row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum :'' }}</el-descriptions-item>
-            <el-descriptions-item label="体积">{{  row.warehouseInInfoVO ? row.warehouseInInfoVO.volume :'' }}m³</el-descriptions-item>
-            <el-descriptions-item label="重量"> {{row.warehouseInInfoVO ? row.warehouseInInfoVO.weight : '' }}Kg</el-descriptions-item>
-          </el-descriptions>
+          <div v-for="(item,index) in row.orderWarehouseInBackItemDoList" :key="index">
+            <div>规格：{{item.boxGauge}}</div>
+            <div style="display: flex;justify-content: space-between;">
+              <div>品牌：{{row.brand}}</div>
+              <div>箱数：{{item.cartonsNum}}</div>
+              <div>体积：{{item.volume}} CMB</div>
+              <div>重量：{{item.weight}}KG</div>
+            </div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="最后操作时间">
            <template v-slot="{row}">
-             {{parseTime(row.createTime)}}
+             {{parseTime(row.updateTime)}}
            </template>
       </el-table-column>
       <el-table-column label="状态">
         <template v-slot="{row}">
-          <dict-tag :value=" row.warehouseInInfoVO ? row.warehouseInInfoVO.diffType :''" :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS"/>
+          {{calculationStatus(row.cartonsNumDiff)}}
         </template>
       </el-table-column>
     </el-table>
@@ -65,10 +63,6 @@
             {{STATUS[row.status]}}
         </template>
       </el-table-column>
-      <el-table-column label="操作">
-        <template v-slot="{row}">
-        </template>
-      </el-table-column>
     </el-table>
     <el-descriptions style="margin-top: 20px" :column="4" border>
       <el-descriptions-item label="集运仓库">{{ warehouseDetails && warehouseDetails.warehouseOutName  ?  warehouseDetails.warehouseOutName : '' }}</el-descriptions-item>
@@ -149,7 +143,7 @@ import ordeDetailsForm from "@/views/ecw/order/components/ordeDetailsForm";
 import {
   cancelAdjust,
   getAdjustInfo,
-  getOrder, listByOrderId,
+  getOrder, getOrderWarehouseIn, listByOrderId,
   orderWarehouseInGetAdjustInfo,
   orderWarehousePicturePage, warehouseAdjustArrived,
   warehouseAdjustSendOut
@@ -202,7 +196,8 @@ export default {
       warehouseInShi:0,
       expressList:[],
       storageSpaceList:[],
-      applyStatus:{}
+      applyStatus:{},
+      orderItemVOList:[]
 
     }
   },
@@ -239,6 +234,17 @@ export default {
         urls: this.params.urls,
 
       }
+    },
+    calculationStatus(){
+      return (val)=>{
+        if(val > 0){
+          return `多${val}箱`
+        }else if(val < 0){
+           return `少${Math.abs(val)}箱`
+        }else {
+          return '准确到齐 '
+        }
+      }
     }
   },
   created() {
@@ -295,6 +301,11 @@ export default {
         }
       })
     })
+    getOrderWarehouseIn(this.orderId).then(r => {
+      if(r.code === 0){
+        this.orderItemVOList = r.data;
+      }
+    })
   },
   methods:{
     submit(){
@@ -323,9 +334,11 @@ export default {
          volume += Number(i.volume)
          num += Number(i.num)
          weight += Number(i.weight)
-         Wvolume += Number(i.warehouseInInfoVO ? i.warehouseInInfoVO.volume : 0);
-         Wnum += Number(i.warehouseInInfoVO ? i.warehouseInInfoVO.cartonsNum : 0)
-         Wweight += Number(i.warehouseInInfoVO ? i.warehouseInInfoVO.weight : 0)
+        i.orderWarehouseInBackItemDoList.forEach(m => {
+          Wvolume += Number(m.volume || 0)
+          Wnum += Number(m.cartonsNum || 0)
+          Wweight += Number(m.weight || 0)
+        })
        })
       let text = `下单统计：${num}箱 ${volume}m³ ${weight}Kg`
       let text2 =` 入仓统计：${Wnum}箱 ${Wvolume}m³ ${Wweight}Kg`
@@ -350,10 +363,6 @@ export default {
           }
         })
       }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消成功'
-        });
       });
     },
   },