Merge branch 'release' into 'jd_dev'

Release代码合并到jd20241210

See merge request !6

src/pages/loading/detail.vue

@@ -58,14 +58,14 @@
                     </view>
                      <!-- 包装类型 -->
                     <view style="color:red;fontWeight:bold;">
-                      <text v-for="(prod, index) in order.goodsList" :key="prod.orderItemId">
-                        <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="prod.unit" />{{ index!== order.goodsList.length-1 ? ',':'' }}
+                      <text v-for="(unit, index) in order.units.split(',')" :key="index">
+                        <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== order.units.split(',').length-1 ? ',':'' }}
                       </text>
                     </view>
                     <!-- 关联单 -->
-                    <view v-if="order.guanLianOrderStatusVOList&&order.guanLianOrderStatusVOList.length>0" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
+                    <view v-if="order.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
                     <!-- 混箱 -->
-                    <view v-if="order.goodsList&&order.goodsList.length>1" style="color:red;fontWeight:bold;" @tap="showWarehouseLogs(order)">{{$t('混箱')}}</view>
+                    <view v-if="order.mixStatus=== 1" style="color:red;fontWeight:bold;" @tap="showWarehouseLogs(order)">{{$t('混箱')}}</view>
                   </view>
                   <view style="width:12%;">{{ order.volume | toFixed }}</view>
                   <view style="width:12%;">{{ order.weight | toFixed }}</view>

src/pages/mergePkg/api.js

@@ -151,7 +151,7 @@ export const getChannelList = (params = {}) => {
 }
 
 /**
- * 获得空运待遇装列表
+ * 获得空运待预装列表
  */
 export function preloadPageAir(params) {
   return http('/ecw/box-preload-goods/preloadPageAir', params, {

src/pages/mergePkg/patch.vue

@@ -105,7 +105,7 @@
         <view class="cu-item">
           <view class="content">
             <text>{{$t('可出特性')}}：</text>
-            <text>{{ order.attrNameList ? order.attrNameList.join(',') : '' }}</text>
+            <text>{{ order.attrNameList ? order.attrNameList.filter(v => v).join(',') : '' }}</text>
           </view>
         </view>
       </view>

src/pages/tally/detail.vue

@@ -45,14 +45,14 @@
                     </view>
                      <!-- 包装类型 -->
                     <view style="color:red;fontWeight:bold;">
-                      <text v-for="(prod, index) in uniqueArr(order.goodsList)" :key="prod.orderItemId">
-                        <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="prod.unit" />{{ index!== uniqueArr(order.goodsList).length-1 ? ',':'' }}
+                      <text v-for="(unit, index) in order.units.split(',')" :key="index">
+                        <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== order.units.split(',').length-1 ? ',':'' }}
                       </text>
                     </view>
                     <!-- 关联单 -->
-                    <view v-if="order.guanLianOrderStatusVOList&&order.guanLianOrderStatusVOList.length>0" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
+                    <view v-if="order.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
                     <!-- 混箱 -->
-                    <view v-if="order.goodsList&&order.goodsList.length>1" style="color:red;fontWeight:bold;" @tap="showWarehouseList(order)">{{$t('混箱')}}</view>
+                    <view v-if="order.mixStatus === 1" style="color:red;fontWeight:bold;" @tap="showWarehouseList(order)">{{$t('混箱')}}</view>
                   </view>
                   <view style="width:15%;">{{ order.volume | toFixed }} m³</view>
                   <view style="width:15%;">{{ order.weight | toFixed }} kg</view>
@@ -539,7 +539,7 @@ export default {
     toPatch() {
       const { boxInfo } = this.loadData;
       uni.navigateTo({
-        url: `../mergePkg/patch?id=${this.shipmentId}&selfNo=${boxInfo.selfNo}`,
+        url: `../loading/patch?id=${this.shipmentId}&destWarehouseId=${boxInfo.destWarehouseId}`,
       });
     },
     /* 理货完成 */

src/pages/tallyAir/detail.vue

@@ -43,8 +43,8 @@
               </view>
               <view class="padding-sm" :id="'order-' + order.orderNo" :class="'order-' + order.orderNo == heightLightId ? 'bg-yellow' : 'bg-white'" v-for="(order, key) in v.sectionOrderList" :key="key">
                 <view class="flex text-center">
-                  <view class="text-break text-blue" style="width:20%;" @tap="showOrderDetail(true, order.orderId)">
-                    <view>{{ order.orderNo }}</view>
+                  <view class="text-break text-blue" style="width:20%;">
+                    <view @tap="showOrderDetail(true, order.orderId)">{{ order.orderNo }}</view>
                     <view style="color:blue;fontWeight:bold;">
                       {{ order.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
                     </view>
@@ -57,14 +57,14 @@
                     </view>
                      <!-- 包装类型 -->
                     <view style="color:red;fontWeight:bold;">
-                      <text v-for="(prod, index) in uniqueArr(order.goodsList)" :key="prod.orderItemId">
-                        <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="prod.unit" />{{ index!== uniqueArr(order.goodsList).length-1 ? ',':'' }}
+                      <text v-for="(unit, index) in order.units.split(',')" :key="index">
+                        <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== order.units.split(',').length-1 ? ',':'' }}
                       </text>
                     </view>
                     <!-- 关联单 -->
-                    <view v-if="order.guanLianOrderStatusVOList&&order.guanLianOrderStatusVOList.length>0" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
+                    <view v-if="order.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
                     <!-- 混箱 -->
-                    <view v-if="order.goodsList&&order.goodsList.length>1" style="color:red;fontWeight:bold;" @tap="showWarehouseList(order)">{{$t('混箱')}}</view>
+                    <view v-if="order.mixStatus === 1" style="color:red;fontWeight:bold;" @tap="showWarehouseList(order)">{{$t('混箱')}}</view>
                   </view>
                   <view style="width:15%;">{{ order.volume | toFixed }} m³</view>
                   <view style="width:15%;">{{ order.weight | toFixed }} kg</view>

src/util/config.js

@@ -18,7 +18,8 @@ if (process.env.NODE_ENV === 'development') {
 /**
  * 配置api基础路径
  */
-let apiBaseUrl = 'https://api2.groupage.cn/'
+// let apiBaseUrl = 'https://api2.groupage.cn/'
+let apiBaseUrl = 'https://apitest.groupage.cn/'
 // let apiBaseUrl = 'https://api.jd.qipx.top/'
 //let apiBaseUrl = 'http://192.168.1.13:48080/'
 let localApiBaseUrl = uni.getStorageSync("localApiBaseUrl")