From d8d34b1eda59c88f8de91d889165f63132a29499 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 16:48:45 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx | 60 +++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
index 98b87e4..e838adf 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
@@ -33,8 +33,8 @@
import DialogCloseButton from "@/page/components/DialogCloseButton";
import StatusSelectInput from "@/page/components/StatusSelectInput";
import MemoInput from "@/page/components/MemoInput";
-import { tr } from "date-fns/locale";
-
+import TreeSelectInput from "@/page/components/TreeSelectInput";
+import request from '@/utils/request';
function CustomTabPanel(props) {
const { children, value, index, ...other } = props;
@@ -69,7 +69,21 @@
const translate = useTranslate();
const notify = useNotify();
const [value, setValue] = React.useState(0);
+ 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);
};
@@ -154,36 +168,25 @@
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <ReferenceInput
- source="shipperId"
- reference="shipper"
- >
+ <ReferenceInput source="shipperId" reference="companys" filter={{ type: 'shipper' }}>
<AutocompleteInput
label="table.field.matnr.shipperId"
optionText="name"
- validate={[required()]}
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <ReferenceInput
+ <TreeSelectInput
+ label="table.field.matnr.groupId"
+ resource={'matnrGroup'}
source="groupId"
- reference="matnrGroup"
- >
- <AutocompleteInput
- label="table.field.matnr.groupId"
- optionText="name"
- validate={[required()]}
- filterToQuery={(val) => ({ name: val })}
- />
- </ReferenceInput>
+ />
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnr.platCode"
source="platCode"
- validate={[required()]}
parse={v => v}
/>
</Grid>
@@ -269,7 +272,7 @@
<Grid item xs={6} display="flex" gap={1}>
<SelectInput
label="table.field.matnr.isLabelMange"
- source="isLabelMange"
+ source="flagLabelMange"
choices={[
{ id: 0, name: ' 鍚�' },
{ id: 1, name: ' 鏄�' },
@@ -277,6 +280,17 @@
/>
</Grid>
+ {dynamicFields.map((item) => {
+ return (
+ <Grid key={item.id} item xs={6} display="flex" gap={1}>
+ <TextInput
+ label={item.fieldsAlise}
+ source={item.fields}
+ validate={item.unique === 1 ? required() : false}
+ />
+ </Grid>
+ )
+ })}
<Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
@@ -342,13 +356,13 @@
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
- source="rglarId"
- reference="batchRegular"
+ source="rglar_id"
+ reference="serialRule"
>
<AutocompleteInput
label="table.field.matnr.rglarId"
- optionText="code"
- filterToQuery={(val) => ({ code: val })}
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
</Grid>
--
Gitblit v1.9.1