From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/waitPakin/WaitPakinList.jsx | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
index 43aa899..e63471c 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
@@ -58,8 +58,13 @@
width: 90
},
'& .opt': {
- width: 180
+ width: 210
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
const filters = [
@@ -93,7 +98,7 @@
const [drawerVal, setDrawerVal] = useState(false);
const CreateTaskButton = () => {
- const record = useRecordContext();
+ const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
const { selectedIds, onUnselectItems, data } = useListContext();
@@ -115,7 +120,7 @@
}
const CreateTaskRowButton = () => {
- const record = useRecordContext();
+ const record = useRecordContext();
const refresh = useRefresh();
const createTask = (event) => {
@@ -124,7 +129,7 @@
setSource([record])
refresh()
}
-
+
return (
<>
<Button onClick={(event) => createTask(event)} label={"toolbar.createTask"}>
@@ -164,10 +169,10 @@
bulkActionButtons={
<>
<CreateTaskButton />
- <BulkDeleteButton mutationMode={OPERATE_MODE} />
+ {/* <BulkDeleteButton mutationMode={OPERATE_MODE} /> */}
</>}
- rowClick='edit'
- omit={['id', 'createTime', 'createBy', 'memo']}
+ rowClick={false}
+ omit={['id', 'createTime', 'createBy', 'memo','statusBool']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.waitPakin.code" />
@@ -182,7 +187,7 @@
<WrapperField cellClassName="opt" label="common.field.opt">
<EditButton label="toolbar.detail" sx={{ padding: '1px', fontSize: '.75rem' }} />
<CreateTaskRowButton />
- {/* <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> */}
+ <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
</WrapperField>
</StyledDatagrid>
</List>
--
Gitblit v1.9.1