From 53eb9e72f7fff791c2d1f7a768441035b57ca7b1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 11:23:55 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 5dc0c6c..9bf7cfc 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -54,6 +54,7 @@
import PrintIcon from '@mui/icons-material/Print';
import request from '@/utils/request';
import BatchModal from './BatchModal';
+import BatchGropuModal from './BatchGropuModal';
import PrintModal from './PrintModal';
import LinkIcon from '@mui/icons-material/Link';
import BindModal from './BindModal';
@@ -86,10 +87,11 @@
overflow: 'hidden',
textOverflow: 'ellipsis',
display: 'block',
- width: '300px',
+ width: '200px',
},
'& .RaDatagrid-table': {
- width: '100%'
+ width: '100%',
+ position: 'relative',
}
}));
@@ -207,7 +209,7 @@
<TextField key="memo" source="memo" label="common.field.memo" sortable={false} />,
]
const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
- const opt = <WrapperField key="opt" cellClassName="opt" label="common.field.opt">
+ const opt = <WrapperField key="opt" cellClassName="fixed" className="fixed" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
<EnableButton />
</WrapperField>
@@ -239,6 +241,7 @@
<StyledDatagrid
preferenceKey='matnr'
bulkActionButtons={<>
+ <BatchGroupButton />
<BatchButton />
<BindButton />
<PrintButton />
@@ -360,6 +363,29 @@
)
}
+const BatchGroupButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchMatnrGropu"}>
+ <EditIcon />
+ </Button>
+
+ <BatchGropuModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ </>
+
+ )
+}
+
const PrintButton = () => {
const record = useRecordContext();
const { resource, selectedIds } = useListContext();
@@ -380,7 +406,6 @@
rows={selectedIds}
/>
</>
-
)
}
--
Gitblit v1.9.1