入库

pages/inventory/addinventory.vue

@@ -166,12 +166,12 @@
 				for (let i = 0; i < this.carList1.length; i++) {
 					if(this.carList.has(this.carList1[i].id) == true){ //商品相同
 						for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
-							if(this.carList.get(this.carList1[i].id).stockLogList.has(this.carList1[i].saleDetailQueryDTO[m].name)==true){ //规格相同
+							if(this.carList.get(this.carList1[i].id).stockLogList.has(this.carList1[i].saleDetailQueryDTO[m].attributeList)==true){ //规格相同
 								console.log("规格相同")
-								this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].name,this.carList.get(this.carList1[i].id).stockLogList.get(this.carList1[i].saleDetailQueryDTO[m].name) + this.carList1[i].saleDetailQueryDTO[m].productCount)
+								this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList,this.carList.get(this.carList1[i].id).stockLogList.get(this.carList1[i].saleDetailQueryDTO[m].attributeList) + this.carList1[i].saleDetailQueryDTO[m].productCount)
 							}else{ //规格不同
 								console.log("规格不同")
-								this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].name,this.carList1[i].saleDetailQueryDTO[m].productCount)
+								this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList,this.carList1[i].saleDetailQueryDTO[m].productCount)
 							}
 						}
 					}else{//商品不同
@@ -348,7 +348,8 @@
 	.content {
 		border-top: 1px solid #eee;
 		overflow-y: scroll;
-		max-height: 100vh;
+		max-height: 100vh;
+		margin-bottom: 100rpx;
 	}
 
 	.content-box {