|
|
@@ -1867,6 +1867,8 @@
|
|
|
}
|
|
|
});
|
|
|
|
|
|
+ console.log(mergedList, 'mergedList');
|
|
|
+
|
|
|
// 包装列表 this.detailList
|
|
|
// 获取主数据物品详情
|
|
|
// let { category } = await getDetails(this.form.categoryId);
|
|
|
@@ -1957,6 +1959,12 @@
|
|
|
|
|
|
console.log('packingSpecificationLabel~~~~~~', this.detailList, res, packingSpecification, packingSpecificationOptions, packingSpecificationItem);
|
|
|
|
|
|
+ let packingQuantity =
|
|
|
+ filtersItem.totalCountNew ||
|
|
|
+ filtersItem.purchaseCount ||
|
|
|
+ filtersItem.totalCount ||
|
|
|
+ 0;
|
|
|
+ console.log(packingQuantity, 'packingQudasdasdantity');
|
|
|
// 显示规格
|
|
|
let packingSpecificationLabel = packingSpecificationItem?.map((item) => {
|
|
|
if (item.sort > 0) {
|
|
|
@@ -2068,9 +2076,7 @@
|
|
|
: filtersItem.modelKey
|
|
|
? filtersItem.modelKey
|
|
|
: '', // 机型
|
|
|
- batchNo: [1, 3, 6].includes(this.bizType)
|
|
|
- ? this.detailList[0]?.batchNo || batchNo
|
|
|
- : batchNo, // 批次号
|
|
|
+ batchNo: filtersItem?.batchNo || batchNo, // 批次号
|
|
|
supplierListOptions: supplierList[item.id], // 供应商列表
|
|
|
supplierId:
|
|
|
filtersItem?.supplierId || item.supplierId, // 供应商id
|
|
|
@@ -2090,11 +2096,11 @@
|
|
|
// ).length
|
|
|
// : this.detailList.length || this.form.detailList.length, // 包装数量
|
|
|
|
|
|
- packingQuantity: this.isMoreProduct ? filtersItem.packingQuantity : this.detailList.length || this.detailList.length,
|
|
|
+ packingQuantity: this.isMoreProduct ? filtersItem.packingQuantity : filtersItem.packingQuantity || this.detailList.length,
|
|
|
packingUnit: packingUnit, // 单位
|
|
|
measureQuantity: this.isMoreProduct
|
|
|
? filtersItem.quantity
|
|
|
- : this.form.totalCount, // 计量数量
|
|
|
+ : filtersItem.quantity || this.form.totalCount, // 计量数量
|
|
|
measureUnit: filtersItem.measuringUnit, // 计量单位
|
|
|
measureType: item.measureType, // 计量方式
|
|
|
netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
|