|
|
|
@ -218,7 +218,7 @@ export default { |
|
|
|
|
], |
|
|
|
|
tableColumns: [ |
|
|
|
|
{ |
|
|
|
|
prop: 'orderSerialNumber', |
|
|
|
|
prop: 'id', |
|
|
|
|
minWidth: 180, |
|
|
|
|
label: '订单号', |
|
|
|
|
show: true, |
|
|
|
@ -370,21 +370,6 @@ export default { |
|
|
|
|
sums[index] = '合计' |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
const values = data.map(item => Number(item[column.property])) |
|
|
|
|
if (!values.every(value => isNaN(value))) { |
|
|
|
|
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) |
|
|
|
|
sums[index] += ' 元' |
|
|
|
|
} else { |
|
|
|
|
sums[index] = '' |
|
|
|
|
} |
|
|
|
|
if (this.importData.settlementType == 1) { |
|
|
|
|
switch ( |
|
|
|
|
column.property // column.property可以匹配它的每一列的命名, 然后赋值 |
|
|
|
|