Merge branch 'dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-pda-master into release

src/pages/loading/detail.vue

@@ -37,17 +37,17 @@
             </view>
             <view :style="{ display: partClass(k) }" class="productsList">
               <view class="flex text-center text-black bg-white text-bold padding-sm">
-                <view style="width:24%;">{{$t('订单号')}}</view>
+                <view style="width:20%;">{{$t('订单号')}}</view>
                 <view style="width:12%;">{{$t('体积') + "(m³)"}}</view>
                 <view style="width:12%;">{{$t('重量') + "(kg)"}}</view>
                 <view style="width:12%;">{{$t('箱数')}}</view>
                 <view style="width:12%;">{{$t('储位')}}</view>
                 <view  style="width:12%;">{{$t('计划')}}/{{$t('实装')}}</view>
-                <view style="width:16%;">{{$t('操作')}}</view>
+                <view style="width:20%;">{{$t('操作')}}</view>
               </view>
               <view>
                 <view class="flex text-center 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-sub text-blue" style="width:24%;">
+                  <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('外部仓')+')') : ''}}
@@ -83,7 +83,7 @@
                   <view style="width:12%;" @click="showUnload(true, order.orderId)">
                   <text style="width:12%;">{{ order.num }}</text>/<text :class="actualClass(order.num, order.installNum)">{{ order.installNum }}</text>
                   </view>
-                  <view class="flex justify-center" style="width:16%;">
+                  <view class="flex justify-center" style="width:20%;">
                     <view class="text-green text-bold" v-if="order.installNum == 0" @click.stop="moveOut(order)">
                       {{$t('移出')}}
                     </view>
@@ -1387,4 +1387,7 @@ export default {
 .scroll-view{
   height: calc(100vh - 44px - 75px);
 }
+.text-break {
+  word-break: break-word;
+}
 </style>

src/pages/tally/detail.vue

@@ -40,7 +40,7 @@
                       {{ order.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
                     </view>
                     <!-- 品牌 -->
-                    <view v-if="order.goodsList.some(ele => ele.brandType && [$t('无牌'), $t('有牌'), $t('中性')][ele.brandType] !== $t('无牌'))" style="color:red;fontWeight:bold;">{{ $t('有牌') }}</view>
+                    <view v-if="order.goodsList.some(ele => ele.feeType && [$t('无牌'), $t('有牌'), $t('中性')][ele.feeType] !== $t('无牌'))" style="color:red;fontWeight:bold;">{{ $t('有牌') }}</view>
                     <!-- 特性 -->
                     <view v-for="prod in uniqueArr(order.goodsList)" :key="prod.orderItemId" style="color:red;fontWeight:bold;">{{ getProductAttrsByIds(prod.warehouseInProdAttrIds) }}</view>
                     <!-- 报关方式 -->

src/pages/tallyAir/detail.vue

@@ -52,7 +52,7 @@
                       {{ order.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
                     </view>
                     <!-- 品牌 -->
-                    <view v-if="order.goodsList.some(ele => ele.brandType && [$t('无牌'), $t('有牌'), $t('中性')][ele.brandType] !== $t('无牌'))" style="color:red;fontWeight:bold;">{{ $t('有牌') }}</view>
+                    <view v-if="order.goodsList.some(ele => ele.feeType && [$t('无牌'), $t('有牌'), $t('中性')][ele.feeType] !== $t('无牌'))" style="color:red;fontWeight:bold;">{{ $t('有牌') }}</view>
                     <!-- 特性 -->
                     <view v-for="prod in uniqueArr(order.goodsList)" :key="prod.orderItemId" style="color:red;fontWeight:bold;">{{ getProductAttrsByIds(prod.warehouseInProdAttrIds) }}</view>
                     <!-- 报关方式 -->