From 98d4db97d3c21f9b31f978249c5572fdae948088 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 09 四月 2025 13:21:22 +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 | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/taskItem/TaskItemList.jsx b/rsf-admin/src/page/taskItem/TaskItemList.jsx
index d146e6d..e137031 100644
--- a/rsf-admin/src/page/taskItem/TaskItemList.jsx
+++ b/rsf-admin/src/page/taskItem/TaskItemList.jsx
@@ -38,6 +38,8 @@
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
+import MyCreateButton from "../components/MyCreateButton";
+import TaskItemCreate from "../task/TaskItemCreate";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -104,7 +106,7 @@
actions={(
<TopToolbar>
<FilterButton />
- {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
+ <MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='taskItem' />
{/* <MyExportButton /> */}
</TopToolbar>
@@ -132,7 +134,6 @@
<TextField source="batch" label="table.field.taskItem.batch" />
<TextField source="spec" label="table.field.taskItem.spec" />
<TextField source="model" label="table.field.taskItem.model" />
-
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
@@ -145,6 +146,9 @@
<TextField source="memo" label="common.field.memo" sortable={false} />
</StyledDatagrid>
</List>
+ <TaskItemCreate
+ open={createDialog}
+ setOpen={setCreateDialog} />
<PageDrawer
title='TaskItem Detail'
drawerVal={drawerVal}
--
Gitblit v1.9.1