diff --git a/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue b/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue index d3a00c98..eeecb04a 100644 --- a/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue +++ b/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue @@ -118,6 +118,14 @@ + + + + + + @@ -341,7 +349,7 @@ export default { return prev; } }, 0); - sums[index] = sums[index].toFixed(2); + sums[index] = sums[index].toFixed(0); } else if ( @@ -374,7 +382,7 @@ export default { return prev; } }, 0); - sums[index] = sums[index].toFixed(2); + sums[index] = sums[index].toFixed(0); } else if ( @@ -390,8 +398,20 @@ export default { } }, 0); sums[index] = sums[index].toFixed(2); - } - else if( + } else if ( + column.property === 'airTickets' + ){ + const values = data.map(item => Number(item.airTickets)); + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] = sums[index].toFixed(0); + } else if( column.property === 'airWeight' ){ const values = data.map(item => Number(item.airWeight)); @@ -403,7 +423,7 @@ export default { return prev; } }, 0); - sums[index] = sums[index].toFixed(0); + sums[index] = sums[index].toFixed(2); }else if( column.property === 'landTickets' ){ @@ -416,7 +436,7 @@ export default { return prev; } }, 0); - sums[index] = sums[index].toFixed(2); + sums[index] = sums[index].toFixed(0); }else if( column.property === 'landWeight' ){ @@ -429,7 +449,7 @@ export default { return prev; } }, 0); - sums[index] = sums[index].toFixed(0); + sums[index] = sums[index].toFixed(2); }else if( column.property === 'importTickets' ){ @@ -442,7 +462,7 @@ export default { return prev; } }, 0); - sums[index] = sums[index].toFixed(2); + sums[index] = sums[index].toFixed(0); }else if( column.property === 'importWeight' ){ @@ -455,10 +475,61 @@ export default { return prev; } }, 0); + sums[index] = sums[index].toFixed(2); + }else if( + column.property === 'seaTickets' + ){ + const values = data.map(item => Number(item.seaTickets)); + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); sums[index] = sums[index].toFixed(0); + }else if( + column.property === 'seaWeight' + ){ + const values = data.map(item => Number(item.seaWeight)); + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] = sums[index].toFixed(2); + }else if( + column.property === 'otherTickets' + ){ + const values = data.map(item => Number(item.otherTickets)); + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] = sums[index].toFixed(0); + }else if( + column.property === 'otherWeight' + ){ + const values = data.map(item => Number(item.otherWeight)); + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] = sums[index].toFixed(2); } }); - console.log(sums); return sums }, handleExportDtl(){