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/basicInfo/locArea/LocAreaList.jsx | 2 +-
rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx b/rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx
index ff1f348..9f92799 100644
--- a/rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx
+++ b/rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx
@@ -122,7 +122,7 @@
<NumberField source="id" />
<TextField source="name" label="table.field.locArea.name" />
<TextField source="code" label="table.field.locArea.code" />
- <NumberField source="areaId" label="table.field.locArea.areaId" />
+ <NumberField source="areaId$" label="table.field.locArea.areaId" />
{/* <ReferenceField source="locId" label="table.field.locArea.locId" reference="loc" link={false} sortable={false}>
<TextField source="warehouseId" />
</ReferenceField> */}
diff --git a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
index 299e9d7..a2863a9 100644
--- a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
@@ -98,7 +98,7 @@
</FormControl>
<Box>
- <div ref={contentRef} style={{ justifyContent: 'center' }}>
+ <div ref={contentRef} style={{ display: 'flex', justifyContent: 'center' }}>
<table
className="contain"
style={{
--
Gitblit v1.9.1