Commit d69ab0f4 authored by Administrator's avatar Administrator

Merge branch 'release' into 'jd_dev'

Release分支代码合并到jd分支20241218

See merge request !10
parents 34db5d44 0502a2c3
......@@ -15,7 +15,9 @@
<view class="flex-sub">{{$t('用途')}}</view>
<view class="flex-sub">{{$t("数量")}}</view>
</view>
<view v-for="(v, index) in warehouseList" :key="'order-' + index">
<view v-for="(order, index) in warehouseList" :key="'order-' + index">
<view v-for="(item, index) in order.orderWarehouseInBackItemDoList" :key="'item-' + index">
<view v-for="(v, index) in item.orderWarehouseInDetailsVOList" :key="'order-' + index">
<view class="flex text-center padding-sm" :key="'goods-' + index">
<view class="flex-sub">{{ $lang.locale==='zh-Hans'? v.prodTitleZh:v.prodTitleEn }}</view>
<view class="flex-sub">
......@@ -25,7 +27,9 @@
<view class="flex-sub"><dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="v.material" /></view>
<view class="flex-sub">{{ getProductNamesByIds(v.prodAttrIds) }}</view>
<view class="flex-sub">{{ getProductUsageByIds(v.usageIds) }}</view>
<view class="flex-sub">{{ v.num }}</view>
<view class="flex-sub">{{ v.quantityAll }}</view>
</view>
</view>
</view>
</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