|
@@ -34,7 +34,7 @@ const ChildTableComp = {
|
|
|
:row-style-option="{clickHighlight: true, stripe: true}"
|
|
|
:cellSelectionOption="{enable: false}"
|
|
|
:scroll-width="0"
|
|
|
- :max-height="row.childData.length*30>300?300:row.childData.length*30"
|
|
|
+ :max-height="row.childData.length*30>300?300:row.childData.length*30+31"
|
|
|
row-key-field-name="id"
|
|
|
:virtual-scroll-option="{enable: true}"
|
|
|
:columns="columns"
|
|
@@ -145,7 +145,7 @@ export default {
|
|
|
|
|
|
const arr = [
|
|
|
{ field: '', key: 'x', type: (this.isTeyue ? '-' : 'expand'), title: '品类', width: '5%', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return expendFormat(row, row[column.field], h) } },
|
|
|
- { title: '上级经销商' + this.isTeyue, field: 'superDealerName', width: '20%', key: 'h', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--' } },
|
|
|
+ { title: '上级经销商', field: 'superDealerName', width: '20%', key: 'h', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--' } },
|
|
|
{ title: '差价归属方', field: 'rebateDealerList', width: '65%', key: 'k', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return jcgsFormat(row, row[column.field], h) } },
|
|
|
{ title: '操作', field: 'action', width: '10%', key: 's', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return actionFormat(row, row[column.field], h) } }
|
|
|
]
|
|
@@ -204,6 +204,8 @@ export default {
|
|
|
no: i + 1,
|
|
|
id: item.id,
|
|
|
superDealerName: supDealerList.parentDealer.dealerName,
|
|
|
+ dealerUpsSn: item.dealerUpsSn,
|
|
|
+ dealerSn: item.dealerSn,
|
|
|
rebateDealerList: rebateDealerList,
|
|
|
childData: rebateScopeList
|
|
|
})
|