|
@ -82,16 +82,16 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
props: { |
|
|
props: { |
|
|
operation: "receipt" ,//reject 收货 拒绝 |
|
|
operation: "receipt", //reject 收货 拒绝 |
|
|
isShowAsn:{ |
|
|
isShowAsn: { |
|
|
type: Boolean, |
|
|
type: Boolean, |
|
|
default: true |
|
|
default: true |
|
|
}, |
|
|
}, |
|
|
isShowJob:{ |
|
|
isShowJob: { |
|
|
type: Boolean, |
|
|
type: Boolean, |
|
|
default: true |
|
|
default: true |
|
|
}, |
|
|
}, |
|
|
scanTitle:{ |
|
|
scanTitle: { |
|
|
type: String, |
|
|
type: String, |
|
|
default: '箱标签' |
|
|
default: '箱标签' |
|
|
} |
|
|
} |
|
@ -140,6 +140,13 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
methods: { |
|
|
methods: { |
|
|
|
|
|
onReach() { |
|
|
|
|
|
//避免多次触发 |
|
|
|
|
|
if (this.loadingType == 'loading' || this.loadingType == 'nomore') { |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
this.getList("more"); |
|
|
|
|
|
}, |
|
|
refresh() { |
|
|
refresh() { |
|
|
this.getList('refresh'); |
|
|
this.getList('refresh'); |
|
|
}, |
|
|
}, |
|
@ -345,14 +352,14 @@ |
|
|
|
|
|
|
|
|
try { |
|
|
try { |
|
|
let filters = [] |
|
|
let filters = [] |
|
|
if(result.label.barType=="BarCode"){ |
|
|
if (result.label.barType == "BarCode") { |
|
|
// ASN单号 |
|
|
// ASN单号 |
|
|
filters = [{ |
|
|
filters = [{ |
|
|
column: "asn_number", |
|
|
column: "asn_number", |
|
|
action: "==", |
|
|
action: "==", |
|
|
value: result.label.code |
|
|
value: result.label.code |
|
|
}] |
|
|
}] |
|
|
}else{ |
|
|
} else { |
|
|
filters = [{ |
|
|
filters = [{ |
|
|
column: "packingNumber", |
|
|
column: "packingNumber", |
|
|
action: "==", |
|
|
action: "==", |
|
@ -394,8 +401,8 @@ |
|
|
item.selected = false |
|
|
item.selected = false |
|
|
}) |
|
|
}) |
|
|
let list = [] |
|
|
let list = [] |
|
|
resultList.forEach(item=>{ |
|
|
resultList.forEach(item => { |
|
|
if(!list.find(subItem=>subItem.title==item.title)){ |
|
|
if (!list.find(subItem => subItem.title == item.title)) { |
|
|
list.push(item) |
|
|
list.push(item) |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|