feature: 理货增加包装类型

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

@@ -80,6 +80,13 @@
                   <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brand" />
                 </template>
               </el-table-column>
+              <el-table-column :label="$t('包装类型')" align="center" prop="">
+                <template slot-scope="scope">
+                  <span v-for="(unit,index) in scope.row.units.split(',')" :key="index">
+                    <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" /><span v-if="index<scope.row.units.split(',').length-1">, </span>
+                  </span>
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('特性')" align="center" prop="warehouseInAttrNameList" width="120">
                 <template slot-scope="scope">
                   {{scope.row.warehouseInAttrNameList?scope.row.warehouseInAttrNameList.toString():""}}

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

@@ -63,8 +63,16 @@
                 </template>
               </el-table-column>
               <el-table-column :label="$t('品牌')" align="center">
-                <template v-if="scope.row.brand && scope.row.brandName!=='无' && scope.row.brandName!=='无牌'" slot-scope="scope">
-                  <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brand"></dict-tag>
+                <template v-if="scope.row.brandName && scope.row.brandName!=='无' && scope.row.brandName!=='无牌'" slot-scope="scope">
+                  <template v-if="scope.row.brandName">{{scope.row.brandName}}</template>
+                  <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brand" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('包装类型')" align="center" prop="">
+                <template slot-scope="scope">
+                  <span v-for="(unit,index) in scope.row.units.split(',')" :key="index">
+                    <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" /><span v-if="index<scope.row.units.split(',').length-1">, </span>
+                  </span>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('特性')" align="center" prop="warehouseInAttrNameList" width="120">