From 83e3d34abd06c0256f61382c4c9cf89c4be109d8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 19 五月 2025 19:35:41 +0800
Subject: [PATCH] #问题修复
---
rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx | 104 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 76 insertions(+), 28 deletions(-)
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
index ca5dca1..fa3d78e 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
@@ -30,10 +30,11 @@
ReferenceInput,
ReferenceArrayInput,
AutocompleteInput,
+ useRefresh,
DeleteButton,
useGetRecordId,
} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
+import { Box, Typography, Card, Stack, LinearProgress } from '@mui/material';
import { styled } from '@mui/material/styles';
import WaitPakinItemCreate from "./WaitPakinItemCreate";
import EmptyData from "../components/EmptyData";
@@ -43,6 +44,8 @@
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
+import request from '@/utils/request';
+
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -91,8 +94,8 @@
return (
<Box display="flex">
<List
- resource="waitPakinItem"
- filter={{pakinId: pakinId}}
+ resource="waitPakinItem"
+ filter={{ pakinId: pakinId }}
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -115,31 +118,7 @@
)}
perPage={DEFAULT_ITEM_PAGE_SIZE}
>
- <StyledDatagrid
- preferenceKey='waitPakinItem'
- bulkActionButtons={false}
- rowClick={(id, resource, record) => false}
- omit={['id', 'pakinId', 'createTime', 'matnrId', 'createBy', 'memo', 'fieldsIndex']}
- >
- <NumberField source="id" />
- <NumberField source="pakinId" label="table.field.waitPakinItem.pakinId" />
- <TextField source="matnrCode" label="table.field.waitPakinItem.matnrCode" />
- <TextField source="maktx" label="table.field.waitPakinItem.maktx" />
- <TextField source="batch" label="table.field.waitPakinItem.batch" />
- <NumberField source="matnrId" label="table.field.waitPakinItem.matnrId" />
- <NumberField source="anfme" label="table.field.waitPakinItem.anfme" />
- <TextField source="unit" label="table.field.waitPakinItem.unit" />
- <NumberField source="workQty" label="table.field.waitPakinItem.workQty" />
- <TextField source="fieldsIndex" label="table.field.waitPakinItem.fieldsIndex" />
- <NumberField source="qty" label="table.field.waitPakinItem.qty" />
- <TextField source="updateBy$" label="common.field.updateBy" />
- <DateField source="updateTime" label="common.field.updateTime" showTime />
- <TextField source="createBy$" label="common.field.createBy" />
- {/* <TextField source="flagDefect" label="common.field.flagDefect" /> */}
- <DateField source="createTime" label="common.field.createTime" showTime />
- {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
- <TextField source="memo" label="common.field.memo" sortable={false} />
- </StyledDatagrid>
+ <DynamicFields />
</List>
<WaitPakinItemCreate
open={createDialog}
@@ -156,3 +135,72 @@
}
export default WaitPakinItemList;
+
+
+
+const DynamicFields = (props) => {
+ const translate = useTranslate();
+ const notify = useNotify();
+ const [columns, setColumns] = useState([]);
+ const { isLoading } = useListContext();
+ const refresh = useRefresh();
+ useEffect(() => {
+ getDynamicFields();
+ }, []);
+
+ const getDynamicFields = async () => {
+ const { data: { code, data, msg }, } = await request.get("/fields/enable/list");
+ if (code == 200) {
+ const arr = [
+ <NumberField source="id" />,
+ <NumberField source="pakinId" label="table.field.waitPakinItem.pakinId" />,
+ <TextField source="matnrCode" label="table.field.waitPakinItem.matnrCode" />,
+ <TextField source="maktx" label="table.field.waitPakinItem.maktx" />,
+ <TextField source="batch" label="table.field.waitPakinItem.batch" />,
+ <NumberField source="matnrId" label="table.field.waitPakinItem.matnrId" />,
+ <NumberField source="anfme" label="table.field.waitPakinItem.anfme" />,
+ <TextField source="unit" label="table.field.waitPakinItem.unit" />,
+ <NumberField source="workQty" label="table.field.waitPakinItem.workQty" />,
+ <NumberField source="qty" label="table.field.waitPakinItem.qty" />,
+ <TextField source="fieldsIndex" label="table.field.waitPakinItem.fieldsIndex" />,
+ <TextField source="isptResult$" label="table.field.waitPakinItem.isptResult" />,
+ ]
+ const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
+ const lastArr = [
+ <TextField source="updateBy$" label="common.field.updateBy" />,
+ <DateField source="updateTime" label="common.field.updateTime" showTime />,
+ <TextField source="createBy$" label="common.field.createBy" />,
+ <DateField source="createTime" label="common.field.createTime" showTime />,
+ <TextField source="memo" label="common.field.memo" sortable={false} />,
+ ]
+ setColumns([...arr, ...fields, ...lastArr]);
+ } else {
+ notify(msg);
+ }
+ }
+
+ return (
+ <Box sx={{ position: 'relative', minHeight: "60vh", }}>
+ {isLoading && (
+ <LinearProgress
+ sx={{
+ height: "2px",
+ position: 'absolute',
+ top: 0,
+ left: 0,
+ right: 0,
+ }}
+ />
+ )}
+ {columns.length > 0 &&
+ <StyledDatagrid
+ preferenceKey='waitPakinItem'
+ bulkActionButtons={false}
+ rowClick={(id, resource, record) => false}
+ omit={['id', 'pakinId', 'createTime', 'matnrId', 'createBy', 'memo', 'fieldsIndex']}
+ >
+ {columns.map((column) => column)}
+ </StyledDatagrid>}
+ </Box>
+ )
+}
\ No newline at end of file
--
Gitblit v1.9.1