From bea0dac85e865e3d5dae5b3fd641eb07a4b1b80c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 21 二月 2025 10:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/page/matnr/MatnrPanel.jsx | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/matnr/MatnrPanel.jsx b/rsf-admin/src/page/matnr/MatnrPanel.jsx
index fe8ad1f..9951914 100644
--- a/rsf-admin/src/page/matnr/MatnrPanel.jsx
+++ b/rsf-admin/src/page/matnr/MatnrPanel.jsx
@@ -66,8 +66,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.batchRegularId"
- property={record.batchRegularId$}
+ title="table.field.matnr.rglarId"
+ property={record.rglarId$}
/>
</Grid>
<Grid item xs={6}>
@@ -126,8 +126,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.purchaseUnit"
- property={record.purchaseUnit}
+ title="table.field.matnr.purUnit"
+ property={record.purUnit}
/>
</Grid>
<Grid item xs={6}>
@@ -138,8 +138,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.stockLeval"
- property={record.stockLeval$}
+ title="table.field.matnr.stockLevel"
+ property={record.stockLevel$}
/>
</Grid>
<Grid item xs={6}>
@@ -150,8 +150,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.safetyQty"
- property={record.safetyQty}
+ title="table.field.matnr.safeQty"
+ property={record.safeQty}
/>
</Grid>
<Grid item xs={6}>
@@ -168,20 +168,20 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.stagnate"
- property={record.stagnate}
+ title="table.field.matnr.stagn"
+ property={record.stagn}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.validity"
- property={record.validity}
+ title="table.field.matnr.valid"
+ property={record.valid}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.validityWarr"
- property={record.validityWarr}
+ title="table.field.matnr.validWarn"
+ property={record.validWarn}
/>
</Grid>
<Grid item xs={6}>
--
Gitblit v1.9.1