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/MatnrCreate.jsx | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/matnr/MatnrCreate.jsx b/rsf-admin/src/page/matnr/MatnrCreate.jsx
index e2e0d9a..0d7a4cc 100644
--- a/rsf-admin/src/page/matnr/MatnrCreate.jsx
+++ b/rsf-admin/src/page/matnr/MatnrCreate.jsx
@@ -125,11 +125,11 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
- source="batchRegularId"
- reference="batchRegular"
+ source="rglarId"
+ reference="rglarId"
>
<AutocompleteInput
- label="table.field.matnr.batchRegularId"
+ label="table.field.matnr.rglarId"
optionText="code"
filterToQuery={(val) => ({ code: val })}
/>
@@ -198,7 +198,7 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.matnr.purchaseUnit"
+ label="table.field.matnr.purUnit"
source="purchaseUnit"
parse={v => v}
/>
@@ -212,8 +212,8 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<SelectInput
- label="table.field.matnr.stockLeval"
- source="stockLeval"
+ label="table.field.matnr.stockLevel"
+ source="stockLevel"
choices={[
{ id: 0, name: ' A' },
{ id: 1, name: ' B' },
@@ -233,8 +233,8 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
- label="table.field.matnr.safetyQty"
- source="safetyQty"
+ label="table.field.matnr.safeQty"
+ source="safeQty"
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -251,20 +251,20 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
- label="table.field.matnr.stagnate"
- source="stagnate"
+ label="table.field.matnr.stagn"
+ source="stagn"
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
- label="table.field.matnr.validity"
- source="validity"
+ label="table.field.matnr.valid"
+ source="valid"
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
- label="table.field.matnr.validityWarr"
- source="validityWarr"
+ label="table.field.matnr.validWarn"
+ source="validWarn"
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
--
Gitblit v1.9.1