|
|
|
@ -438,6 +438,7 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
queueStatus:null,
|
|
|
|
|
busTypeList: [],
|
|
|
|
|
busQuery: {
|
|
|
|
|
busKey: '',
|
|
|
|
@ -507,6 +508,7 @@ export default {
|
|
|
|
|
curSpaceOptions: [], //当前货位
|
|
|
|
|
|
|
|
|
|
curWorkPlaces: [],
|
|
|
|
|
allWorkPlaces: [],
|
|
|
|
|
|
|
|
|
|
curAction: {
|
|
|
|
|
corpType: 0,
|
|
|
|
@ -1066,20 +1068,22 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
//获取当前工位
|
|
|
|
|
// findCurWorkPlaces(val) {
|
|
|
|
|
// let query = {
|
|
|
|
|
// userId: this.userInfo.userId,
|
|
|
|
|
// page: 1,
|
|
|
|
|
// limit: 100,
|
|
|
|
|
// }
|
|
|
|
|
// getUserBindWork(query).then((res) => {
|
|
|
|
|
// this.curWorkPlaces = res.data.list || [];
|
|
|
|
|
// if (this.curWorkPlaces.length == 1 && this.$isNotBlank(this.orderFormData.workPlaceCode)) {
|
|
|
|
|
// this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
|
|
|
|
|
// this.defaultSplitType()
|
|
|
|
|
// }
|
|
|
|
|
// })
|
|
|
|
|
// },
|
|
|
|
|
findAllWorkPlaces() {
|
|
|
|
|
let query = {
|
|
|
|
|
page: 1,
|
|
|
|
|
limit: 100,
|
|
|
|
|
}
|
|
|
|
|
getUserBindWork(query).then((res) => {
|
|
|
|
|
this.allWorkPlaces = res.data.list || [];
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
let item = this.allWorkPlaces.find(item => item.workplaceId == this.orderFormData.workPlaceCode)
|
|
|
|
|
this.queueStatus = item.queueStatus
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
findCurWorkPlaces(val) {
|
|
|
|
|
let query = {
|
|
|
|
|
// chargeUser: _this.$store.getters.userId,
|
|
|
|
@ -1751,6 +1755,17 @@ export default {
|
|
|
|
|
if (this.getDMHotskeyValue(this.scanCode)) {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!this.scanCode.includes("DMQ")){
|
|
|
|
|
if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode){
|
|
|
|
|
this.$message.warning('当前工位无需按货位上架')
|
|
|
|
|
return;
|
|
|
|
|
}else if (this.queueStatus == "1" && !this.orderFormData.workPlaceQueueCode){
|
|
|
|
|
this.$message.warning('当前工位需按货位上架')
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.codeFormData.code = this.scanCode.trim()
|
|
|
|
|
|
|
|
|
|
if (this.codeFormData.code.includes(';')) {
|
|
|
|
@ -2018,7 +2033,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
init() {
|
|
|
|
|
//页面初始化
|
|
|
|
|
|
|
|
|
|
this.findAllWorkPlaces()
|
|
|
|
|
this.codeFormData.code = ''
|
|
|
|
|
if (this.splitType == 'search') {
|
|
|
|
|
} else if (this.splitType == 'out') {
|
|
|
|
|