|
@@ -99,7 +99,7 @@
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
- :scroll="{ x: 3240, y: tableHeight }"
|
|
|
+ :scroll="{ x: 3340, y: tableHeight }"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
<template slot="footer">
|
|
@@ -126,6 +126,7 @@
|
|
|
<a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
|
|
|
<a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
|
|
|
<a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
|
|
|
+ <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
|
|
|
<a-col span="6">开单退货单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
|
|
|
</a-row>
|
|
|
</a-col>
|
|
@@ -335,6 +336,13 @@ export default {
|
|
|
align: 'center',
|
|
|
width: 100,
|
|
|
customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '布瑞斯',
|
|
|
+ dataIndex: 'brsAmount',
|
|
|
+ align: 'center',
|
|
|
+ width: 100,
|
|
|
+ customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
|
|
|
}
|
|
|
] },
|
|
|
{ title: '开单退货单合计金额', width: 200, dataIndex: 'sumAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
|