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 | 72 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 12 deletions(-)
diff --git a/rsf-admin/src/page/matnr/MatnrPanel.jsx b/rsf-admin/src/page/matnr/MatnrPanel.jsx
index 434ce30..9951914 100644
--- a/rsf-admin/src/page/matnr/MatnrPanel.jsx
+++ b/rsf-admin/src/page/matnr/MatnrPanel.jsx
@@ -42,12 +42,6 @@
<Grid container spacing={2}>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.shipperId"
- property={record.shipperId$}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
title="table.field.matnr.name"
property={record.name}
/>
@@ -60,8 +54,20 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
+ title="table.field.matnr.shipperId"
+ property={record.shipperId$}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
title="table.field.matnr.groupId"
property={record.groupId$}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.matnr.rglarId"
+ property={record.rglarId$}
/>
</Grid>
<Grid item xs={6}>
@@ -102,8 +108,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.desc"
- property={record.desc}
+ title="table.field.matnr.describle"
+ property={record.describle}
/>
</Grid>
<Grid item xs={6}>
@@ -120,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}>
@@ -132,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}>
@@ -142,6 +148,48 @@
property={record.isLabelMange$}
/>
</Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.matnr.safeQty"
+ property={record.safeQty}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.matnr.minQty"
+ property={record.minQty}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.matnr.maxQty"
+ property={record.maxQty}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.matnr.stagn"
+ property={record.stagn}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.matnr.valid"
+ property={record.valid}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.matnr.validWarn"
+ property={record.validWarn}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.matnr.flagCheck"
+ property={record.flagCheck}
+ />
+ </Grid>
</Grid>
</CardContent>
--
Gitblit v1.9.1