Skip to content

J
jiedao-app-pda-master
Commit 51be9569 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

feature: 装箱&出仓新增属性等

parent 873c6c7f
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 15 deletions
src/components/order-detail-modal/index.vue
View file @ 51be9569
...@@ -46,10 +46,10 @@ ...@@ -46,10 +46,10 @@
</view> </view>
<view> <view>
<view>{{$t('箱数')}}：{{ v.warehouseInInfoVO && v.warehouseInInfoVO.cartonsNum }}</view> <view>{{$t('箱数')}}：{{ v.warehouseInInfoVO && v.warehouseInInfoVO.cartonsNum }}</view>
<view>{{$t('体积')}}：{{ v.warehouseInInfoVO && v.warehouseInInfoVO.volume | toFixed }} CBM</view> <view>{{$t('体积')}}：{{ v.warehouseInInfoVO && toFixed(v.warehouseInInfoVO.volume) }} CBM</view>
</view> </view>
<view> <view>
<view>{{$t('重量')}}：{{ v.warehouseInInfoVO && v.warehouseInInfoVO.weight | toFixed }} kg</view> <view>{{$t('重量')}}：{{ v.warehouseInInfoVO && toFixed(v.warehouseInInfoVO.weight) }} kg</view>
<view> <view>
{{$t('储位')}}： {{$t('储位')}}：
<template v-if="v.warehouseInInfoVO && v.warehouseInInfoVO.orderLocationMergeVOSet"> <template v-if="v.warehouseInInfoVO && v.warehouseInInfoVO.orderLocationMergeVOSet">
...@@ -104,6 +104,7 @@ export default { ...@@ -104,6 +104,7 @@ export default {
}, },
methods: { methods: {
formatDate: util.formatDate, formatDate: util.formatDate,
toFixed: util.toFixed,
showOrderDetail(index) { showOrderDetail(index) {
this.$emit('close', false); this.$emit('close', false);
}, },
......
src/pages/airWarehouseOut/airStartcheckOut.vue
View file @ 51be9569
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<view style="color:blue;fontWeight:bold;"> <view style="color:blue;fontWeight:bold;">
{{ order.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}} {{ order.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
</view> </view>
<!-- 品牌 -->
<view v-if="order.goodsList.some(ele => ele.brandType && [$t('无牌'), $t('有牌'), $t('中性')][ele.brandType] !== $t('无牌'))" style="color:blue;fontWeight:bold;">{{ $t('有牌') }}</view>
<!-- 特性 -->
<view v-for="prod in order.goodsList" :key="prod.orderItemId" style="color:blue;fontWeight:bold;">{{prod.warehouseInAttrNameList?prod.warehouseInAttrNameList.toString():""}}</view>
<!-- 报关方式 -->
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" style="color:blue;fontWeight:bold;" />
</view> </view>
<view class="flex-sub">{{ order.volume | toFixed }} m³</view> <view class="flex-sub">{{ order.volume | toFixed }} m³</view>
<view class="flex-sub">{{ order.weight | toFixed }} kg</view> <view class="flex-sub">{{ order.weight | toFixed }} kg</view>
......
src/pages/mergePkg/package.vue
View file @ 51be9569
...@@ -63,19 +63,32 @@ ...@@ -63,19 +63,32 @@
</view> </view>
</view> </view>
<view> <view>
<view class="label">{{$t('订单号')}}: </view> <view>
<view class="content"> <view class="label">{{$t('订单号')}}: </view>
<text @tap="showOrderDetail(true, item.orderId)">{{item.orderNo}}</text> <view class="content">
<!-- 调仓 --> <text class="text-blue" @tap="showOrderDetail(true, item.orderId)">{{item.orderNo}}</text>
<text></text> <!-- 调仓 -->
<!-- 报关方式 --> <text v-for="prod in item.orderItemDOS" :key="prod.orderItemId" style="color:blue;fontWeight:bold;margin: 0 3px;">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" /> {{ prod.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
<!-- 包装类型 --> </text>
<dict-tag :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" :value="item.unit"></dict-tag> <text v-for="prod in item.orderItemDOS" :key="prod.orderItemId" style="color:red;fontWeight:bold;margin: 0 3px;">
<!-- 混箱 --> {{ prod.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
<!-- 有牌 --> </text>
<text v-if="item.orderItemDOS.some(ele => ele.checkBrandType && ele.checkBrandType !== 0)">有牌</text> <!-- 报关方式 -->
<!-- 带电 --> <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" 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;">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="prod.unit" />
</text>
<!-- 混箱 -->
<text v-if="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.some(ele => [$t('无牌'), $t('有牌'), $t('中性')][ele.brandType] !== $t('无牌'))" style="color:red;fontWeight:bold;margin: 0 3px;">{{ $t('有牌') }}</text>
<!-- 带电 -->
<text v-for="prod in item.orderItemDOS" :key="prod.orderItemId" style="color:red;fontWeight:bold;margin: 0 3px;">
{{ prod.electrifiedFreightPrice > 0 ? $t('带电') : ''}}
</text>
</view>
</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