|
@@ -291,13 +291,23 @@ export default {
|
|
|
}
|
|
}
|
|
|
return obj
|
|
return obj
|
|
|
}
|
|
}
|
|
|
|
|
+ const rowspanMix2 = function (value, row, index) {
|
|
|
|
|
+ const obj = {
|
|
|
|
|
+ children: (value || value == 0) ? _this.toThousands(value) : '--',
|
|
|
|
|
+ attrs: {}
|
|
|
|
|
+ }
|
|
|
|
|
+ if (row.rowspan1 != undefined) {
|
|
|
|
|
+ obj.attrs.rowSpan = row.rowspan1
|
|
|
|
|
+ }
|
|
|
|
|
+ return obj
|
|
|
|
|
+ }
|
|
|
return [
|
|
return [
|
|
|
{
|
|
{
|
|
|
title: '销售单号',
|
|
title: '销售单号',
|
|
|
dataIndex: 'salesBillNo',
|
|
dataIndex: 'salesBillNo',
|
|
|
width: '120px',
|
|
width: '120px',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
- customRender: (value, row, index) => rowspanMix(value, row, index)
|
|
|
|
|
|
|
+ customRender: rowspanMix
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
title: '区域',
|
|
title: '区域',
|
|
@@ -399,21 +409,21 @@ export default {
|
|
|
dataIndex: 'totalRealAmountSum',
|
|
dataIndex: 'totalRealAmountSum',
|
|
|
width: '100px',
|
|
width: '100px',
|
|
|
align: 'right',
|
|
align: 'right',
|
|
|
- customRender: rowspanMix1
|
|
|
|
|
|
|
+ customRender: rowspanMix2
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
title: '开单金额',
|
|
title: '开单金额',
|
|
|
dataIndex: 'totalAmountSum',
|
|
dataIndex: 'totalAmountSum',
|
|
|
width: '100px',
|
|
width: '100px',
|
|
|
align: 'right',
|
|
align: 'right',
|
|
|
- customRender: rowspanMix1
|
|
|
|
|
|
|
+ customRender: rowspanMix2
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
title: '成本金额',
|
|
title: '成本金额',
|
|
|
dataIndex: 'totalRealCostSum',
|
|
dataIndex: 'totalRealCostSum',
|
|
|
width: '100px',
|
|
width: '100px',
|
|
|
align: 'right',
|
|
align: 'right',
|
|
|
- customRender: rowspanMix1
|
|
|
|
|
|
|
+ customRender: rowspanMix2
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
title: '规则数量(非促)',
|
|
title: '规则数量(非促)',
|