|
|
|
@ -9,6 +9,7 @@ |
|
|
|
</view> |
|
|
|
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line> |
|
|
|
</view> |
|
|
|
|
|
|
|
<view class="page-main"> |
|
|
|
<scroll-view scroll-y="true" class="page-main-scroll"> |
|
|
|
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> |
|
|
|
@ -23,7 +24,6 @@ |
|
|
|
</scroll-view> |
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
|
|
<view class="page-footer"> |
|
|
|
<view class="uni-flex u-col-center space-between padding_10" |
|
|
|
style="background-color:ghostwhite; width: 100%; "> |
|
|
|
@ -39,7 +39,8 @@ |
|
|
|
</view> |
|
|
|
|
|
|
|
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|
|
|
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> |
|
|
|
<!-- <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> --> |
|
|
|
<win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack> |
|
|
|
<detail-info-popup ref="detailInfoPopup"></detail-info-popup> |
|
|
|
<com-message ref="comMessage"></com-message> |
|
|
|
</view> |
|
|
|
@ -81,13 +82,15 @@ |
|
|
|
import detailInfoPopup from '@/pages/productionReturn/coms/detailInfoPopup.vue' |
|
|
|
import comMessage from '@/mycomponents/common/comMessage.vue' |
|
|
|
import jobTop from '@/mycomponents/job/jobTop.vue' |
|
|
|
import winScanPack from '@/mycomponents/scan/winScanPack.vue' |
|
|
|
|
|
|
|
export default { |
|
|
|
name: 'receipt_detail', |
|
|
|
components: { |
|
|
|
winScanButton, |
|
|
|
requiredLocation, |
|
|
|
winScanPackAndLocation, |
|
|
|
// winScanPackAndLocation, |
|
|
|
winScanPack, |
|
|
|
comDetailCard, |
|
|
|
detailInfoPopup, |
|
|
|
comMessage, |
|
|
|
@ -228,25 +231,28 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
openScanPopup() { |
|
|
|
let fromlocationCode = ''; |
|
|
|
let fromlocationList = []; |
|
|
|
for (var i = 0; i < this.detailSource.length; i++) { |
|
|
|
let item = this.detailSource[i]; |
|
|
|
item.subList.forEach(l => { |
|
|
|
//重复的库位不往里面插入 |
|
|
|
var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode) |
|
|
|
if (location.length == 0) { |
|
|
|
fromlocationList.push(l.fromLocationCode); |
|
|
|
} |
|
|
|
//来源库位赋默认值 |
|
|
|
if (fromlocationCode == '') { |
|
|
|
if (!l.scaned) { |
|
|
|
fromlocationCode = l.fromLocationCode; |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
} |
|
|
|
this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent); |
|
|
|
this.$refs.scanPopup.openScanPopup(); |
|
|
|
// let fromlocationCode = ''; |
|
|
|
// let fromlocationList = []; |
|
|
|
// for (var i = 0; i < this.detailSource.length; i++) { |
|
|
|
// let item = this.detailSource[i]; |
|
|
|
// item.subList.forEach(l => { |
|
|
|
// //重复的库位不往里面插入 |
|
|
|
// var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode) |
|
|
|
// if (location.length == 0) { |
|
|
|
// fromlocationList.push(l.fromLocationCode); |
|
|
|
// } |
|
|
|
// //来源库位赋默认值 |
|
|
|
// if (fromlocationCode == '') { |
|
|
|
// if (!l.scaned) { |
|
|
|
// fromlocationCode = l.fromLocationCode; |
|
|
|
// } |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// } |
|
|
|
// this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent); |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
@ -270,32 +276,40 @@ |
|
|
|
if (itemDetail.scaned) { |
|
|
|
this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描") |
|
|
|
} else { |
|
|
|
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); |
|
|
|
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); |
|
|
|
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { |
|
|
|
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + |
|
|
|
']不一致,是否继续上架?', res => { |
|
|
|
if (res) { |
|
|
|
itemDetail.scaned = true; |
|
|
|
itemDetail.handleQty = Number(result.balance.qty) |
|
|
|
itemDetail.balance = result.balance; |
|
|
|
itemDetail.balance.balanceQty = result.balance.qty; |
|
|
|
itemDetail.balance.stdPackQty = result.package.stdPackQty |
|
|
|
itemDetail.balance.stdPackUnit = result.package.stdPackUnit |
|
|
|
itemDetail.handleQty = Number(result.package.qty) |
|
|
|
itemDetail.stdPackQty = result.package.stdPackQty |
|
|
|
itemDetail.stdPackUnit = result.package.stdPackUnit |
|
|
|
this.calcHandleQty(); |
|
|
|
} else { |
|
|
|
this.scanPopupGetFocus(); |
|
|
|
} |
|
|
|
}); |
|
|
|
} else { |
|
|
|
itemDetail.scaned = true; |
|
|
|
itemDetail.handleQty = Number(result.balance.qty) |
|
|
|
itemDetail.balance = result.balance; |
|
|
|
itemDetail.balance.balanceQty = result.balance.qty; |
|
|
|
itemDetail.balance.stdPackQty = result.package.stdPackQty |
|
|
|
itemDetail.balance.stdPackUnit = result.package.stdPackUnit |
|
|
|
this.calcHandleQty(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//合格退料时不能查库存余额,因为生产退料时新生成的批次是000000 --nxt |
|
|
|
// let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); |
|
|
|
// let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); |
|
|
|
// if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { |
|
|
|
// this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + |
|
|
|
// ']不一致,是否继续上架?', res => { |
|
|
|
// if (res) { |
|
|
|
// itemDetail.scaned = true; |
|
|
|
// itemDetail.handleQty = Number(result.balance.qty) |
|
|
|
// itemDetail.balance = result.balance; |
|
|
|
// itemDetail.balance.balanceQty = result.balance.qty; |
|
|
|
// itemDetail.balance.stdPackQty = result.package.stdPackQty |
|
|
|
// itemDetail.balance.stdPackUnit = result.package.stdPackUnit |
|
|
|
// this.calcHandleQty(); |
|
|
|
// } else { |
|
|
|
// this.scanPopupGetFocus(); |
|
|
|
// } |
|
|
|
// }); |
|
|
|
// } else { |
|
|
|
// itemDetail.scaned = true; |
|
|
|
// itemDetail.handleQty = Number(result.balance.qty) |
|
|
|
// itemDetail.balance = result.balance; |
|
|
|
// itemDetail.balance.balanceQty = result.balance.qty; |
|
|
|
// itemDetail.balance.stdPackQty = result.package.stdPackQty |
|
|
|
// itemDetail.balance.stdPackUnit = result.package.stdPackUnit |
|
|
|
// this.calcHandleQty(); |
|
|
|
// } |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -451,14 +465,24 @@ |
|
|
|
this.$refs.scanPopup.closeScanPopup(); |
|
|
|
}, |
|
|
|
|
|
|
|
// scanPopupGetFocus() { |
|
|
|
// this.$refs.scanPopup.getFocus(); |
|
|
|
// }, |
|
|
|
|
|
|
|
// scanPopupLoseFocus() { |
|
|
|
// this.$refs.scanPopup.loseFocus(); |
|
|
|
// }, |
|
|
|
|
|
|
|
scanPopupGetFocus() { |
|
|
|
this.$refs.scanPopup.packGetFocus(); |
|
|
|
this.$refs.scanPopup.getfocus(); |
|
|
|
}, |
|
|
|
|
|
|
|
scanPopupLoseFocus() { |
|
|
|
this.$refs.scanPopup.packLoseFocus(); |
|
|
|
this.$refs.scanPopup.losefocus(); |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
showQuestionMessage(message, callback) { |
|
|
|
setTimeout(r => { |
|
|
|
this.scanPopupLoseFocus(); |
|
|
|
|
