Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-PDA
This commit is contained in:
commit
098bd2e635
@ -287,6 +287,7 @@
|
||||
})
|
||||
this.getERPLocation();
|
||||
this.getTimeData();
|
||||
this.getLocationName();
|
||||
// let Things = 20
|
||||
// for (var i = 0; i < Things; i++) {
|
||||
// this.BoxListInfo.push({aa:"1"})
|
||||
@ -336,8 +337,8 @@
|
||||
},
|
||||
change(e) {
|
||||
this.ERPLOCATION = e.value;
|
||||
this.LOCATIONNAME = ""
|
||||
this.getLocationName();
|
||||
//this.LOCATIONNAME = ""
|
||||
//this.getLocationName();
|
||||
},
|
||||
//获取焦点的公共方法
|
||||
getfocus(nextfocus) {
|
||||
@ -373,30 +374,26 @@
|
||||
this.items_Location = []
|
||||
this.BoxListInfo = [];
|
||||
let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
|
||||
if (this.ERPLOCATION != '') {
|
||||
this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
|
||||
ERPLocation: ERPFACTORY
|
||||
}).then(res => {
|
||||
if (res.data.success) {
|
||||
for (let i = 0; i < res.data.resultObj.length; i++) {
|
||||
var _Arr = res.data.resultObj[i];
|
||||
this.items_LocationAll.push({
|
||||
text: _Arr.DESCRIPTION,
|
||||
value: _Arr.STORAGENAME
|
||||
});
|
||||
this.getitems_LocationAll('');
|
||||
}
|
||||
} else {
|
||||
this.$showMessage(res.data.message)
|
||||
this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
|
||||
ERPLocation: ERPFACTORY
|
||||
}).then(res => {
|
||||
if (res.data.success) {
|
||||
for (let i = 0; i < res.data.resultObj.length; i++) {
|
||||
var _Arr = res.data.resultObj[i];
|
||||
this.items_LocationAll.push({
|
||||
text: _Arr.DESCRIPTION,
|
||||
value: _Arr.STORAGENAME
|
||||
});
|
||||
this.getitems_LocationAll('');
|
||||
}
|
||||
this.focusBarCode = true
|
||||
this.focusShipRequest = false
|
||||
}).catch(err => {
|
||||
this.$showMessage(err)
|
||||
});
|
||||
} else {
|
||||
this.$showMessage("请先选择仓库")
|
||||
}
|
||||
} else {
|
||||
this.$showMessage(res.data.message)
|
||||
}
|
||||
this.focusBarCode = true
|
||||
this.focusShipRequest = false
|
||||
}).catch(err => {
|
||||
this.$showMessage(err)
|
||||
});
|
||||
|
||||
},
|
||||
getitems_LocationAll(query){
|
||||
@ -404,11 +401,12 @@
|
||||
var arr = this.items_LocationAll.filter(item => {
|
||||
return (item.text.includes(query)) || (item.value.includes(query))
|
||||
})
|
||||
if(arr.length > 50){
|
||||
this.items_Location = arr.slice(0, arr.length)
|
||||
/* if(arr.length > 50){
|
||||
this.items_Location = arr.slice(0,50)
|
||||
} else {
|
||||
this.items_Location = arr
|
||||
}
|
||||
} */
|
||||
console.log(this.items_Location)
|
||||
},
|
||||
async ScanBarCode() {
|
||||
|
@ -133,7 +133,7 @@
|
||||
},
|
||||
mounted() {
|
||||
this.getERPLocation();
|
||||
|
||||
this.getLocationName();
|
||||
// let Things = 20
|
||||
// for (var i = 0; i < Things; i++) {
|
||||
// this.BoxListInfo.push({aa:"1"})
|
||||
@ -173,49 +173,46 @@
|
||||
getLocationName() {
|
||||
this.items_Location = []
|
||||
let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
|
||||
if (this.ERPLOCATION1 != '') {
|
||||
this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
|
||||
ERPLocation: ERPFACTORY,
|
||||
}).then(res => {
|
||||
console.log(res.data.resultObj)
|
||||
if (res.data.success) {
|
||||
for (let i = 0; i < res.data.resultObj.length; i++) {
|
||||
var _Arr = res.data.resultObj[i];
|
||||
this.items_LocationAll.push({
|
||||
text: _Arr.DESCRIPTION,
|
||||
value: _Arr.STORAGENAME
|
||||
});
|
||||
|
||||
}
|
||||
// this.items_Location('');
|
||||
this.getitems_LocationAll('');
|
||||
} else {
|
||||
this.$showMessage(res.data.message)
|
||||
this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
|
||||
ERPLocation: ERPFACTORY,
|
||||
}).then(res => {
|
||||
console.log(res.data.resultObj)
|
||||
if (res.data.success) {
|
||||
for (let i = 0; i < res.data.resultObj.length; i++) {
|
||||
var _Arr = res.data.resultObj[i];
|
||||
this.items_LocationAll.push({
|
||||
text: _Arr.DESCRIPTION,
|
||||
value: _Arr.STORAGENAME
|
||||
});
|
||||
|
||||
}
|
||||
this.focusBarCode = true
|
||||
this.focusShipRequest = false
|
||||
}).catch(err => {
|
||||
this.$showMessage(err)
|
||||
});
|
||||
} else {
|
||||
this.$showMessage("请先选择仓库")
|
||||
}
|
||||
// this.items_Location('');
|
||||
this.getitems_LocationAll('');
|
||||
} else {
|
||||
this.$showMessage(res.data.message)
|
||||
}
|
||||
this.focusBarCode = true
|
||||
this.focusShipRequest = false
|
||||
}).catch(err => {
|
||||
this.$showMessage(err)
|
||||
});
|
||||
|
||||
},
|
||||
change(e) {
|
||||
this.LOCATIONNAME1 = ""
|
||||
this.getLocationName();
|
||||
//this.LOCATIONNAME1 = ""
|
||||
//this.getLocationName();
|
||||
},
|
||||
getitems_LocationAll(query){
|
||||
console.log(query + "&&&&&&&&&&&&&&")
|
||||
var arr = this.items_LocationAll.filter(item => {
|
||||
return (item.text.includes(query)) || (item.value.includes(query))
|
||||
})
|
||||
if(arr.length > 50){
|
||||
this.items_Location = arr.slice(0, arr.length)
|
||||
/* if(arr.length > 50){
|
||||
this.items_Location = arr.slice(0,50)
|
||||
} else {
|
||||
this.items_Location = arr
|
||||
}
|
||||
} */
|
||||
console.log(this.items_Location)
|
||||
},
|
||||
getERPLocation() {
|
||||
|
@ -228,6 +228,7 @@
|
||||
this.orgObject = JSON.parse(uni.getStorageSync('orgObject'))
|
||||
this.getTimeData();
|
||||
this.getERPLocation();
|
||||
this.getLocationName2()
|
||||
},
|
||||
|
||||
methods: {
|
||||
@ -311,7 +312,7 @@
|
||||
},
|
||||
change(e) {
|
||||
this.ERPLOCATION = e.value;
|
||||
this.LOCATIONNAME = ""
|
||||
//this.LOCATIONNAME = ""
|
||||
this.bqts = 0
|
||||
this.bqkcs = 0
|
||||
this.Huowei = e.Huowei
|
||||
@ -324,7 +325,7 @@
|
||||
// this.focusKw = true
|
||||
// }
|
||||
this.Locatiaon_state = false
|
||||
this.getLocationName2();
|
||||
//this.getLocationName2();
|
||||
|
||||
},
|
||||
changeLocation() {
|
||||
@ -363,32 +364,28 @@
|
||||
getLocationName2() {
|
||||
this.items_Location = []
|
||||
let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
|
||||
if (this.ERPLOCATION != '') {
|
||||
this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
|
||||
ERPLocation: ERPFACTORY
|
||||
}).then(res => {
|
||||
if (res.data.success) {
|
||||
for (let i = 0; i < res.data.resultObj.length; i++) {
|
||||
var _Arr = res.data.resultObj[i];
|
||||
this.items_Location.push({
|
||||
text: _Arr.DESCRIPTION,
|
||||
value: _Arr.STORAGENAME,
|
||||
Huowei: _Arr.USE_LOCATION,
|
||||
});
|
||||
|
||||
}
|
||||
} else {
|
||||
this.$showMessage(res.data.message)
|
||||
this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
|
||||
ERPLocation: ERPFACTORY
|
||||
}).then(res => {
|
||||
if (res.data.success) {
|
||||
for (let i = 0; i < res.data.resultObj.length; i++) {
|
||||
var _Arr = res.data.resultObj[i];
|
||||
this.items_Location.push({
|
||||
text: _Arr.DESCRIPTION,
|
||||
value: _Arr.STORAGENAME,
|
||||
Huowei: _Arr.USE_LOCATION,
|
||||
});
|
||||
|
||||
}
|
||||
this.focusBarCode = true
|
||||
this.focusShipRequest = false
|
||||
this.focusKw = false
|
||||
}).catch(err => {
|
||||
this.$showMessage(err)
|
||||
});
|
||||
} else {
|
||||
this.$showMessage("请先选择仓库")
|
||||
}
|
||||
} else {
|
||||
this.$showMessage(res.data.message)
|
||||
}
|
||||
this.focusBarCode = true
|
||||
this.focusShipRequest = false
|
||||
this.focusKw = false
|
||||
}).catch(err => {
|
||||
this.$showMessage(err)
|
||||
});
|
||||
|
||||
},
|
||||
getLocationName() {
|
||||
|
@ -245,6 +245,7 @@
|
||||
this.orgObject = JSON.parse(uni.getStorageSync('orgObject'))
|
||||
this.getTimeData();
|
||||
this.getERPLocation();
|
||||
this.getLocationName();
|
||||
},
|
||||
methods: {
|
||||
getTimeData() {
|
||||
@ -263,7 +264,7 @@
|
||||
},
|
||||
change(e) {
|
||||
this.ERPLOCATION = e.value;
|
||||
this.LOCATIONNAME = ""
|
||||
/* this.LOCATIONNAME = ""
|
||||
this.Huowei = e.Huowei
|
||||
if (e.Huowei == 'Y') {
|
||||
this.Locatiaon_state = false
|
||||
@ -272,7 +273,7 @@
|
||||
this.$showMessage(e.text + "仓库没有启用货位管理")
|
||||
this.Locatiaon_state = true
|
||||
this.focusPalletName = true
|
||||
}
|
||||
} */
|
||||
},
|
||||
getERPLocation() {
|
||||
this.items = [];
|
||||
|
@ -406,6 +406,7 @@
|
||||
this.orgObject = JSON.parse(uni.getStorageSync('orgObject'))
|
||||
|
||||
this.getERPLocation();
|
||||
this.getLocationName();
|
||||
this.getTimeData();
|
||||
// let Things = 20
|
||||
// for (var i = 0; i < Things; i++) {
|
||||
@ -853,8 +854,8 @@
|
||||
},
|
||||
change(e) {
|
||||
this.ERPLOCATION = e.value;
|
||||
this.LOCATIONNAME = ""
|
||||
this.getLocationName();
|
||||
//this.LOCATIONNAME = ""
|
||||
//this.getLocationName();
|
||||
},
|
||||
getLocationName() {
|
||||
this.items_Location = []
|
||||
|
@ -233,6 +233,7 @@
|
||||
this.orgObject = JSON.parse(uni.getStorageSync('orgObject'))
|
||||
this.getERPLocation();
|
||||
this.getTimeData();
|
||||
this.getLocationName();
|
||||
},
|
||||
methods: {
|
||||
getTimeData(){
|
||||
@ -290,7 +291,7 @@
|
||||
},
|
||||
change(e) {
|
||||
this.ERPLOCATION = e.value;
|
||||
this.LOCATIONNAME = ""
|
||||
/* this.LOCATIONNAME = ""
|
||||
this.Huowei = e.Huowei
|
||||
if (e.Huowei == 'Y') {
|
||||
this.Locatiaon_state = false
|
||||
@ -299,7 +300,7 @@
|
||||
this.$showMessage(e.text + "仓库没有启用货位管理")
|
||||
this.Locatiaon_state = true
|
||||
this.focusPalletName = true
|
||||
}
|
||||
} */
|
||||
},
|
||||
getERPLocation() {
|
||||
this.items = [];
|
||||
|
@ -252,6 +252,7 @@
|
||||
|
||||
this.orgObject = JSON.parse(uni.getStorageSync('orgObject'))
|
||||
this.getERPLocation();
|
||||
this.getLocationName();
|
||||
// this.GetLiberaryBaeIn()
|
||||
// this.GetLiberaryBaeEn()
|
||||
this.getTimeData();
|
||||
@ -385,8 +386,8 @@
|
||||
// },
|
||||
change(e) {
|
||||
this.ERPLOCATION = e.value;
|
||||
this.LOCATIONNAME = ""
|
||||
this.getLocationName();
|
||||
//this.LOCATIONNAME = ""
|
||||
//this.getLocationName();
|
||||
},
|
||||
//获取焦点的公共方法
|
||||
getfocus(nextfocus) {
|
||||
|
@ -267,6 +267,7 @@
|
||||
this.orgObject = JSON.parse(uni.getStorageSync('orgObject'))
|
||||
this.getTimeData();
|
||||
this.getERPLocation();
|
||||
this.getLocationName();
|
||||
},
|
||||
computed: {},
|
||||
methods: {
|
||||
@ -315,7 +316,7 @@
|
||||
change(e) {
|
||||
this.ERPLOCATION = e.value;
|
||||
console.log(e)
|
||||
this.LOCATIONNAME = ""
|
||||
/* this.LOCATIONNAME = ""
|
||||
this.Huowei=e.Huowei
|
||||
if (e.Huowei == 'Y') {
|
||||
this.Locatiaon_state = false
|
||||
@ -324,7 +325,7 @@
|
||||
this.$showMessage(e.text + "仓库没有启用货位管理")
|
||||
this.Locatiaon_state = true
|
||||
this.focusPalletName = true
|
||||
}
|
||||
} */
|
||||
|
||||
},
|
||||
getERPLocation() {
|
||||
|
@ -266,6 +266,7 @@
|
||||
this.GetLiberaryBaeEn()
|
||||
this.GetPRODUCTLINES()
|
||||
this.getTimeData();
|
||||
this.getLocationName();
|
||||
},
|
||||
methods: {
|
||||
handleScan() {
|
||||
@ -295,8 +296,8 @@
|
||||
},
|
||||
change(e) {
|
||||
this.ERPLOCATION = e.value;
|
||||
this.LOCATIONNAME = ""
|
||||
this.getLocationName();
|
||||
/* this.LOCATIONNAME = ""
|
||||
this.getLocationName(); */
|
||||
},
|
||||
GetArea() {
|
||||
this.$MyRequest('/api/storage/getArea', {}).then(res => {
|
||||
@ -415,33 +416,26 @@
|
||||
getLocationName() {
|
||||
this.items_Location = []
|
||||
let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
|
||||
if (this.ERPLOCATION != '') {
|
||||
this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
|
||||
ERPLocation: ERPFACTORY
|
||||
}).then(res => {
|
||||
if (res.data.success) {
|
||||
for (let i = 0; i < res.data.resultObj.length; i++) {
|
||||
var _Arr = res.data.resultObj[i];
|
||||
this.items_Location.push({
|
||||
text: _Arr.DESCRIPTION,
|
||||
value: _Arr.STORAGENAME
|
||||
});
|
||||
|
||||
}
|
||||
} else {
|
||||
this.$showMessage(res.data.message)
|
||||
this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
|
||||
ERPLocation: ERPFACTORY
|
||||
}).then(res => {
|
||||
if (res.data.success) {
|
||||
for (let i = 0; i < res.data.resultObj.length; i++) {
|
||||
var _Arr = res.data.resultObj[i];
|
||||
this.items_Location.push({
|
||||
text: _Arr.DESCRIPTION,
|
||||
value: _Arr.STORAGENAME
|
||||
});
|
||||
|
||||
}
|
||||
this.focusBarCode = true
|
||||
this.focusShipRequest = false
|
||||
}).catch(err => {
|
||||
this.$showMessage(err)
|
||||
});
|
||||
} else {
|
||||
try {
|
||||
Vue.prototype.$playFail()
|
||||
} catch (e) {}
|
||||
this.$showMessage("请先选择仓库")
|
||||
}
|
||||
} else {
|
||||
this.$showMessage(res.data.message)
|
||||
}
|
||||
this.focusBarCode = true
|
||||
this.focusShipRequest = false
|
||||
}).catch(err => {
|
||||
this.$showMessage(err)
|
||||
});
|
||||
|
||||
},
|
||||
|
||||
|
@ -356,7 +356,7 @@
|
||||
this.GetLiberaryBaeIn()
|
||||
this.GetLiberaryBaeEn()
|
||||
this.getTimeData();
|
||||
|
||||
this.getLocationName();
|
||||
// let Things = 20
|
||||
// for (var i = 0; i < Things; i++) {
|
||||
// this.list_detail.push({aa:"1"})
|
||||
@ -559,8 +559,8 @@
|
||||
},
|
||||
change(e) {
|
||||
this.ERPLOCATION = e.value;
|
||||
this.LOCATIONNAME = ""
|
||||
this.getLocationName();
|
||||
/* this.LOCATIONNAME = ""
|
||||
this.getLocationName(); */
|
||||
},
|
||||
GetArea() {
|
||||
this.$MyRequest('/api/storage/getArea2', {}).then(res => {
|
||||
@ -653,30 +653,26 @@
|
||||
getLocationName() {
|
||||
this.items_Location = []
|
||||
let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
|
||||
if (this.ERPLOCATION != '') {
|
||||
this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
|
||||
ERPLocation: ERPFACTORY
|
||||
}).then(res => {
|
||||
if (res.data.success) {
|
||||
for (let i = 0; i < res.data.resultObj.length; i++) {
|
||||
var _Arr = res.data.resultObj[i];
|
||||
this.items_Location.push({
|
||||
text: _Arr.DESCRIPTION,
|
||||
value: _Arr.STORAGENAME
|
||||
});
|
||||
|
||||
}
|
||||
} else {
|
||||
this.$showMessage(res.data.message)
|
||||
this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
|
||||
ERPLocation: ERPFACTORY
|
||||
}).then(res => {
|
||||
if (res.data.success) {
|
||||
for (let i = 0; i < res.data.resultObj.length; i++) {
|
||||
var _Arr = res.data.resultObj[i];
|
||||
this.items_Location.push({
|
||||
text: _Arr.DESCRIPTION,
|
||||
value: _Arr.STORAGENAME
|
||||
});
|
||||
|
||||
}
|
||||
this.focusBarCode = true
|
||||
this.focusShipRequest = false
|
||||
}).catch(err => {
|
||||
this.$showMessage(err)
|
||||
});
|
||||
} else {
|
||||
this.$showMessage("请先选择仓库")
|
||||
}
|
||||
} else {
|
||||
this.$showMessage(res.data.message)
|
||||
}
|
||||
this.focusBarCode = true
|
||||
this.focusShipRequest = false
|
||||
}).catch(err => {
|
||||
this.$showMessage(err)
|
||||
});
|
||||
|
||||
},
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user