From 1cf66a36b578b2e4fe170302f8eacb30ad23fbdb Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 20 Mar 2025 10:10:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigMaterial/ConfigMaterialCategory.data.ts  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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: '用药类型名称',