Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue
This commit is contained in:
commit
ac33d6bdd7
|
@ -21,12 +21,22 @@ export const allColumns: BasicColumn[] = [
|
||||||
{
|
{
|
||||||
title: '物料类别名称',
|
title: '物料类别名称',
|
||||||
align:"center",
|
align:"center",
|
||||||
dataIndex: 'categoryName'
|
dataIndex: 'categoryName',
|
||||||
|
customCell: (record, index, column) => {
|
||||||
|
if (record.categoryRowSpan != null) {
|
||||||
|
return { rowSpan: record.categoryRowSpan };
|
||||||
|
}
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '物料类型名称',
|
title: '物料类型名称',
|
||||||
align:"center",
|
align:"center",
|
||||||
dataIndex: 'typeName'
|
dataIndex: 'typeName',
|
||||||
|
customCell: (record, index, column) => {
|
||||||
|
if (record.typeRowSpan != null) {
|
||||||
|
return { rowSpan: record.typeRowSpan };
|
||||||
|
}
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '用药类型名称',
|
title: '用药类型名称',
|
||||||
|
|
Loading…
Reference in New Issue