From db475501a4073d48f2fd804ca6428b0f86fe6332 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 18:14:59 +0800
Subject: [PATCH] 动态字段显示问题修复
---
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 139 +++++++++++++++++++++++++++++-----------------
1 files changed, 87 insertions(+), 52 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index c9bbd3b..cedaad8 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -34,15 +34,17 @@
Button,
useEditContext,
useGetRecordId,
+ useRefresh,
useGetOne
} from 'react-admin';
-import { Box, Typography, Card, Stack, Dialog, DialogActions, DialogTitle } from '@mui/material';
+import { Box, Typography, Card, Stack, Dialog, DialogActions, DialogTitle, LinearProgress } from '@mui/material';
import { styled } from '@mui/material/styles';
import AsnOrderItemCreate from "./AsnOrderItemCreate";
import EmptyData from "../../components/EmptyData";
import MyCreateButton from "../../components/MyCreateButton";
import MyExportButton from '../../components/MyExportButton';
import PageDrawer from "../../components/PageDrawer";
+import request from '@/utils/request';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
import AsnOrderItemEdit from "./AsnOrderItemEdit";
import ImportButton from "../../components/ImportButton";
@@ -130,52 +132,7 @@
)}
perPage={DEFAULT_ITEM_PAGE_SIZE}
>
- <StyledDatagrid
- preferenceKey='asnOrderItem'
- bulkActionButtons={false}
- rowClick={false}
- // rowClick={(id, resource, record) => {
- // setSelect(record)
- // setEditDialog(true)
- // }}
- omit={['id', 'purQty', 'purUnit', 'platItemId', 'poDetlCode', 'trackCode', 'memo', 'model', 'packName', 'splrCode', 'qrcode', 'poDetlId', 'matnrId', 'asnId']}
- >
- <NumberField source="id" />
- <NumberField source="asnId" label="table.field.asnOrderItem.asnId" />
- <TextField source="asnCode" label="table.field.asnOrderItem.asnCode" />
- <TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" />
- <TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />
- <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" />
- <TextField source="matnrId" label="table.field.asnOrderItem.matnrId" />
- <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" />
- <TextField source="maktx" label="table.field.asnOrderItem.maktx" />
- <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" />
- <TextField source="spec" label="table.field.asnOrderItem.spec" />
- <TextField source="model" label="table.field.asnOrderItem.model" />
- <NumberField source="anfme" label="table.field.asnOrderItem.anfme" />
- <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />
- <NumberField source="purQty" label="table.field.asnOrderItem.purQty" />
- <TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />
- <NumberField source="qty" label="table.field.asnOrderItem.qty" />
- {/* <NumberField source="safeQty" label="table.field.asnOrderItem.safeQty" />
- <NumberField source="disQty" label="table.field.asnOrderItem.disQty" />
- <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" /> */}
- <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />
- <TextField source="splrName" label="table.field.asnOrderItem.splrName" />
- <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />
- <TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />
- <TextField source="trackCode" label="table.field.asnOrderItem.barcode" />
- <TextField source="packName" label="table.field.asnOrderItem.packName" />
- <DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
- <DateField source="createTime" label="common.field.createTime" showTime />
- <TextField source="memo" label="common.field.memo" sortable={false} />
- </StyledDatagrid>
+ <DynamicFields />
</List>
<AsnOrderItemCreate
open={createDialog}
@@ -197,16 +154,94 @@
</>
)
}
+
AsnOrderItemList.Context = React.createContext()
+export default AsnOrderItemList;
-const DynamicFields = async () => {
- const {
- data: { code, data, msg },
- } = await request.get("/fields/enable/list");
+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="asnId" label="table.field.asnOrderItem.asnId" />,
+ <TextField source="asnCode" label="table.field.asnOrderItem.asnCode" />,
+ <TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" />,
+ <TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />,
+ <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" />,
+ <TextField source="matnrId" label="table.field.asnOrderItem.matnrId" />,
+ <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" />,
+ <TextField source="maktx" label="table.field.asnOrderItem.maktx" />,
+ <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" />,
+ <TextField source="spec" label="table.field.asnOrderItem.spec" />,
+ <TextField source="model" label="table.field.asnOrderItem.model" />,
+ <NumberField source="anfme" label="table.field.asnOrderItem.anfme" />,
+ <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />,
+ <NumberField source="purQty" label="table.field.asnOrderItem.purQty" />,
+ <TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />,
+ <NumberField source="qty" label="table.field.asnOrderItem.qty" />,
+ <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />,
+ <TextField source="splrName" label="table.field.asnOrderItem.splrName" />,
+ <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />,
+ <TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />,
+ <TextField source="trackCode" label="table.field.asnOrderItem.barcode" />,
+ <TextField source="packName" label="table.field.asnOrderItem.packName" />,
+ ]
+ const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
+ const lastArr = [
+ <DateField source="updateTime" label="common.field.updateTime" showTime />,
+ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>,
+ <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>,
+ <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='asnOrderItem'
+ bulkActionButtons={false}
+ rowClick={(id, resource, record) => false}
+ omit={['id', 'asnId', 'poDetlId', 'poDetlCode', 'matnrId', 'purQty', 'purUnit', 'qrcode', 'trackCode']}
+ >
+ {columns.map((column) => column)}
+ </StyledDatagrid>}
+ </Box>
+ )
}
-export default AsnOrderItemList;
+
--
Gitblit v1.9.1