|
|
@@ -40,7 +40,7 @@ const packingTrueFalseBy = ref(false)
|
|
|
const packingList = ref([])
|
|
|
const orderDetail=ref({})
|
|
|
const show = (list,detail) => {
|
|
|
- packingList.value=list
|
|
|
+ packingList.value=list.filter(item => item.isPacking && item.status=='60' )
|
|
|
orderDetail.value=detail
|
|
|
packingTrueFalseBy.value = true
|
|
|
}
|
|
|
@@ -52,7 +52,7 @@ const beforeClose = (action) =>
|
|
|
}
|
|
|
resolve(true)
|
|
|
})
|
|
|
-const emit = defineEmits(['print','cancelOrder'])
|
|
|
+const emit = defineEmits(['print','cancelOrder','resetPackingStatus'])
|
|
|
const setPacking = () => {
|
|
|
const groupDetailList = packingList.value.map(items => {
|
|
|
return {
|
|
|
@@ -76,10 +76,11 @@ const setPacking = () => {
|
|
|
}else {
|
|
|
showNotify({ type: 'success', duration: 3000, message: res.data + '装箱成功'})
|
|
|
scanSuccess()
|
|
|
- packingList.value.forEach((item) => {
|
|
|
- item.quantity=0
|
|
|
- delete item.isPacking
|
|
|
- })
|
|
|
+ emit('resetPackingStatus')
|
|
|
+ // packingList.value.forEach((item) => {
|
|
|
+ // item.quantity=0
|
|
|
+ // delete item.isPacking
|
|
|
+ // })
|
|
|
const qty=groupDetailList.reduce((sum, item) => sum + Number(item.qty), 0)
|
|
|
const packingItem={ orderNo:orderDetail.value.orderNo, traceId:res.data, qty }
|
|
|
orderDetail.value.orderPacking.unshift(packingItem)
|