From b778c28b598eecd0687f0612f9236c6e957de89f Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 03 四月 2025 16:59:34 +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 |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/rsf-admin/src/page/taskItem/TaskItemList.jsx b/rsf-admin/src/page/taskItem/TaskItemList.jsx
index e92a6b7..42d1a09 100644
--- a/rsf-admin/src/page/taskItem/TaskItemList.jsx
+++ b/rsf-admin/src/page/taskItem/TaskItemList.jsx
@@ -104,31 +104,30 @@
                     marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
                 }}
                 title={"menu.taskItem"}
-                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
                 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" />
@@ -149,16 +148,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