From fe88c3671515ab5ed0e66100fd1bf22102ffdc0c Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 08 四月 2025 11:05:31 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/taskItem/TaskItemList.jsx | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/rsf-admin/src/page/taskItem/TaskItemList.jsx b/rsf-admin/src/page/taskItem/TaskItemList.jsx
index 8b26126..d146e6d 100644
--- a/rsf-admin/src/page/taskItem/TaskItemList.jsx
+++ b/rsf-admin/src/page/taskItem/TaskItemList.jsx
@@ -34,11 +34,6 @@
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
-import TaskItemCreate from "./TaskItemCreate";
-import TaskItemPanel from "./TaskItemPanel";
-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';
@@ -74,7 +69,6 @@
<TextInput source="batch" label="table.field.taskItem.batch" />,
<TextInput source="spec" label="table.field.taskItem.spec" />,
<TextInput source="model" label="table.field.taskItem.model" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -89,7 +83,6 @@
const TaskItemList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
@@ -105,31 +98,31 @@
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.taskItem"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='taskItem' />
- <MyExportButton />
+ {/* <MyExportButton /> */}
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
preferenceKey='taskItem'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ // bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <TaskItemPanel />}
+ // expand={() => <TaskItemPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
>
<NumberField source="id" />
<NumberField source="taskId" label="table.field.taskItem.taskId" />
<NumberField source="orderId" label="table.field.taskItem.orderId" />
- <NumberField source="orderType" label="table.field.taskItem.orderType" />
+ <NumberField source="orderType$" label="table.field.taskItem.orderType" />
<NumberField source="orderItemId" label="table.field.taskItem.orderItemId" />
<NumberField source="matnrId" label="table.field.taskItem.matnrId" />
<TextField source="maktx" label="table.field.taskItem.maktx" />
@@ -150,16 +143,8 @@
<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} />
- <WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- </WrapperField>
</StyledDatagrid>
</List>
- <TaskItemCreate
- open={createDialog}
- setOpen={setCreateDialog}
- />
<PageDrawer
title='TaskItem Detail'
drawerVal={drawerVal}
--
Gitblit v1.9.1