Commit 9d225bad authored by xiaoyan's avatar xiaoyan

fix: 修复未装修列表不显示

parent 74720569
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<view class="info-wrap"> <view class="info-wrap">
<empty v-if="!list.length"></empty> <empty v-if="!list.length"></empty>
<view v-for="(item, index) in filteredList" :key="index" class="item"> <view v-if="filteredList.length" v-for="(item, index) in filteredList" :key="index" class="item">
<view :class="'order-' + item.orderNo == heightLightId ? 'bg-yellow info-content' : 'bg-white info-content'"> <view :class="'order-' + item.orderNo == heightLightId ? 'bg-yellow info-content' : 'bg-white info-content'">
<view> <view>
<view> <view>
...@@ -68,17 +68,17 @@ ...@@ -68,17 +68,17 @@
<view class="content"> <view class="content">
<text class="text-blue" @tap="showOrderDetail(true, item.orderId)">{{item.orderNo}}</text> <text class="text-blue" @tap="showOrderDetail(true, item.orderId)">{{item.orderNo}}</text>
<!-- 调仓 --> <!-- 调仓 -->
<text v-if="item.orderItemDOS" v-for="prod in item.orderItemDOS" :key="prod.orderItemId" style="color:blue;fontWeight:bold;margin: 0 3px;"> <text v-for="prod in item.orderItemDOS" :key="prod.orderItemId" style="color:blue;fontWeight:bold;margin: 0 3px;">
{{ prod.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}} {{ prod.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
</text> </text>
<text v-if="item.orderItemDOS" v-for="prod in item.orderItemDOS" :key="prod.orderItemId" style="color:red;fontWeight:bold;margin: 0 3px;"> <text v-for="prod in item.orderItemDOS" :key="prod.orderItemId" style="color:red;fontWeight:bold;margin: 0 3px;">
{{ prod.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}} {{ prod.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
</text> </text>
<!-- 报关方式 --> <!-- 报关方式 -->
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" style="color:red;fontWeight:bold;margin: 0 3px;" /> <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" style="color:red;fontWeight:bold;margin: 0 3px;" />
<!-- 包装类型 --> <!-- 包装类型 -->
<text v-if="item.orderItemDOS" v-for="(prod, index) in item.orderItemDOS" :key="prod.orderItemId" style="color:red;fontWeight:bold;margin: 0 3px;"> <text v-for="(prod, index) in 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!== order.orderItemDOS.length-1 ? ',':'' }} <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="prod.unit" />{{ index!== item.orderItemDOS.length-1 ? ',':'' }}
</text> </text>
<!-- 混箱 --> <!-- 混箱 -->
<text v-if="item.orderItemDOS&&item.orderItemDOS&&item.orderItemDOS.orderWarehouseInCreateReqVO&&item.orderItemDOS.orderWarehouseInCreateReqVO.orderWarehouseInItemDoList&&item.orderItemDOS.orderWarehouseInCreateReqVO.orderWarehouseInItemDoList.orderWarehouseInDetailsVOList&&item.orderItemDOS.orderWarehouseInCreateReqVO.orderWarehouseInItemDoList.orderWarehouseInDetailsVOList.length>0" style="color:red;fontWeight:bold;margin: 0 3px;">{{$t('混箱')}}</text> <text v-if="item.orderItemDOS&&item.orderItemDOS&&item.orderItemDOS.orderWarehouseInCreateReqVO&&item.orderItemDOS.orderWarehouseInCreateReqVO.orderWarehouseInItemDoList&&item.orderItemDOS.orderWarehouseInCreateReqVO.orderWarehouseInItemDoList.orderWarehouseInDetailsVOList&&item.orderItemDOS.orderWarehouseInCreateReqVO.orderWarehouseInItemDoList.orderWarehouseInDetailsVOList.length>0" style="color:red;fontWeight:bold;margin: 0 3px;">{{$t('混箱')}}</text>
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<view> <view>
<view class="label">{{$t('商品信息')}}: </view> <view class="label">{{$t('商品信息')}}: </view>
<view class="content"> <view class="content">
<div v-if="item.orderItemDOS" v-for="(prod, index) in item.orderItemDOS" :key="item.orderItemId"> <div v-for="(prod, index) in item.orderItemDOS" :key="item.orderItemId">
{{index + 1}}、{{ $l(prod, 'prodTitle') }} {{index + 1}}、{{ $l(prod, 'prodTitle') }}
</div> </div>
</view> </view>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<view> <view>
<view class="label">{{$t('纸箱尺寸')}}: </view> <view class="label">{{$t('纸箱尺寸')}}: </view>
<view class="content"> <view class="content">
<div v-if="item.orderItemDOS" v-for="item in item.orderItemDOS.filter(item => !!item.warehouseInInfoVO)" :key="item.orderItemId"> <div v-for="item in item.orderItemDOS.filter(item => !!item.warehouseInInfoVO)" :key="item.orderItemId">
{{ item.warehouseInInfoVO.boxGauge }} {{ item.warehouseInInfoVO.boxGauge }}
</div> </div>
</view> </view>
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<view> <view>
<view class="label">{{$t('储位')}}: </view> <view class="label">{{$t('储位')}}: </view>
<view class="content"> <view class="content">
<div v-if="item.orderItemDOS" v-for="item in item.orderItemDOS.filter(item => !!item.warehouseInInfoVO).filter(item => !!item.warehouseInInfoVO)" :key="item.orderItemId"> <div v-for="item in item.orderItemDOS.filter(item => !!item.warehouseInInfoVO).filter(item => !!item.warehouseInInfoVO)" :key="item.orderItemId">
{{ notset(getpositionNo(item.warehouseInInfoVO.orderLocationMergeVOSet)) }} {{ notset(getpositionNo(item.warehouseInInfoVO.orderLocationMergeVOSet)) }}
</div> </div>
</view> </view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment