fix: 装柜装箱增加属性

src/views/ecw/box/shippingAir/nodePage/cabinet/startPacking.vue

@@ -67,6 +67,13 @@
                   </div>
                 </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="hasRelationOrder" width="120">
                 <template slot-scope="scope">
                   <el-link type="primary" v-if="scope.row.hasRelationOrder" @click.native="showRelatedOrder(scope.row)">{{ $t('有') }}</el-link>
@@ -93,6 +100,11 @@
                   {{getTotlContent(scope.row,['weight'])}}
                 </template>
               </el-table-column>
+              <el-table-column :label="$t('储位')" align="center" prop="positionNo">
+                <template slot-scope="scope">
+                  {{notset(scope.row.positionNo)}}
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                   <el-button type="text" size="small" @click="moveOut(scope.row)" v-if="!isUnderReview && scope.row.installNum === 0">{{$t('移出')}}</el-button>
@@ -364,6 +376,23 @@ export default {
         this.newshipmentObj = data ?? {};
       });
     },
+    //去重
+    notset(string) {
+      if (!string) return string
+      let arr = string.split(',')
+      arr = arr.filter((item, index) => {
+        return arr.indexOf(item) == index
+      })
+      return arr.toString()
+    },
+    getpositionNo(arr){
+      if(!arr) return arr
+      let data = []
+      arr.forEach(item=>{
+        data.push(item.areaName+item.locationName)
+      })
+      return data.toString()
+    },
     /* 装柜部分列表 */
     getLoadSecGoodsList() {
       loadSecGoodsList({ shipmentId: this.shipmentObj.id }).then((res) => {

src/views/ecw/box/shippingAir/nodePage/mergePkg/pkgPage.vue

@@ -87,6 +87,26 @@
               />
             </template>
           </el-table-column>
+          <el-table-column :label="$t('报关方式')" align="center" prop="customsType">
+            <template slot-scope="scope">
+              <div :class="scope.row.customsType !== 1 ? 'custom_type_red' : ''">
+                <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+              </div>
+            </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="hasRelationOrder" width="120">
+            <template slot-scope="scope">
+              <el-link type="primary" v-if="scope.row.hasRelationOrder" @click.native="showRelatedOrder(scope.row)">{{ $t('有') }}</el-link>
+              <span v-else>{{ $t('无') }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             :label="$t('计划/已装')"
             align="center"
@@ -94,7 +114,7 @@
           >
             <template slot-scope="scope">
               <el-link type="primary" @click.native="orderClick(scope.row)">
-                {{ scope.row.sumNum }}/{{ scope.row.installNum }}
+                {{ scope.row.sumNum }}/{{ scope.row.installNum }} <span v-if="scope.row.mixStatus === 1">（{{$t('混箱')}}）</span>
               </el-link>
             </template>
           </el-table-column>

src/views/ecw/box/shippingAir/nodePage/mergePkg/unPkgPage.vue

@@ -25,9 +25,29 @@
               <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="row.productRecord" />
             </template>
           </el-table-column>
+          <el-table-column :label="$t('报关方式')" align="center" prop="customsType">
+            <template slot-scope="scope">
+              <div :class="scope.row.customsType !== 1 ? 'custom_type_red' : ''">
+                <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+              </div>
+            </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="hasRelationOrder" width="120">
+            <template slot-scope="scope">
+              <el-link type="primary" v-if="scope.row.hasRelationOrder" @click.native="showRelatedOrder(scope.row)">{{ $t('有') }}</el-link>
+              <span v-else>{{ $t('无') }}</span>
+            </template>
+          </el-table-column>
           <el-table-column :label="$t('箱数')" align="center" prop="sumNum">
             <template slot-scope="scope">
-             {{ scope.row.sumNum }}
+             {{ scope.row.sumNum }}<span v-if="scope.row.mixStatus === 1">（{{$t('混箱')}}）</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('纸箱尺寸')" align="center">

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -67,6 +67,13 @@
                   </div>
                 </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="hasRelationOrder" width="120">
                 <template slot-scope="scope">
                   <el-link type="primary" v-if="scope.row.hasRelationOrder" @click.native="showRelatedOrder(scope.row)">{{ $t('有') }}</el-link>
@@ -93,6 +100,11 @@
                   {{getTotlContent(scope.row,['weight'])}}
                 </template>
               </el-table-column>
+              <el-table-column :label="$t('储位')" align="center" prop="positionNo">
+                <template slot-scope="scope">
+                  {{notset(scope.row.positionNo)}}
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                   <el-button type="text" size="small" @click="moveOut(scope.row)" v-if="!isUnderReview && scope.row.installNum === 0">{{$t('移出')}}</el-button>
@@ -364,6 +376,23 @@ export default {
         this.newshipmentObj = data ?? {};
       });
     },
+    //去重
+    notset(string) {
+      if (!string) return string
+      let arr = string.split(',')
+      arr = arr.filter((item, index) => {
+        return arr.indexOf(item) == index
+      })
+      return arr.toString()
+    },
+    getpositionNo(arr){
+      if(!arr) return arr
+      let data = []
+      arr.forEach(item=>{
+        data.push(item.areaName+item.locationName)
+      })
+      return data.toString()
+    },
     /* 装柜部分列表 */
     getLoadSecGoodsList() {
       loadSecGoodsList({ shipmentId: this.shipmentObj.id }).then((res) => {