diff --git a/src/views/config/ConfigMaterial/ConfigMaterialCategory.data.ts b/src/views/config/ConfigMaterial/ConfigMaterialCategory.data.ts index 3f78862..e75e662 100644 --- a/src/views/config/ConfigMaterial/ConfigMaterialCategory.data.ts +++ b/src/views/config/ConfigMaterial/ConfigMaterialCategory.data.ts @@ -21,12 +21,22 @@ export const allColumns: BasicColumn[] = [ { title: '物料类别名称', align:"center", - dataIndex: 'categoryName' + dataIndex: 'categoryName', + customCell: (record, index, column) => { + if (record.categoryRowSpan != null) { + return { rowSpan: record.categoryRowSpan }; + } + }, }, { title: '物料类型名称', align:"center", - dataIndex: 'typeName' + dataIndex: 'typeName', + customCell: (record, index, column) => { + if (record.typeRowSpan != null) { + return { rowSpan: record.typeRowSpan }; + } + }, }, { title: '用药类型名称',