From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx
index a27e68c..e1c0533 100644
--- a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx
+++ b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx
@@ -115,12 +115,14 @@
                     rowClick={(id, resource, record) => false}
                     expand={() => <LocAreaMatPanel />}
                     expandSingle={true}
-                    omit={['id', 'createTime', 'createBy', 'memo']}
+                    omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
                 >
                     <NumberField source="id" />
                     <TextField source="code" label="table.field.locAreaMat.code" />
-                    {/* <NumberField source="warehouseId" label="table.field.locAreaMat.warehouseId" />
-                    <NumberField source="areaId" label="table.field.locAreaMat.areaId" /> */}
+                    <TextField source="name" label="table.field.locAreaMat.name" />
+                    <TextField source="warehouseId$" label="table.field.locAreaMat.warehouseId" />
+                    <TextField source="areaId$" label="table.field.locAreaMat.areaId" />
+
                     <TextField source="depict" label="table.field.locAreaMat.depict" />
 
                     <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>

--
Gitblit v1.9.1