|
@@ -740,13 +740,18 @@ export default {
|
|
if(j==0){
|
|
if(j==0){
|
|
this.goodsList.push(this.warehouseList[i].goodsNameInfos[j])
|
|
this.goodsList.push(this.warehouseList[i].goodsNameInfos[j])
|
|
}else{
|
|
}else{
|
|
- for(let n = 0;n < this.goodsList.length;n++){
|
|
|
|
- if(this.goodsList[n].goodsName == this.warehouseList[i].goodsNameInfos[j].goodsName){
|
|
|
|
- this.goodsList[n].storage += this.warehouseList[i].goodsNameInfos[j].storage
|
|
|
|
- }else{
|
|
|
|
|
|
+ //
|
|
|
|
+ if(this.goodsList.every((item)=>{return item.goodsName != this.warehouseList[i].goodsNameInfos[j].goodsName}) ){
|
|
this.goodsList.push(this.warehouseList[i].goodsNameInfos[j])
|
|
this.goodsList.push(this.warehouseList[i].goodsNameInfos[j])
|
|
|
|
+ }else{
|
|
|
|
+ for(let n = 0;n < this.goodsList.length;n++){
|
|
|
|
+ if(this.goodsList[n].goodsName == this.warehouseList[i].goodsNameInfos[j].goodsName){
|
|
|
|
+ this.goodsList[n].storage += this.warehouseList[i].goodsNameInfos[j].storage
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+ //
|
|
}
|
|
}
|
|
}
|
|
}
|
|
this.baseId = this.warehouseList[i].id
|
|
this.baseId = this.warehouseList[i].id
|
|
@@ -763,7 +768,6 @@ export default {
|
|
this.goodsName = this.goodsList[e].goodsName
|
|
this.goodsName = this.goodsList[e].goodsName
|
|
this.reserves = this.goodsList[e].storage
|
|
this.reserves = this.goodsList[e].storage
|
|
this.multipleSelection1={}
|
|
this.multipleSelection1={}
|
|
-
|
|
|
|
this.getList()
|
|
this.getList()
|
|
},
|
|
},
|
|
handleClose5() {
|
|
handleClose5() {
|