Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
3d8dacc9d8
@ -244,9 +244,13 @@ export default {
|
|||||||
getList() {
|
getList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
listWmstock(this.queryParams).then(response => {
|
listWmstock(this.queryParams).then(response => {
|
||||||
this.wmstockList = response.rows;
|
if(response.rows){
|
||||||
this.total = response.total;
|
this.wmstockList = response.rows.filter((el) =>{
|
||||||
this.loading = false;
|
return el.warehouseCode.indexOf('VIR') == -1;
|
||||||
|
});
|
||||||
|
this.total = response.total;
|
||||||
|
this.loading = false;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/** 查询分类下拉树结构 */
|
/** 查询分类下拉树结构 */
|
||||||
|
@ -358,7 +358,11 @@ export default {
|
|||||||
},
|
},
|
||||||
getWarehouseList(){
|
getWarehouseList(){
|
||||||
getTreeList().then( response =>{
|
getTreeList().then( response =>{
|
||||||
this.warehouseOptions = response.data;
|
if(response.data){
|
||||||
|
this.warehouseOptions = response.data.filter((el) =>{
|
||||||
|
return el.warehouseCode.indexOf('VIR') == -1;
|
||||||
|
});;
|
||||||
|
}
|
||||||
this.warehouseOptions.map(w =>{
|
this.warehouseOptions.map(w =>{
|
||||||
w.children.map(l =>{
|
w.children.map(l =>{
|
||||||
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
|
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
|
||||||
|
@ -359,7 +359,11 @@ export default {
|
|||||||
},
|
},
|
||||||
getWarehouseList(){
|
getWarehouseList(){
|
||||||
getTreeList().then( response =>{
|
getTreeList().then( response =>{
|
||||||
this.warehouseOptions = response.data;
|
if(response.data){
|
||||||
|
this.warehouseOptions = response.data.filter((el) =>{
|
||||||
|
return el.warehouseCode.indexOf('VIR') == -1;
|
||||||
|
});;
|
||||||
|
}
|
||||||
this.warehouseOptions.map(w =>{
|
this.warehouseOptions.map(w =>{
|
||||||
w.children.map(l =>{
|
w.children.map(l =>{
|
||||||
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
|
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
|
||||||
|
@ -238,7 +238,11 @@ export default {
|
|||||||
},
|
},
|
||||||
getWarehouseList(){
|
getWarehouseList(){
|
||||||
getTreeList().then( response =>{
|
getTreeList().then( response =>{
|
||||||
this.warehouseOptions = response.data;
|
if(response.data){
|
||||||
|
this.warehouseOptions = response.data.filter((el) =>{
|
||||||
|
return el.warehouseCode.indexOf('VIR') == -1;
|
||||||
|
});;
|
||||||
|
}
|
||||||
this.warehouseOptions.map(w =>{
|
this.warehouseOptions.map(w =>{
|
||||||
debugger;
|
debugger;
|
||||||
w.children.map(l =>{
|
w.children.map(l =>{
|
||||||
|
@ -296,7 +296,11 @@ export default {
|
|||||||
},
|
},
|
||||||
getWarehouseList(){
|
getWarehouseList(){
|
||||||
getTreeList().then( response =>{
|
getTreeList().then( response =>{
|
||||||
this.warehouseOptions = response.data;
|
if(response.data){
|
||||||
|
this.warehouseOptions = response.data.filter((el) =>{
|
||||||
|
return el.warehouseCode.indexOf('VIR') == -1;
|
||||||
|
});;
|
||||||
|
}
|
||||||
this.warehouseOptions.map(w =>{
|
this.warehouseOptions.map(w =>{
|
||||||
w.children.map(l =>{
|
w.children.map(l =>{
|
||||||
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
|
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
|
||||||
|
@ -232,7 +232,11 @@ export default {
|
|||||||
},
|
},
|
||||||
getWarehouseList(){
|
getWarehouseList(){
|
||||||
getTreeList().then( response =>{
|
getTreeList().then( response =>{
|
||||||
this.warehouseOptions = response.data;
|
if(response.data){
|
||||||
|
this.warehouseOptions = response.data.filter((el) =>{
|
||||||
|
return el.warehouseCode.indexOf('VIR') == -1;
|
||||||
|
});;
|
||||||
|
}
|
||||||
this.warehouseOptions.map(w =>{
|
this.warehouseOptions.map(w =>{
|
||||||
w.children.map(l =>{
|
w.children.map(l =>{
|
||||||
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
|
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
|
||||||
|
@ -369,7 +369,11 @@ export default {
|
|||||||
},
|
},
|
||||||
getWarehouseList(){
|
getWarehouseList(){
|
||||||
getTreeList().then( response =>{
|
getTreeList().then( response =>{
|
||||||
this.warehouseOptions = response.data;
|
if(response.data){
|
||||||
|
this.warehouseOptions = response.data.filter((el) =>{
|
||||||
|
return el.warehouseCode.indexOf('VIR') == -1;
|
||||||
|
});;
|
||||||
|
}
|
||||||
this.warehouseOptions.map(w =>{
|
this.warehouseOptions.map(w =>{
|
||||||
w.children.map(l =>{
|
w.children.map(l =>{
|
||||||
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
|
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
|
||||||
|
@ -224,7 +224,11 @@ export default {
|
|||||||
},
|
},
|
||||||
getWarehouseList(){
|
getWarehouseList(){
|
||||||
getTreeList().then( response =>{
|
getTreeList().then( response =>{
|
||||||
this.warehouseOptions = response.data;
|
if(response.data){
|
||||||
|
this.warehouseOptions = response.data.filter((el) =>{
|
||||||
|
return el.warehouseCode.indexOf('VIR') == -1;
|
||||||
|
});;
|
||||||
|
}
|
||||||
this.warehouseOptions.map(w =>{
|
this.warehouseOptions.map(w =>{
|
||||||
w.children.map(l =>{
|
w.children.map(l =>{
|
||||||
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
|
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
|
||||||
|
Loading…
Reference in New Issue
Block a user