From 582bb0870ad1aff4802b0cd38b67386b7e580e65 Mon Sep 17 00:00:00 2001
From: "tianyi@bogon" <ittianyi@163.com>
Date: Mon, 6 Nov 2023 10:01:35 +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 | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pages/inventory/addinventory.vue b/pages/inventory/addinventory.vue
index e977d47..ac5e2ab 100644
--- a/pages/inventory/addinventory.vue
+++ b/pages/inventory/addinventory.vue
@@ -40,7 +40,7 @@
 					</view>
 					<view class="shop-type">
 						<view class="shop-collapse" v-for="(values,keys) in Array.from(value[1].stockLogList)">
-							<text>{{values[0]}}</text>
+							<text>{{value[1].name}}</text>
 							<!-- <text style="color: red;">单价：￥{{item.price}}</text> -->
 							<text>数量：{{values[1]}}</text>
 						</view>
@@ -149,10 +149,12 @@
 						productPicture: this.carList1[i].productPicture,
 						productSn:this.carList1[i].productSn,
 						stockLogList: new Map(),
-						stockLogList1:[]
+						stockLogList1:[],
+						name:''
 					}
 					for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
-						obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].name,this.carList1[i].saleDetailQueryDTO[m].productCount)
+						obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList,this.carList1[i].saleDetailQueryDTO[m].productCount)
+						obj.name = this.carList1[i].saleDetailQueryDTO[m].name
 					}
 					console.log("没有数据")
 					this.carList.set(this.carList1[i].id, obj)
@@ -180,10 +182,12 @@
 							productName: this.carList1[i].productName,
 							productPicture: this.carList1[i].productPicture,
 							stockLogList: new Map(),
-							stockLogList1:[]
+							stockLogList1:[],
+							name:''
 						}
 						for (let m = 0; m < this.carList1[i].saleDetailQueryDTO.length; m++) {
-							obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].name,this.carList1[i].saleDetailQueryDTO[m].productCount)
+							obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList,this.carList1[i].saleDetailQueryDTO[m].productCount)
+							obj.name = this.carList1[i].saleDetailQueryDTO[m].name
 						}
 						this.carList.set(this.carList1[i].id,obj)
 					}