From 9ab7debaa1532a5a795f80938639a6a392a396a2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 10:58:47 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
index 4af39ad..96274af 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
@@ -19,6 +19,7 @@
required,
useRecordContext,
DeleteButton,
+ useNotify,
} from 'react-admin';
import PropTypes from 'prop-types';
import { useWatch, useFormContext } from "react-hook-form";
@@ -30,7 +31,7 @@
import MemoInput from "@/page/components/MemoInput";
import StatusSelectInput from "@/page/components/StatusSelectInput";
import TreeSelectInput from "@/page/components/TreeSelectInput";
-
+import request from '@/utils/request';
const FormToolbar = () => {
const { getValues } = useFormContext();
return (
@@ -73,6 +74,24 @@
const MatnrEdit = () => {
const translate = useTranslate();
const [value, setValue] = React.useState(0);
+
+ const notify = useNotify();
+ const [dynamicFields, setDynamicFields] = useState([]);
+
+ useEffect(() => {
+ getDynamicFields();
+ }, []);
+ const getDynamicFields = async () => {
+ const {
+ data: { code, data, msg },
+ } = await request.get("/fields/enable/list");
+ if (code === 200) {
+ setDynamicFields(data || [])
+
+ } else {
+ notify(msg);
+ }
+ };
const handleChange = (event, newValue) => {
setValue(newValue);
};
@@ -152,19 +171,7 @@
source="groupId"
/>
</Grid>
- {/* <Grid item xs={6} display="flex" gap={1}>
- <ReferenceInput
- source="rglarId"
- reference="batchRegular"
- perPage={REFERENCE_INPUT_PAGESIZE}
- >
- <AutocompleteInput
- label="table.field.matnr.rglarId"
- optionText="code"
- filterToQuery={(val) => ({ code: val })}
- />
- </ReferenceInput>
- </Grid> */}
+
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnr.platCode"
@@ -257,6 +264,17 @@
/>
</Grid>
+ {dynamicFields.map((item) => {
+ return (
+ <Grid key={item.id} item xs={6} display="flex" gap={1}>
+ <TextInput
+ label={item.fieldsAlise}
+ source={item.fields}
+ />
+ </Grid>
+ )
+ })}
+
</Grid>
@@ -305,10 +323,17 @@
<CustomTabPanel value={value} index={2}>
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.matnr.flagCheck"
- source="flagCheck"
- />
+ <ReferenceInput
+ source="rglar_id"
+ reference="serialRule"
+ perPage={REFERENCE_INPUT_PAGESIZE}
+ >
+ <AutocompleteInput
+ label="table.field.matnr.rglarId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
</Grid>
</Grid>
</CustomTabPanel>
--
Gitblit v1.9.1