From ad84e7d81cbd3fd7d9e7fed430d2004c0f43fc0a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 二月 2025 09:47:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-admin/src/page/matnr/MatnrPanel.jsx | 70 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/matnr/MatnrPanel.jsx b/rsf-admin/src/page/matnr/MatnrPanel.jsx
index ead25e8..fe8ad1f 100644
--- a/rsf-admin/src/page/matnr/MatnrPanel.jsx
+++ b/rsf-admin/src/page/matnr/MatnrPanel.jsx
@@ -42,18 +42,6 @@
<Grid container spacing={2}>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.uuid"
- property={record.uuid}
- />
- </Grid>
- <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}
/>
@@ -66,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.batchRegularId"
+ property={record.batchRegularId$}
/>
</Grid>
<Grid item xs={6}>
@@ -108,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}>
@@ -148,6 +148,48 @@
property={record.isLabelMange$}
/>
</Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.matnr.safetyQty"
+ property={record.safetyQty}
+ />
+ </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.stagnate"
+ property={record.stagnate}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.matnr.validity"
+ property={record.validity}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.matnr.validityWarr"
+ property={record.validityWarr}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.matnr.flagCheck"
+ property={record.flagCheck}
+ />
+ </Grid>
</Grid>
</CardContent>
--
Gitblit v1.9.1