Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -142,12 +142,12 @@
                         {{$l(row,'prodTitle')}}
                       </template>
                     </el-table-column>
-                    <el-table-column :label="$t('箱数')" align="center" prop="num" />
+                    <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum" />
                     <el-table-column :label="$t('体积') + '/' + $t('重量') + '/' + $t('重货比')" align="center" width="140" prop="volumeWeight">
                       <template slot-scope="scope">
-                        <p v-if="scope.row.volume">{{getTotlContent(scope.row,['volume'])}}</p>
-                        <p v-if="scope.row.weight">{{getTotlContent(scope.row,['weight'])}}</p>
-                        <p>{{getRatioMax(scope.row)}}</p>
+                        <p v-if="scope.row.warehouseInInfoVO.volume">{{getTotlContent(scope.row.warehouseInInfoVO,['volume'])}}</p>
+                        <p v-if="scope.row.warehouseInInfoVO.weight">{{getTotlContent(scope.row.warehouseInInfoVO,['weight'])}}</p>
+                        <p>{{getRatioMax(scope.row.warehouseInInfoVO)}}</p>
                       </template>
                     </el-table-column>
                     <el-table-column :label="$t('报关方式')" align="center" prop="customsType" width="120">
@@ -248,13 +248,15 @@
                 </el-table-column>
                 <el-table-column :label="$t('备案')" align="center" prop="feeType">
                   <template slot-scope="{row}">
-                    <template>{{row.brandName}}</template>{{ $t('（') }}<dict-tag :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL" :value="row.feeType" />{{ $t('）') }}</template>
+                    <template>{{row.brandName}}</template>{{ $t('（') }}
+                    <dict-tag :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL" :value="row.feeType" />{{ $t('）') }}
+                  </template>
                 </el-table-column>
-                <el-table-column :label="$t('箱数')" align="center" prop="num" />
+                <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum" />
                 <el-table-column :label="$t('体积') +'/' + $t('重量')" align="center" prop="volumeWeight">
                   <template slot-scope="scope">
-                    <p v-if="scope.row.volume">{{getTotlContent(scope.row,['volume'])}}</p>
-                    <p v-if="scope.row.weight">{{getTotlContent(scope.row,['weight'])}}</p>
+                    <p v-if="scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.volume">{{getTotlContent(scope.row.warehouseInInfoVO,['volume'])}}</p>
+                    <p v-if="scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.weight">{{getTotlContent(scope.row.warehouseInInfoVO,['weight'])}}</p>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('报关方式')" align="center" prop="">
@@ -264,7 +266,7 @@
                 </el-table-column>
                 <el-table-column :label="$t('包装类型')" align="center" prop="">
                   <template slot-scope="scope">
-                    <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="scope.row.unit" />
+                    <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.unit" />
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('材质')" align="center" prop="material">{{ $t('、') }}<template slot-scope="scope">
@@ -458,6 +460,19 @@ export default {
       params.shipmentId = this.shipmentObj.id;
       params.smartInstall = this.smartInstall;
       secGoodsList(params).then((res) => {
+        if (res.data) {
+          res.data.sectionGoodList.map((data) => {
+            if (data.sectionGoodsList) {
+              data.sectionGoodsList.map((data1) => {
+                data1.warehouseInInfoVO = data1.warehouseInInfo
+                  ? JSON.parse(data1.warehouseInInfo)
+                  : {};
+                return data1;
+              });
+            }
+            return data;
+          });
+        }
         this.preList = res.data;
         this.preLoading = false;
       });

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -56,10 +56,10 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('箱数')" align="center" prop="num">
+              <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfo.cartonsNum">
                 <template slot-scope="scope">
                   <el-link type="primary" @click.native="showWarehouseLogs(scope.row)">
-                    {{scope.row.num}}
+                    {{scope.row.warehouseInInfo.cartonsNum}}
                   </el-link>
                   <div style="color:blue;fontWeight:bold;">
                     {{ scope.row.multiSpecification === true ? '(多规格)' : ''}}
@@ -68,9 +68,9 @@
               </el-table-column>
               <el-table-column :label="$t('纸箱尺寸')" align="center" prop="warehouseInInfo.boxGauge">
               </el-table-column>
-              <el-table-column :label="$t('体积')" align="center" prop="volume">
+              <el-table-column :label="$t('体积')" align="center" prop="warehouseInInfo.volume">
               </el-table-column>
-              <el-table-column :label="$t('重量')" align="center" prop="weight">
+              <el-table-column :label="$t('重量')" align="center" prop="warehouseInInfo.weight">
               </el-table-column>
               <el-table-column :label="$t('数量（个）')" align="center" prop="quantity"></el-table-column>
               <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px"></el-table-column>