From 028ef9e952135505871d7a05d9c3af3a8fbcce79 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 11 五月 2025 15:18:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx | 112 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 31 deletions(-)
diff --git a/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
index 6f5ffc2..fd1be19 100644
--- a/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
@@ -32,15 +32,17 @@
AutocompleteInput,
DeleteButton,
useGetOne,
+ useRefresh,
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 QlyIsptItemCreate from "./QlyIsptItemCreate";
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_ITEM_PAGE_SIZE } from '@/config/setting';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -89,13 +91,13 @@
const [drawerVal, setDrawerVal] = useState(false);
const isptId = useGetRecordId();
const { data: dicts, isPending, error } = useGetOne('qlyInspect', { id: isptId });
- if (dicts == null) {return}
+ if (dicts == null) { return }
return (
<Box display="flex">
<List
- resource="qlyIsptItem"
- filter={{ispectId: isptId}}
+ resource="qlyIsptItem"
+ filter={{ ispectId: isptId }}
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -117,33 +119,7 @@
)}
perPage={DEFAULT_ITEM_PAGE_SIZE}
>
- <StyledDatagrid
- preferenceKey='qlyIsptItem'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={false}
- omit={['id', 'createTime', 'createBy', 'memo', 'label', 'stockBatch','picPath', 'ispectId']}
- >
- <NumberField source="id" />
- <NumberField source="ispectId" label="table.field.qlyIsptItem.ispectId" />
- <TextField source="matnrCode" label="table.field.qlyIsptItem.matnrCode" />
- <TextField source="maktx" label="table.field.qlyIsptItem.maktx" />
- <TextField source="label" label="table.field.qlyIsptItem.label" />
- <TextField source="splrBatch" label="table.field.qlyIsptItem.splrBatch" />
- <TextField source="stockBatch" label="table.field.qlyIsptItem.stockBatch" />
- <NumberField source="rcptQty" label="table.field.qlyIsptItem.rcptQty" />
- <NumberField source="dlyQty" label="table.field.qlyIsptItem.dlyQty" />
- <NumberField source="disQty" label="table.field.qlyIsptItem.disQty" />
- <NumberField source="safeQty" label="table.field.qlyIsptItem.safeQty" />
- <TextField source="splrName" label="table.field.qlyIsptItem.splrName" />
- <NumberField source="isptResult$" label="table.field.qlyIsptItem.isptResult" />
- <TextField source="picPath" label="table.field.qlyIsptItem.picPath" />
- <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 />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
- <TextField source="memo" label="common.field.memo" sortable={false} />
- </StyledDatagrid>
+ <DynamicFields />
</List>
<QlyIsptItemCreate
open={createDialog}
@@ -161,3 +137,77 @@
}
export default QlyIsptItemList;
+
+
+
+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="ispectId" label="table.field.qlyIsptItem.ispectId" />,
+ <TextField source="matnrCode" label="table.field.qlyIsptItem.matnrCode" />,
+ <TextField source="maktx" label="table.field.qlyIsptItem.maktx" />,
+ <TextField source="label" label="table.field.qlyIsptItem.label" />,
+ <TextField source="splrBatch" label="table.field.qlyIsptItem.splrBatch" />,
+ <TextField source="stockBatch" label="table.field.qlyIsptItem.stockBatch" />,
+ <NumberField source="rcptQty" label="table.field.qlyIsptItem.rcptQty" />,
+ <NumberField source="dlyQty" label="table.field.qlyIsptItem.dlyQty" />,
+ <NumberField source="anfme" label="table.field.qlyIsptItem.anfme" />,
+ <TextField source="splrName" label="table.field.qlyIsptItem.splrName" />,
+ <NumberField source="isptResult$" label="table.field.qlyIsptItem.isptResult" />,
+ ]
+ 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='qlyIsptItem'
+ bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ rowClick={false}
+ omit={['id', 'createTime', 'createBy', 'memo', 'dlyQty', 'label', 'stockBatch', 'picPath', 'ispectId', 'statusBool']}
+
+ >
+ {columns.map((column) => column)}
+ </StyledDatagrid>}
+ </Box>
+ )
+}
\ No newline at end of file
--
Gitblit v1.9.1