Merge pull request '更新' (#22) from zyj into master
Reviewed-on: #22
This commit was merged in pull request #22.
This commit is contained in:
@@ -215,7 +215,7 @@ export default {
|
|||||||
],
|
],
|
||||||
tableColumns: [
|
tableColumns: [
|
||||||
{
|
{
|
||||||
prop: 'orderSerialNumber',
|
prop: 'id',
|
||||||
minWidth: 180,
|
minWidth: 180,
|
||||||
label: '订单号',
|
label: '订单号',
|
||||||
show: true,
|
show: true,
|
||||||
@@ -367,21 +367,6 @@ export default {
|
|||||||
sums[index] = '合计'
|
sums[index] = '合计'
|
||||||
return
|
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) {
|
if (this.importData.settlementType == 1) {
|
||||||
switch (
|
switch (
|
||||||
column.property // column.property可以匹配它的每一列的命名, 然后赋值
|
column.property // column.property可以匹配它的每一列的命名, 然后赋值
|
||||||
|
|||||||
Reference in New Issue
Block a user