|
|
|
@ -20,7 +20,7 @@ |
|
|
|
<receipt-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></receipt-job-list-popup> |
|
|
|
</view> |
|
|
|
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button> |
|
|
|
<winScanPackJob title="箱标签/ASN单号" ref="scanPopup" @getResult='getScanResult' > |
|
|
|
<winScanPackJob title="箱标签/ASN单号" ref="scanPopup" @getResult='getScanResult'> |
|
|
|
</winScanPackJob> |
|
|
|
<jobList ref="jobList" @selectItem="selectItem"></jobList> |
|
|
|
<comMessage ref="comMessage"></comMessage> |
|
|
|
@ -78,7 +78,7 @@ |
|
|
|
status: '1,2', //待处理 、进行中 |
|
|
|
detailOptions: [], |
|
|
|
detailGiveupOptions: [], |
|
|
|
scanMessage:"" |
|
|
|
scanMessage: "" |
|
|
|
}; |
|
|
|
}, |
|
|
|
|
|
|
|
@ -205,7 +205,7 @@ |
|
|
|
|
|
|
|
var list = res.data.list; |
|
|
|
this.totalCount = res.data.total |
|
|
|
updateTitle(this.title+"(" + this.totalCount + ")"); |
|
|
|
updateTitle(this.title + "(" + this.totalCount + ")"); |
|
|
|
this.loadingType = "loadmore"; |
|
|
|
if (list == null || list.length == 0) { |
|
|
|
this.loadingType = "nomore"; |
|
|
|
@ -292,7 +292,7 @@ |
|
|
|
url: './receiptDetail?id=' + item.masterId + '&status=' + item.status + '&operation=' + this |
|
|
|
.operation + '&scanMessage=' + scanMessage |
|
|
|
}); |
|
|
|
this.scanMessage="" |
|
|
|
this.scanMessage = "" |
|
|
|
}, |
|
|
|
|
|
|
|
showItemList(itemList) { |
|
|
|
@ -350,12 +350,14 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
showMessage(message) { |
|
|
|
if (this.$refs.scanPopup) { |
|
|
|
this.$refs.scanPopup.packLoseFocus() |
|
|
|
} |
|
|
|
this.$refs.comMessage.showErrorMessage(message, res => { |
|
|
|
if (res) { |
|
|
|
|
|
|
|
if(this.$refs.scanPopup){ |
|
|
|
this.$refs.scanPopup.packGetFocus() |
|
|
|
} |
|
|
|
if (this.$refs.scanPopup) { |
|
|
|
this.$refs.scanPopup.packGetFocus() |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
@ -363,12 +365,12 @@ |
|
|
|
openScanPopup() { |
|
|
|
this.$refs.scanPopup.openScanPopup(); |
|
|
|
}, |
|
|
|
selectItem(item,isScanedASN=false) { |
|
|
|
selectItem(item, isScanedASN = false) { |
|
|
|
|
|
|
|
this.$refs.scanPopup.closeScanPopup(); |
|
|
|
if(isScanedASN){ |
|
|
|
if (isScanedASN) { |
|
|
|
this.openJobDetail(item) |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
this.openJobDetail(item, this.scanMessage); |
|
|
|
} |
|
|
|
|
|
|
|
@ -376,7 +378,7 @@ |
|
|
|
getScanResult(result) { |
|
|
|
|
|
|
|
try { |
|
|
|
this.scanMessage="" |
|
|
|
this.scanMessage = "" |
|
|
|
let filters = [] |
|
|
|
if (result.label.barType == "BarCode") { |
|
|
|
// ASN单号 |
|
|
|
@ -384,17 +386,17 @@ |
|
|
|
column: "asn_number", |
|
|
|
action: "==", |
|
|
|
value: result.label.code |
|
|
|
},{ |
|
|
|
}, { |
|
|
|
column: "status", |
|
|
|
action: "in", |
|
|
|
value: '1,2', |
|
|
|
}] |
|
|
|
} else { |
|
|
|
filters = [{ |
|
|
|
column: "packingNumber", |
|
|
|
action: "in", |
|
|
|
value: result.package.number + "," + result.package.parentNumber |
|
|
|
}, |
|
|
|
column: "packingNumber", |
|
|
|
action: "in", |
|
|
|
value: result.package.number + "," + result.package.parentNumber |
|
|
|
}, |
|
|
|
{ |
|
|
|
column: "batch", |
|
|
|
action: "==", |
|
|
|
@ -432,7 +434,7 @@ |
|
|
|
pageNo: 1, |
|
|
|
pageSize: 100, |
|
|
|
}).then(res => { |
|
|
|
this.scanMessage =result.scanMessage |
|
|
|
this.scanMessage = result.scanMessage |
|
|
|
let resultList = res.data.list; |
|
|
|
if (resultList.length > 0) { |
|
|
|
resultList.forEach(item => { |
|
|
|
@ -448,15 +450,15 @@ |
|
|
|
|
|
|
|
console.log('list', list) |
|
|
|
if (list.length > 1) { |
|
|
|
this.$refs.jobList.openList(list,result.scanMessage.indexOf('ASN')>-1) |
|
|
|
this.$refs.jobList.openList(list, result.scanMessage.indexOf('ASN') > -1) |
|
|
|
} else { |
|
|
|
this.selectItem(list[0],result.scanMessage.indexOf('ASN')>-1) |
|
|
|
this.selectItem(list[0], result.scanMessage.indexOf('ASN') > -1) |
|
|
|
} |
|
|
|
} else { |
|
|
|
this.showMessage("未查找到任务\n"+"扫描["+result.scanMessage+"]") |
|
|
|
this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]") |
|
|
|
} |
|
|
|
}).catch(error => { |
|
|
|
this.showMessage(error+"\n扫描["+result.scanMessage+"]") |
|
|
|
this.showMessage(error + "\n扫描[" + result.scanMessage + "]") |
|
|
|
}) |
|
|
|
|
|
|
|
} catch (e) { |
|
|
|
|
