|
@ -20,7 +20,7 @@ |
|
|
<receipt-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></receipt-job-list-popup> |
|
|
<receipt-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></receipt-job-list-popup> |
|
|
</view> |
|
|
</view> |
|
|
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button> |
|
|
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button> |
|
|
<winScanPackJob title="箱标签" ref="scanPopup" @getResult='getScanResult' > |
|
|
<winScanPackJob title="箱标签/ASN单号" ref="scanPopup" @getResult='getScanResult' > |
|
|
</winScanPackJob> |
|
|
</winScanPackJob> |
|
|
<jobList ref="jobList" @selectItem="selectItem"></jobList> |
|
|
<jobList ref="jobList" @selectItem="selectItem"></jobList> |
|
|
<comMessage ref="comMessage"></comMessage> |
|
|
<comMessage ref="comMessage"></comMessage> |
|
@ -344,16 +344,19 @@ |
|
|
openScanPopup() { |
|
|
openScanPopup() { |
|
|
this.$refs.scanPopup.openScanPopup(); |
|
|
this.$refs.scanPopup.openScanPopup(); |
|
|
}, |
|
|
}, |
|
|
selectItem(item) { |
|
|
selectItem(item,isScanedASN=false) { |
|
|
|
|
|
|
|
|
this.$refs.scanPopup.closeScanPopup(); |
|
|
this.$refs.scanPopup.closeScanPopup(); |
|
|
this.openJobDetail(item, item.packingNumber); |
|
|
if(isScanedASN){ |
|
|
|
|
|
this.openJobDetail(item) |
|
|
|
|
|
}else{ |
|
|
|
|
|
; |
|
|
|
|
|
this.openJobDetail(item, item.packingNumber); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
getScanResult(result) { |
|
|
getScanResult(result) { |
|
|
|
|
|
|
|
|
if(result.scanMessage.indexOf('ASN')>-1){ |
|
|
|
|
|
this.showMessage('请扫描箱标签') |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
try { |
|
|
let filters = [] |
|
|
let filters = [] |
|
@ -419,9 +422,9 @@ |
|
|
|
|
|
|
|
|
console.log('list', list) |
|
|
console.log('list', list) |
|
|
if (list.length > 1) { |
|
|
if (list.length > 1) { |
|
|
this.$refs.jobList.openList(list) |
|
|
this.$refs.jobList.openList(list,result.scanMessage.indexOf('ASN')>-1) |
|
|
} else { |
|
|
} else { |
|
|
this.selectItem(list[0]) |
|
|
this.selectItem(list[0],result.scanMessage.indexOf('ASN')>-1) |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
this.showMessage('未查找到任务') |
|
|
this.showMessage('未查找到任务') |
|
|