|
@@ -798,10 +798,16 @@ export default {
|
|
|
if (packingBoolen && measureBoolen && row.packingUnit != 'L') {
|
|
if (packingBoolen && measureBoolen && row.packingUnit != 'L') {
|
|
|
row.weight = total;
|
|
row.weight = total;
|
|
|
console.log(total, '6')
|
|
console.log(total, '6')
|
|
|
- } else {
|
|
|
|
|
- row.weight = this.$math.format(total * row.netWeight, 14);
|
|
|
|
|
- console.log(total, '7')
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+ let weight = 0
|
|
|
|
|
+ if(row.measureUnit==row.weightUnit){
|
|
|
|
|
+ weight = row.measureQuantity
|
|
|
|
|
+ }else if(row.singleWeight){
|
|
|
|
|
+ weight = row.measureQuantity * Number(row.singleWeight);
|
|
|
|
|
+ }
|
|
|
|
|
+ this.$set(this.productList[index], 'weight', weight)
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
// 获取动态表头
|
|
// 获取动态表头
|