|
@@ -466,7 +466,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
title: '体积',
|
|
|
- dataIndex: 'totalVolume',
|
|
|
+ dataIndex: 'volume',
|
|
|
width: 120,
|
|
|
ellipsis: true,
|
|
|
// scopedSlots: { customRender: 'containerNo' },
|
|
@@ -664,11 +664,13 @@ export default {
|
|
|
item.netWeight = (Number(item.netWeight)).toFixed(2)
|
|
|
item.grossWeight = (Number(item.grossWeight)).toFixed(2)
|
|
|
item.number = (Number(item.number)).toFixed(2)
|
|
|
+ item.volume = item.totalVolume
|
|
|
//参照面料时,单价许计算 金额/净重
|
|
|
// if(item.readyFabric == '面料'){
|
|
|
// item.price = (item.totalPrice/item.netWeight).toFixed(2)
|
|
|
// }
|
|
|
})
|
|
|
+ debugger
|
|
|
// var subList = this.convertReferToSub(data);
|
|
|
this.addBookData = this.addBookData.concat(data);
|
|
|
this.addBook.termsOfDeliveryvalue = 'FOB'
|
|
@@ -795,8 +797,8 @@ export default {
|
|
|
if (rowData.totalPrice != undefined && rowData.totalPrice != ""){
|
|
|
moneyAll += rowData.totalPrice*1;
|
|
|
}
|
|
|
- if (rowData.totalVolume != undefined && rowData.totalVolume != ""){
|
|
|
- vol += rowData.totalVolume*1;
|
|
|
+ if (rowData.volume != undefined && rowData.volume != ""){
|
|
|
+ vol += rowData.volume*1;
|
|
|
}
|
|
|
}
|
|
|
headData.totalVolume = parseFloat(vol.toFixed(4));
|