Merge branch 'release' into 'jd_dev'

Release分支合并到jd分支0122

See merge request !23

src/pages/mergePkg/package.vue

@@ -68,11 +68,11 @@
                 <view class="content">
                   <text class="text-blue" @tap="showOrderDetail(true, item.orderId)">{{item.orderNo}}</text>
                   <!-- 调仓 -->
-                  <text v-for="prod in item.orderItemDOS" :key="prod.orderItemId" style="color:blue;fontWeight:bold;margin: 0 3px;">
-                    {{ prod.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
+                  <text style="color:blue;fontWeight:bold;margin: 0 3px;">
+                    {{ item.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
                   </text>
-                  <text v-for="prod in item.orderItemDOS" :key="prod.orderItemId" style="color:red;fontWeight:bold;margin: 0 3px;">
-                    {{ prod.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
+                  <text style="color:red;fontWeight:bold;margin: 0 3px;">
+                    {{ item.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
                   </text>
                   <!-- 品牌 -->
                   <text v-if="item.orderItemDOS&&item.orderItemDOS.some(ele => [$t('无牌'), $t('有牌'), $t('中性')][ele.feeType] !== $t('无牌'))" style="color:red;fontWeight:bold;margin: 0 3px;">{{ $t('有牌') }}</text>
@@ -83,8 +83,8 @@
                     <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" style="color:red;fontWeight:bold;margin: 0 3px;" />
                   </text>
                   <!-- 包装类型 -->
-                  <text v-for="(prod, index) in uniqueArr(item.orderItemDOS)" :key="prod.orderItemId" style="color:red;fontWeight:bold;margin: 0 3px;">
-                    <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="prod.unit" />{{ index!== uniqueArr(item.orderItemDOS).length-1 ? ',':'' }}
+                  <text v-for="(unit, index) in item.units.split(',')" :key="index" style="color:red;fontWeight:bold;margin: 0 3px;">
+                    <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== item.units.split(',').length-1 ? ',':'' }}
                   </text>
                   <!-- 关联单 -->
                   <text v-if="item.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(item.orderId)">{{$t('关联单')}}</text>