拆单申请bug

src/views/ecw/order/singleApply.vue

@@ -24,11 +24,11 @@
             <el-descriptions-item :label="$t('出货渠道')">
                   {{orderData.channelId?getChannelName(orderData.channelId):'/'}}
             </el-descriptions-item>
-            <el-descriptions-item :label="$t('始发地')" :span="2">
-                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
+            <el-descriptions-item :label="$t('始发地')" >
+                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item :label="$t('目的地')">
-               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
+            <el-descriptions-item :label="$t('目的地')" :span="2">
+               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destTitleZh:$t('无')}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('发货人姓名')">
                 {{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}

src/views/ecw/order/splitApply.vue

@@ -27,11 +27,11 @@
           <el-descriptions-item :label="$t('运输方式')">
               <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
           </el-descriptions-item>
-          <el-descriptions-item :label="$t('始发地')" :span="2">
-               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
+          <el-descriptions-item :label="$t('始发地')" >
+               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:$t('无')}}
           </el-descriptions-item>
-          <el-descriptions-item :label="$t('目的地')">
-             {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
+          <el-descriptions-item :label="$t('目的地')" :span="2">
+             {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destTitleZh:$t('无')}}
           </el-descriptions-item>
           <el-descriptions-item :label="$t('发货人姓名')">
               {{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}
@@ -92,7 +92,7 @@
         <el-table-column :label="$t('入库货物属性')" align="center" width="400">
             <template slot-scope="scope">
               <el-row>
-                <span>{{$t('规格')}}：{{scope.row.boxGauge}}</span>
+                <span>{{$t('规格')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.boxGauge:0}}</span>
               </el-row>
               <el-row>
                 <span>{{$t('品牌')}}：
@@ -229,7 +229,7 @@
                     {{shopForm.sum||0}}
                  </el-form-item>
                  <el-form-item :label="$t('放入箱数:')">
-                    <el-input-number v-model="shopForm.num" controls-position="right"  :min="1" :max="shopForm.sum-1"></el-input-number>
+                    <el-input-number v-model="shopForm.num" controls-position="right"  :min="1" :max="shopForm.sum"></el-input-number>
                  </el-form-item>
                  <el-form-item :label="$t('备注信息:')">
                     <el-input v-model="shopForm.remarks"></el-input>
@@ -335,7 +335,6 @@ export default {
             const tds = document.querySelectorAll(
               "#table .el-table__footer-wrapper tr>td"
             );
-            console.log(tds)
             // colSpan合并列
             tds[1].colSpan = 5;
             tds[1].style.textAlign = "left";
@@ -381,7 +380,7 @@ export default {
       getSplitList(this.queryParams).then(response => {
         this.splitData = response.data.orderSplitBackVOList
         if(response.data.orderApprovalBackVO){
-                  this.orderApprovalBackVO = response.data.orderApprovalBackVO
+            this.orderApprovalBackVO = response.data.orderApprovalBackVO
         }
 
         this.loading = false;
@@ -394,7 +393,6 @@ export default {
       this.query.warehouseIds = this.form.destWarehouseId
     },
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-      console.log(rowIndex)
       if (rowIndex==this.orderData.orderItemVOList.length) {
         if (columnIndex === 1) {
           return [2, 3];
@@ -424,7 +422,7 @@ export default {
           leviteV += column.warehouseInInfoVO?column.warehouseInInfoVO.volume:0
           leviteW += column.warehouseInInfoVO?column.warehouseInInfoVO.weight:0
       });
-      sums[1] = this.$t('下单统计')+' '+ orderSum+' '+this.$t('箱')+' '+ orderV +' m³ ' + orderW + ' kg ' + ' '+this.$t('入仓统计：')+ leviteSum+' '+this.$t('箱')+' '+ leviteV +' m³ ' + leviteW + ' kg'
+      sums[1] = this.$t('下单统计')+' '+ orderSum+' '+this.$t('箱')+' '+ orderV.toFixed(2) +' m³ ' + orderW + ' kg ' + ' '+this.$t('入仓统计：')+ leviteSum+' '+this.$t('箱')+' '+ leviteV.toFixed(2) +' m³ ' + leviteW + ' kg'
 
       return sums;
     },

src/views/ecw/order/weightDeal.vue

@@ -74,7 +74,7 @@
             </el-table-column>
             <el-table-column :label="$t('入库货物属性')" align="center" >
               <template slot-scope="scope">
-                 <span>{{$t('箱规')}}：{{scope.row.boxGauge||0}}</span>
+                 <span>{{$t('箱规')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.boxGauge:0}}</span>
                  <p>
                   <span>{{$t('品牌')}}：{{getBrand(scope.row.brand)}}&nbsp;&nbsp;</span>
                   <span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}&nbsp;&nbsp;</span>