aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'master' and 'master' of http://git.xdadan.loc/tanex/emis-frontend

Browse Source
This commit is contained in:
linfso 2024-05-10 11:42:29 +08:00
commit 6dde42a28c
2 changed files with 66 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
View File

@ -391,7 +391,7 @@ export default {
}, },
// 扫描上传 // 扫描上传
handleScanUpload(){ async handleScanUpload(){
var selData = this.$refs.multipleTable.selection; var selData = this.$refs.multipleTable.selection;
console.log(selData); console.log(selData);
@ -420,26 +420,38 @@ export default {
let scanArrivalInfo = {scanType:"30",opType:2,scanData:scanArrivalData} let scanArrivalInfo = {scanType:"30",opType:2,scanData:scanArrivalData}
console.log(scanArrivalInfo) console.log(scanArrivalInfo)
scanArrivalData.length > 0 && doScan(scanArrivalInfo).then(response => { if(scanArrivalData.length > 0){
console.log(response); let res = await doScan(scanArrivalInfo);
let scanRstItem = response.data.scanResult[0]; // console.log(response);
console.log(scanRstItem); let scanRstItem = res.data.scanResult[0];
// console.log(scanRstItem);
if(scanRstItem.result != 'success'){ if(scanRstItem.result != 'success'){
this.$modal.msgError(scanRstItem.message); this.$modal.msgError(scanRstItem.message);
return; return;
} }
this.$modal.msgSuccess("到件扫描上传"+scanRstItem.message); this.$modal.msgSuccess("到件扫描上传"+scanRstItem.message);
}
// scanArrivalData.length > 0 && doScan(scanArrivalInfo).then(response => {
// console.log(response);
// let scanRstItem = response.data.scanResult[0];
// console.log(scanRstItem);
// if(scanRstItem.result != 'success'){
// this.$modal.msgError(scanRstItem.message);
// return;
// }
}); // this.$modal.msgSuccess("到件扫描上传"+scanRstItem.message);
// });
// 派件扫描上传 // 派件扫描上传
let scanDispathInfo = {scanType:"40",opType:2,scanData:scanDispathData} let scanDispathInfo = {scanType:"40",opType:2,scanData:scanDispathData}
console.log(scanDispathInfo) console.log(scanDispathInfo)
scanDispathData.length > 0 && doScan(scanDispathInfo).then(response => { if(scanDispathData.length > 0){
console.log(response); let res = await doScan(scanDispathInfo);
let scanRstItem = response.data.scanResult[0]; let scanRstItem = res.data.scanResult[0];
console.log(scanRstItem); console.log(scanRstItem);
if(scanRstItem.result != 'success'){ if(scanRstItem.result != 'success'){
this.$modal.msgError(scanRstItem.message); this.$modal.msgError(scanRstItem.message);
@ -447,8 +459,20 @@ export default {
} }
this.$modal.msgSuccess("派件扫描上传"+scanRstItem.message); this.$modal.msgSuccess("派件扫描上传"+scanRstItem.message);
}
// .then(response => {
// console.log(response);
// let scanRstItem = response.data.scanResult[0];
// console.log(scanRstItem);
// if(scanRstItem.result != 'success'){
// this.$modal.msgError(scanRstItem.message);
// return;
// }
}); // this.$modal.msgSuccess("派件扫描上传"+scanRstItem.message);
// });
}, },
handleScanInput(){ handleScanInput(){

40
src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
View File

@ -465,7 +465,7 @@ export default {
}, },
// 扫描上传 // 扫描上传
handleScanUpload(){ async handleScanUpload(){
var selData = this.$refs.multipleTable.selection; var selData = this.$refs.multipleTable.selection;
console.log(selData); console.log(selData);
@ -499,9 +499,9 @@ export default {
let scanRecordInfo = {scanType:"10",opType:2,scanData:scanRecordData} let scanRecordInfo = {scanType:"10",opType:2,scanData:scanRecordData}
console.log(scanRecordInfo) console.log(scanRecordInfo)
scanRecordData.length > 0 && doScan(scanRecordInfo).then(response => { if(scanRecordData.length > 0){
console.log(response); let res = await doScan(scanRecordInfo);
let scanRstItem = response.data.scanResult[0]; let scanRstItem = res.data.scanResult[0];
console.log(scanRstItem); console.log(scanRstItem);
if(scanRstItem.result != 'success'){ if(scanRstItem.result != 'success'){
this.$modal.msgError(scanRstItem.message); this.$modal.msgError(scanRstItem.message);
@ -509,16 +509,27 @@ export default {
} }
this.$modal.msgSuccess("揽件扫描上传"+scanRstItem.message); this.$modal.msgSuccess("揽件扫描上传"+scanRstItem.message);
}
// scanRecordData.length > 0 && doScan(scanRecordInfo).then(response => {
// console.log(response);
// let scanRstItem = response.data.scanResult[0];
// console.log(scanRstItem);
// if(scanRstItem.result != 'success'){
// this.$modal.msgError(scanRstItem.message);
// return;
// }
}); // this.$modal.msgSuccess("揽件扫描上传"+scanRstItem.message);
// });
// 发件扫描上传 // 发件扫描上传
let scanOutgoingInfo = {scanType:"20",opType:2,scanData:scanOutgoingData} let scanOutgoingInfo = {scanType:"20",opType:2,scanData:scanOutgoingData}
console.log(scanOutgoingInfo) console.log(scanOutgoingInfo)
scanOutgoingData.length > 0 && doScan(scanOutgoingInfo).then(response => { if(scanOutgoingData.length > 0){
console.log(response); let res = await doScan(scanOutgoingInfo);
let scanRstItem = response.data.scanResult[0]; let scanRstItem = res.data.scanResult[0];
console.log(scanRstItem); console.log(scanRstItem);
if(scanRstItem.result != 'success'){ if(scanRstItem.result != 'success'){
this.$modal.msgError(scanRstItem.message); this.$modal.msgError(scanRstItem.message);
@ -526,8 +537,19 @@ export default {
} }
this.$modal.msgSuccess("发件扫描上传"+scanRstItem.message); this.$modal.msgSuccess("发件扫描上传"+scanRstItem.message);
}
// scanOutgoingData.length > 0 && doScan(scanOutgoingInfo).then(response => {
// console.log(response);
// let scanRstItem = response.data.scanResult[0];
// console.log(scanRstItem);
// if(scanRstItem.result != 'success'){
// this.$modal.msgError(scanRstItem.message);
// return;
// }
}); // this.$modal.msgSuccess("发件扫描上传"+scanRstItem.message);
// });
}, },