From 35c422aa74e47a2ee4bea49e6799fefac1b63713 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:39:47 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
index 8a95d66..227cb83 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
@@ -134,17 +134,17 @@
preferenceKey='warehouseAreas'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <WarehouseAreasPanel />}
- expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
- <TextField source="uuid" label="table.field.warehouseAreas.uuid" />
+ {/* <TextField source="uuid" label="table.field.warehouseAreas.uuid" /> */}
<TextField source="name" label="table.field.warehouseAreas.name" />
<TextField source="code" label="table.field.warehouseAreas.code" />
- <ReferenceField source="shipperId" label="table.field.warehouseAreas.shipperId" reference="shipper" link={false} sortable={false}>
+ {/* <ReferenceField source="shipperId" label="table.field.warehouseAreas.shipperId" reference="shipper" link={false} sortable={false}>
<TextField source="name" />
- </ReferenceField>
+ </ReferenceField> */}
+ <TextField source="warehouseId$" label="table.field.warehouseAreas.wareId" />
+ <TextField source="shipperId$" label="table.field.warehouseAreas.shipperId" />
<NumberField source="supplierId" label="table.field.warehouseAreas.supplierId" />
<TextField source="flagMinus$" label="table.field.warehouseAreas.flagMinus" sortable={false} />
<TextField source="flagLabelMange$" label="table.field.warehouseAreas.flagLabelMange" sortable={false} />
--
Gitblit v1.9.1