From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/taskLog/TaskItemLogList.jsx | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/rsf-admin/src/page/taskItemLog/TaskItemLogList.jsx b/rsf-admin/src/page/taskLog/TaskItemLogList.jsx
similarity index 87%
rename from rsf-admin/src/page/taskItemLog/TaskItemLogList.jsx
rename to rsf-admin/src/page/taskLog/TaskItemLogList.jsx
index 58c7f4f..acf1ae7 100644
--- a/rsf-admin/src/page/taskItemLog/TaskItemLogList.jsx
+++ b/rsf-admin/src/page/taskLog/TaskItemLogList.jsx
@@ -31,18 +31,13 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ useGetRecordId,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
-import TaskItemLogCreate from "./TaskItemLogCreate";
-import TaskItemLogPanel from "./TaskItemLogPanel";
-import EmptyData from "../components/EmptyData";
-import MyCreateButton from "../components/MyCreateButton";
import MyExportButton from '../components/MyExportButton';
import PageDrawer from "../components/PageDrawer";
-import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import * as Common from '@/utils/common';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -94,13 +89,15 @@
const TaskItemLogList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+ const recodeId = useGetRecordId();
+
return (
<Box display="flex">
<List
+ resource="taskItemLog"
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -112,6 +109,7 @@
title={"menu.taskItemLog"}
filters={filters}
empty={false}
+ filter={{logId: Number(recodeId) }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
@@ -130,7 +128,6 @@
omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
>
<NumberField source="id" />
- <NumberField source="taskItemId" label="table.field.taskItemLog.taskItemId" />
<NumberField source="taskId" label="table.field.taskItemLog.taskId" />
<NumberField source="orderId" label="table.field.taskItemLog.orderId" />
<TextField source="orderType" label="table.field.taskItemLog.orderType" />
@@ -145,15 +142,9 @@
<TextField source="batch" label="table.field.taskItemLog.batch" />
<TextField source="spec" label="table.field.taskItemLog.spec" />
<TextField source="model" label="table.field.taskItemLog.model" />
- <TextField source="fieldsIndex" label="table.field.taskItemLog.fieldsIndex" />
-
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="updateBy$" label="common.field.updateBy" />
+ <TextField source="createBy$" label="common.field.createBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <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 />
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
--
Gitblit v1.9.1