From ccfe7438c2baa4b802c6fc9b743e2f9a435aebbb Mon Sep 17 00:00:00 2001 From: "tianyi@bogon" Date: Mon, 6 Nov 2023 10:13:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/inventory/addinventory.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pages/inventory/addinventory.vue b/pages/inventory/addinventory.vue index ac5e2ab..93a2b31 100644 --- a/pages/inventory/addinventory.vue +++ b/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 {