Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

2025-03-20 10:34:15 +08:00 · 2025-03-20 10:34:15 +08:00 · ac33d6bdd7
parent d05744e01f 1cf66a36b5
commit ac33d6bdd7
1 changed files with 12 additions and 2 deletions
--- 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: '用药类型名称',