diff --git a/src/pages/issue/record/directIssue0816.vue b/src/pages/issue/record/directIssue0816.vue index 8efa0038..6e4668b1 100644 --- a/src/pages/issue/record/directIssue0816.vue +++ b/src/pages/issue/record/directIssue0816.vue @@ -45,9 +45,9 @@ - - - + + @@ -100,7 +100,7 @@ import balanceSelect from '@/mycomponents/balance/balanceSelect.vue' import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue' // import balanceQuery from '@/mycomponents/query/balanceQuery.vue' - + import winScanPackage from '@/mycomponents/scan/winScanPackage.vue' export default { components: { @@ -114,6 +114,7 @@ recordDetailCard, balanceSelect, winComScanBalance, + winScanPackage // balanceQuery }, data() { @@ -181,7 +182,6 @@ // showDrawer() { // this.$refs.showRight.open(); // }, - getBusinessType() { getBusinessType(this.businessTypeCode, res => { if (res.success) { @@ -196,27 +196,36 @@ }, getScanResult(result) { + // let balance = result.balance; let pack = result.package; - let balance = result.balance; - - if (this.fromLocationCode && this.fromLocationCode != balance.locationCode) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位[" + this - .fromLocationCode + "]没有库存余额") - return; - } - - //扫描的是子包装 - if (pack.parentNumber) { - this.setPackageData(result); - } else { - this.setContainerData(result); - } + result.balance.forEach( + b => { + this.setPackageData(b,pack); + } + ) }, + + // getScanResult(result) { + // let pack = result.package; + // let balance = result.balance; + + // if (this.fromLocationCode && this.fromLocationCode != balance.locationCode) { + // this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位[" + this + // .fromLocationCode + "]没有库存余额") + // return; + // } + + // //扫描的是子包装 + // if (pack.parentNumber) { + // this.setPackageData(result); + // } else { + // this.setContainerData(result); + // } + // }, - setPackageData(result) { - let balance = result.balance; - let label = result.label; - let pack = result.package; + setPackageData(balance, pack) { + // let balance = result.balance; + // let pack = result.package; var item = this.detailSource.find(res => { if (res.itemCode == balance.itemCode) { @@ -432,12 +441,18 @@ this.updateData(); }, + // openScanPopup() { + // if (this.businessType) { + // this.$refs.scanPopup.openScanPopup(this.businessType); + // } else { + // this.getBusinessType() + // } + // }, + openScanPopup() { - if (this.businessType) { - this.$refs.scanPopup.openScanPopup(this.businessType); - } else { - this.getBusinessType() - } + setTimeout(r => { + this.$refs.scanPopup.openScanPopupByBusinessType(this.businessType); + }) }, showFromLocationPopup() {