|
@@ -1774,29 +1774,29 @@
|
|
|
packingSpecificationLabel: packingSpecificationLabel, // 包装规格显示
|
|
packingSpecificationLabel: packingSpecificationLabel, // 包装规格显示
|
|
|
// minPackingQuantity: minPackingQuantity, // 最小包装单元数量
|
|
// minPackingQuantity: minPackingQuantity, // 最小包装单元数量
|
|
|
packingQuantity:
|
|
packingQuantity:
|
|
|
- this.saleProductList[index] &&
|
|
|
|
|
- this.saleProductList[index].isAllPackageData &&
|
|
|
|
|
- this.saleProductList[index].isAllPackageData == 1
|
|
|
|
|
- ? this.saleProductList[index].packingCount
|
|
|
|
|
|
|
+ filtersItem &&
|
|
|
|
|
+ filtersItem.isAllPackageData &&
|
|
|
|
|
+ filtersItem.isAllPackageData == 1
|
|
|
|
|
+ ? filtersItem.packingCount
|
|
|
: packingQuantity, // 包装数量
|
|
: packingQuantity, // 包装数量
|
|
|
packingUnit:
|
|
packingUnit:
|
|
|
- this.saleProductList[index] &&
|
|
|
|
|
- this.saleProductList[index].isAllPackageData &&
|
|
|
|
|
- this.saleProductList[index].isAllPackageData == 1
|
|
|
|
|
- ? this.saleProductList[index].packingUnit
|
|
|
|
|
|
|
+ filtersItem &&
|
|
|
|
|
+ filtersItem.isAllPackageData &&
|
|
|
|
|
+ filtersItem.isAllPackageData == 1
|
|
|
|
|
+ ? filtersItem.packingUnit
|
|
|
: packingUnit, // 单位
|
|
: packingUnit, // 单位
|
|
|
measureQuantity:
|
|
measureQuantity:
|
|
|
- this.saleProductList[index] &&
|
|
|
|
|
- this.saleProductList[index].isAllPackageData &&
|
|
|
|
|
- this.saleProductList[index].isAllPackageData == 1
|
|
|
|
|
- ? this.saleProductList[index].quantity
|
|
|
|
|
|
|
+ filtersItem &&
|
|
|
|
|
+ filtersItem.isAllPackageData &&
|
|
|
|
|
+ filtersItem.isAllPackageData == 1
|
|
|
|
|
+ ? filtersItem.quantity
|
|
|
: measureQuantity, // 计量数量
|
|
: measureQuantity, // 计量数量
|
|
|
// measureQuantityOld,
|
|
// measureQuantityOld,
|
|
|
measureUnit:
|
|
measureUnit:
|
|
|
- this.saleProductList[index] &&
|
|
|
|
|
- this.saleProductList[index].isAllPackageData &&
|
|
|
|
|
- this.saleProductList[index].isAllPackageData == 1
|
|
|
|
|
- ? this.saleProductList[index].measuringUnit
|
|
|
|
|
|
|
+ filtersItem &&
|
|
|
|
|
+ filtersItem.isAllPackageData &&
|
|
|
|
|
+ filtersItem.isAllPackageData == 1
|
|
|
|
|
+ ? filtersItem.measuringUnit
|
|
|
: item.measuringUnit, // 计量单位
|
|
: item.measuringUnit, // 计量单位
|
|
|
packingUnitId:
|
|
packingUnitId:
|
|
|
filtersItem.purchaseUnitId || filtersItem.saleUnitId,
|
|
filtersItem.purchaseUnitId || filtersItem.saleUnitId,
|