Commit 53f8b2d2 authored by xiaoyan's avatar xiaoyan

fix: 出仓/装箱增加关联单

parent a168cb54
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<!-- 特性 --> <!-- 特性 -->
<text style="color:red;fontWeight:bold;">{{ getProductAttrsByIds(uniqueProductAttrs(order.goodsList, 'warehouseInProdAttrIds')) }}</text> <text style="color:red;fontWeight:bold;">{{ getProductAttrsByIds(uniqueProductAttrs(order.goodsList, 'warehouseInProdAttrIds')) }}</text>
<!-- 报关方式 --> <!-- 报关方式 -->
<view v-if="v.customsType !== 1"> <view v-if="order.customsType !== 1">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" style="color:blue;fontWeight:bold;" /> <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" style="color:blue;fontWeight:bold;" />
</view> </view>
<!-- 包装类型 --> <!-- 包装类型 -->
...@@ -59,6 +59,8 @@ ...@@ -59,6 +59,8 @@
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== order.units.split(',').length-1 ? ',':'' }} <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== order.units.split(',').length-1 ? ',':'' }}
</text> </text>
</view> </view>
<!-- 关联单 -->
<view v-if="order.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
<!-- 混箱 --> <!-- 混箱 -->
<view v-if="order.mixStatus === 1" style="color:red;fontWeight:bold;" @tap="showMixOrder(order)">{{$t('混箱')}}</view> <view v-if="order.mixStatus === 1" style="color:red;fontWeight:bold;" @tap="showMixOrder(order)">{{$t('混箱')}}</view>
</view> </view>
...@@ -773,6 +775,13 @@ export default { ...@@ -773,6 +775,13 @@ export default {
}); });
}); });
}, },
/* 跳转到关联单 */
relatedClick(orderNo) {
const { boxInfo } = this.loadData;
uni.navigateTo({
url: `../tally/relatedOrder?orderId=${orderNo}&selfNo=${boxInfo.selfNo}`,
});
},
// 显示混箱明细 // 显示混箱明细
showMixOrder(row) { showMixOrder(row) {
this.orderId = row.orderId; this.orderId = row.orderId;
......
...@@ -86,6 +86,8 @@ ...@@ -86,6 +86,8 @@
<text v-for="(prod, index) in uniqueArr(item.orderItemDOS)" :key="prod.orderItemId" style="color:red;fontWeight:bold;margin: 0 3px;"> <text v-for="(prod, index) in uniqueArr(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!== uniqueArr(item.orderItemDOS).length-1 ? ',':'' }} <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="prod.unit" />{{ index!== uniqueArr(item.orderItemDOS).length-1 ? ',':'' }}
</text> </text>
<!-- 关联单 -->
<text v-if="item.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(item.orderId)">{{$t('关联单')}}</text>
<!-- 混箱 --> <!-- 混箱 -->
<text v-if="item.mixStatus === 1" style="color:red;fontWeight:bold;margin: 0 3px;" @tap="showMixOrder(item)">{{$t('混箱')}}</text> <text v-if="item.mixStatus === 1" style="color:red;fontWeight:bold;margin: 0 3px;" @tap="showMixOrder(item)">{{$t('混箱')}}</text>
</view> </view>
...@@ -465,6 +467,12 @@ export default { ...@@ -465,6 +467,12 @@ export default {
this.$set(item, 'checked', status) this.$set(item, 'checked', status)
}) })
}, },
/* 跳转到关联单 */
relatedClick(orderNo) {
uni.navigateTo({
url: `../tally/relatedOrder?orderId=${orderNo}&selfNo=${this.selfNo}`,
});
},
// 显示混箱明细 // 显示混箱明细
showMixOrder(row) { showMixOrder(row) {
this.orderId = row.orderId; this.orderId = row.orderId;
......
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