From bbc8a16a1db4ce234968889a1c7fc271eda7b7ea Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 20 三月 2025 15:14:40 +0800
Subject: [PATCH] feat:动态字段
---
rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx | 2
rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx | 2
rsf-admin/src/page/components/TreeSelectInput.jsx | 2
rsf-admin/src/i18n/zh.js | 1
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 114 +++++++++++++++++++------------------
rsf-admin/src/i18n/en.js | 1
6 files changed, 63 insertions(+), 59 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 8130e2f..179b968 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -128,6 +128,7 @@
warehouseAreas: 'WarehouseAreas',
loc: 'Loc',
locType: 'LocType',
+ locArea: 'locArea',
container: 'Container',
contract: 'Contract',
qlyInspect: 'QlyInspect',
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 7008ad7..d529ca9 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -128,6 +128,7 @@
warehouseAreas: '浠撳簱搴撳尯',
loc: '鍩虹搴撲綅',
locType: '搴撲綅绫诲瀷',
+ locArea: '閫昏緫鍒嗗尯',
container: '瀹瑰櫒绠＄悊',
contract: '鍚堝悓淇℃伅',
qlyInspect: '璐ㄦ淇℃伅',
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 72918ab..4ad39a5 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -151,7 +151,8 @@
const translate = useTranslate();
const notify = useNotify();
const { isLoading } = useListContext();
- const [dynamicFields, setDynamicFields] = useState([]);
+
+ const [columns, setColumns] = useState([]);
const refresh = useRefresh();
const { refetch } = useListContext();
@@ -165,8 +166,50 @@
data: { code, data, msg },
} = await request.get("/fields/enable/list");
if (code === 200) {
- setDynamicFields(data);
- refresh();
+ const arr = [
+ <NumberField key="id" source="id" />,
+ <TooltipField key="name" source="name" label="table.field.matnr.name" cellClassName="name" />,
+ <TextField key="code" source="code" label="table.field.matnr.code" />,
+ <TextField key="shipperId$" source="shipperId$" label="table.field.matnr.shipperId" />,
+ <ReferenceField key="groupId" source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
+ <TextField source="name" />
+ </ReferenceField>,
+ <TextField key="platCode" source="platCode" label="table.field.matnr.platCode" />,
+ <TextField key="spec" source="spec" label="table.field.matnr.spec" />,
+ <TextField key="model" source="model" label="table.field.matnr.model" />,
+ <NumberField key="weight" source="weight" label="table.field.matnr.weight" />,
+ <TextField key="describle" source="describle" label="table.field.matnr.describle" />,
+ <NumberField key="nromNum" source="nromNum" label="table.field.matnr.nromNum" />,
+ <TextField key="unit" source="unit" label="table.field.matnr.unit" />,
+ <TextField key="purchaseUnit" source="purchaseUnit" label="table.field.matnr.purUnit" />,
+ <TextField key="stockUnit" source="stockUnit" label="table.field.matnr.stockUnit" />,
+ <TextField key="stockLeval$" source="stockLeval$" label="table.field.matnr.stockLevel" sortable={false} />,
+ <TextField key="isLabelMange$" source="isLabelMange$" label="table.field.matnr.isLabelMange" sortable={false} />,
+ <NumberField key="safeQty" source="safeQty" label="table.field.matnr.safeQty" />,
+ <NumberField key="minQty" source="minQty" label="table.field.matnr.minQty" />,
+ <NumberField key="maxQty" source="maxQty" label="table.field.matnr.maxQty" />,
+ <NumberField key="stagn" source="stagn" label="table.field.matnr.stagn" />,
+ <NumberField key="valid" source="valid" label="table.field.matnr.valid" />,
+ <NumberField key="validWarn" source="validWarn" label="table.field.matnr.validWarn" />,
+ <NumberField key="flagCheck" source="flagCheck" label="table.field.matnr.flagCheck" />,
+ <ReferenceField key="updateBy" source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>,
+ <DateField key="updateTime" source="updateTime" label="common.field.updateTime" showTime />,
+ <ReferenceField key="createBy" source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>,
+ <DateField key="createTime" source="createTime" label="common.field.createTime" showTime />,
+ <BooleanField key="statusBool" source="statusBool" label="common.field.status" sortable={false} />,
+ <TextField key="memo" source="memo" label="common.field.memo" sortable={false} />,
+ ]
+ const fields = data.map(el => <TextField key={el.fields} source={el.fields} label={el.fieldsAlise} />)
+ const opt = <WrapperField key="opt" cellClassName="opt" label="common.field.opt">
+ <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
+ <EnableButton />
+ </WrapperField>
+ setColumns([...arr, ...fields, opt]);
+
} else {
notify(msg);
}
@@ -174,48 +217,6 @@
notify('璇锋眰鍑洪敊');
}
};
-
- const columns = [
- <NumberField key="id" source="id" />,
- <TooltipField key="name" source="name" label="table.field.matnr.name" cellClassName="name" />,
- <TextField key="code" source="code" label="table.field.matnr.code" />,
- <TextField key="shipperId$" source="shipperId$" label="table.field.matnr.shipperId" />,
- <ReferenceField key="groupId" source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
- <TextField source="name" />
- </ReferenceField>,
- <TextField key="platCode" source="platCode" label="table.field.matnr.platCode" />,
- <TextField key="spec" source="spec" label="table.field.matnr.spec" />,
- <TextField key="model" source="model" label="table.field.matnr.model" />,
- <NumberField key="weight" source="weight" label="table.field.matnr.weight" />,
- <TextField key="describle" source="describle" label="table.field.matnr.describle" />,
- <NumberField key="nromNum" source="nromNum" label="table.field.matnr.nromNum" />,
- <TextField key="unit" source="unit" label="table.field.matnr.unit" />,
- <TextField key="purchaseUnit" source="purchaseUnit" label="table.field.matnr.purUnit" />,
- <TextField key="stockUnit" source="stockUnit" label="table.field.matnr.stockUnit" />,
- <TextField key="stockLeval$" source="stockLeval$" label="table.field.matnr.stockLevel" sortable={false} />,
- <TextField key="isLabelMange$" source="isLabelMange$" label="table.field.matnr.isLabelMange" sortable={false} />,
- <NumberField key="safeQty" source="safeQty" label="table.field.matnr.safeQty" />,
- <NumberField key="minQty" source="minQty" label="table.field.matnr.minQty" />,
- <NumberField key="maxQty" source="maxQty" label="table.field.matnr.maxQty" />,
- <NumberField key="stagn" source="stagn" label="table.field.matnr.stagn" />,
- <NumberField key="valid" source="valid" label="table.field.matnr.valid" />,
- <NumberField key="validWarn" source="validWarn" label="table.field.matnr.validWarn" />,
- <NumberField key="flagCheck" source="flagCheck" label="table.field.matnr.flagCheck" />,
- <ReferenceField key="updateBy" source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>,
- <DateField key="updateTime" source="updateTime" label="common.field.updateTime" showTime />,
- <ReferenceField key="createBy" source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>,
- <DateField key="createTime" source="createTime" label="common.field.createTime" showTime />,
- <BooleanField key="statusBool" source="statusBool" label="common.field.status" sortable={false} />,
- <TextField key="memo" source="memo" label="common.field.memo" sortable={false} />,
- <WrapperField key="opt" cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <EnableButton />
- </WrapperField>
- ];
return (
<Box sx={{ position: 'relative', minHeight: "60vh", }}>
@@ -231,17 +232,18 @@
/>
)}
- <StyledDatagrid
- preferenceKey='matnr'
- bulkActionButtons={<> <BatchButton /><BulkDeleteButton mutationMode={OPERATE_MODE} /></>}
- rowClick={(id, resource, record) => false}
- omit={['id', 'shipperId', 'platCode', 'spec', 'model', 'weight', 'color', 'describle'
- , 'nromNum', 'unit', 'purchaseUnit', 'stockUnit', 'stockLeval', 'isLabelMange', 'safeQty'
- , 'minQty', 'maxQty', 'stagn', 'valid', 'validWarn', 'flagCheck', 'updateTime', 'updateBy'
- , 'createTime', 'createBy', 'memo', 'rglarId', 'groupId', 'stockLevel', 'isLabelMange']}
- >
- {columns.map((column) => column)}
- </StyledDatagrid>
+ {columns.length > 0 &&
+ <StyledDatagrid
+ preferenceKey='matnr'
+ bulkActionButtons={<> <BatchButton /><BulkDeleteButton mutationMode={OPERATE_MODE} /></>}
+ rowClick={(id, resource, record) => false}
+ omit={['id', 'shipperId', 'platCode', 'spec', 'model', 'weight', 'color', 'describle'
+ , 'nromNum', 'unit', 'purchaseUnit', 'stockUnit', 'stockLeval', 'isLabelMange', 'safeQty'
+ , 'minQty', 'maxQty', 'stagn', 'valid', 'validWarn', 'flagCheck', 'updateTime', 'updateBy'
+ , 'createTime', 'createBy', 'memo', 'rglarId', 'groupId', 'stockLevel', 'isLabelMange']}
+ >
+ {columns.map((column) => column)}
+ </StyledDatagrid>}
</Box>
);
}
diff --git a/rsf-admin/src/page/components/TreeSelectInput.jsx b/rsf-admin/src/page/components/TreeSelectInput.jsx
index 4140b94..8243ce1 100644
--- a/rsf-admin/src/page/components/TreeSelectInput.jsx
+++ b/rsf-admin/src/page/components/TreeSelectInput.jsx
@@ -14,7 +14,7 @@
const [proxyVal, setProxyVal] = React.useState('');
const record = useRecordContext()
- const val = value || record[source];
+ const val = value || record?.[source];
useEffect(() => {
const http = async (resource) => {
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx
index f12d4fd..ab4847f 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx
@@ -118,7 +118,7 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
- source="wareId"
+ source="warehouseId"
reference="warehouse"
>
<AutocompleteInput
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
index f038e90..fcf1745 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
@@ -90,7 +90,7 @@
</Stack>
<Stack direction='row' gap={2}>
<ReferenceInput
- source="wareId"
+ source="warehouseId"
reference="warehouse"
>
<AutocompleteInput
--
Gitblit v1.9.1