|
|
|
@ -56,7 +56,9 @@ |
|
|
|
import putawayJobListPopup from '@/pages/putaway/coms/putawayJobListPopup.vue' |
|
|
|
import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue' |
|
|
|
import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue" |
|
|
|
import { Exception } from 'sass'; |
|
|
|
import { |
|
|
|
Exception |
|
|
|
} from 'sass'; |
|
|
|
|
|
|
|
export default { |
|
|
|
name: 'Putaway', |
|
|
|
@ -318,12 +320,12 @@ import { Exception } from 'sass'; |
|
|
|
selectItem(item) { |
|
|
|
this.$refs.scanPopup.closeScanPopup(); |
|
|
|
uni.navigateTo({ |
|
|
|
url: './putawayDetail?id=' |
|
|
|
+ item.masterId |
|
|
|
+ '&status=' + item.status |
|
|
|
+'&scaned='+item.packingNumber |
|
|
|
+ '&title='+this.title |
|
|
|
+"&scanMessage="+this.scanMessage |
|
|
|
url: './putawayDetail?id=' + |
|
|
|
item.masterId + |
|
|
|
'&status=' + item.status + |
|
|
|
'&scaned=' + item.packingNumber + |
|
|
|
'&title=' + this.title + |
|
|
|
"&scanMessage=" + this.scanMessage |
|
|
|
}); |
|
|
|
this.scanMessage = "" |
|
|
|
}, |
|
|
|
@ -332,13 +334,13 @@ import { Exception } from 'sass'; |
|
|
|
this.scanMessage = "" |
|
|
|
var filters = [{ |
|
|
|
column: "packingNumber", |
|
|
|
action: "==", |
|
|
|
value: result.label.packingNumber |
|
|
|
action: "in", |
|
|
|
value: result.package.number + "," + result.package.parentNumber |
|
|
|
}, |
|
|
|
{ |
|
|
|
column: "batch", |
|
|
|
action: "==", |
|
|
|
value: result.label.batch |
|
|
|
value: result.package.batch |
|
|
|
}, |
|
|
|
// { |
|
|
|
// column: "qty", |
|
|
|
@ -348,12 +350,12 @@ import { Exception } from 'sass'; |
|
|
|
{ |
|
|
|
column: "itemCode", |
|
|
|
action: "==", |
|
|
|
value: result.label.itemCode |
|
|
|
value: result.package.itemCode |
|
|
|
}, |
|
|
|
{ |
|
|
|
column: "status", |
|
|
|
action: "in", |
|
|
|
value: '1,2,3', |
|
|
|
value: '1,2', |
|
|
|
}, |
|
|
|
// { |
|
|
|
// column: "accept_user_id", |
|
|
|
@ -393,10 +395,12 @@ import { Exception } from 'sass'; |
|
|
|
if (list[0].acceptUserId == this.$store.state.user.id) { |
|
|
|
this.selectItem(list[0]) |
|
|
|
} else { |
|
|
|
this.showMessage("该任务已经被["+list[0].acceptUserName+"]承接"+"<br>任务号["+list[0].number+"]扫描["+result.scanMessage+"]") |
|
|
|
this.showMessage("该任务已经被[" + list[0].acceptUserName + "]承接" + "<br>任务号[" + |
|
|
|
list[0].number + "]扫描[" + result.scanMessage + "]") |
|
|
|
} |
|
|
|
} else if (list[0].status == 3) { |
|
|
|
this.showMessage("该任务已经完成<br>承接人["+list[0].acceptUserName+"]<br>任务号["+list[0].number+"]扫描["+result.scanMessage+"]") |
|
|
|
this.showMessage("该任务已经完成<br>承接人[" + list[0].acceptUserName + "]<br>任务号[" + |
|
|
|
list[0].number + "]扫描[" + result.scanMessage + "]") |
|
|
|
} |
|
|
|
} else { |
|
|
|
this.showMessage("查询到多条任务<br>" + "扫描[" + result.scanMessage + "]") |
|
|
|
|
