From 014270352f8e19b51bbb4367ae2ff256050a30a2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 14:03:42 +0800
Subject: [PATCH] #修改优化 1. 字典优化修改 2. 编码规则优化 3. 出库单编码生成为空问题修复
---
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 160 insertions(+), 16 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index e27b5e6..4e433ce 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -54,7 +54,10 @@
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';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -64,7 +67,7 @@
'& .RaDatagrid-row': {
cursor: 'auto'
},
- '& .RaList-content': {
+ '& .RaList-content': {
width: '200px'
},
'& .RaList-main': {
@@ -84,16 +87,16 @@
overflow: 'hidden',
textOverflow: 'ellipsis',
display: 'block',
- width: '100px',
+ width: '200px',
},
'& .RaDatagrid-table': {
- width: '100%'
+ width: '100%',
+ position: 'relative',
}
}));
const filters = [
<SearchInput source="condition" alwaysOn />,
-
<TextInput source="name" label="table.field.matnr.name" alwaysOn />,
<TextInput source="code" label="table.field.matnr.code" alwaysOn />,
<ReferenceInput source="shipperId$" label="table.field.matnr.shipperId" reference="shipper">
@@ -136,7 +139,6 @@
<NumberInput source="valid" label="table.field.matnr.valid" />,
<NumberInput source="validWarn" label="table.field.matnr.validWarn" />,
<NumberInput source="flagCheck" label="table.field.matnr.flagCheck" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -153,10 +155,8 @@
const translate = useTranslate();
const notify = useNotify();
const { isLoading } = useListContext();
-
const [columns, setColumns] = useState([]);
const refresh = useRefresh();
-
useEffect(() => {
getDynamicFields();
}, []);
@@ -192,7 +192,7 @@
<NumberField key="stagn" source="stagn" label="table.field.matnr.stagn" />,
<NumberField key="valid" source="valid" label="table.field.matnr.valid" />,
<NumberField key="validWarn" source="validWarn" label="table.field.matnr.validWarn" />,
- <NumberField key="flagCheck" source="flagCheck" label="table.field.matnr.flagCheck" />,
+ <BooleanField key="flagCheck" source="flagCheck" label="table.field.matnr.flagCheck" sortable={false} />,
<ReferenceField key="updateBy" source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>,
@@ -205,9 +205,9 @@
<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 />
+ <PrintButton />
</WrapperField>
setColumns([...arr, ...fields, opt]);
@@ -237,8 +237,13 @@
<StyledDatagrid
preferenceKey='matnr'
bulkActionButtons={<>
- <BatchButton />
- <PrintButton />
+ <BatchGroupButton />
+ <BatchWarnButton />
+ <BatchFlagButton />
+ <BatchStatusButton />
+ <BatchLevelButton />
+ <BindButton />
+ <BatchPrintButton />
<BulkDeleteButton mutationMode={OPERATE_MODE} />
</>}
rowClick={(id, resource, record) => false}
@@ -256,7 +261,6 @@
const MatnrList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const notify = useNotify();
@@ -334,7 +338,7 @@
)
}
-const BatchButton = () => {
+const BatchStatusButton = () => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
@@ -344,11 +348,106 @@
return (
<>
- <Button onClick={() => setCreateDialog(true)} label={"toolbar.batch"}>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchStatus"}>
<EditIcon />
</Button>
<BatchModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ fieldType={'status'}
+ />
+ </>
+
+ )
+}
+const BatchLevelButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchStockLevel"}>
+ <EditIcon />
+ </Button>
+
+ <BatchModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ fieldType={'stockLevel'}
+ />
+ </>
+
+ )
+}
+
+const BatchWarnButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchValidWarn"}>
+ <EditIcon />
+ </Button>
+
+ <BatchModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ fieldType={'validWarn'}
+ />
+ </>
+
+ )
+}
+
+const BatchFlagButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchFlagCheck"}>
+ <EditIcon />
+ </Button>
+
+ <BatchModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ fieldType={'flagCheck'}
+ />
+ </>
+
+ )
+}
+
+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}
/>
@@ -357,7 +456,7 @@
)
}
-const PrintButton = () => {
+const BatchPrintButton = () => {
const record = useRecordContext();
const { resource, selectedIds } = useListContext();
const notify = useNotify();
@@ -377,6 +476,51 @@
rows={selectedIds}
/>
</>
+ )
+}
+
+const PrintButton = () => {
+ const record = useRecordContext();
+
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button color="secondary" onClick={() => setCreateDialog(true)} label={"toolbar.print"}>
+ <PrintIcon />
+ </Button>
+
+ <PrintModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ rows={[record.id]}
+ />
+ </>
+ )
+}
+
+const BindButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.bindloc"}>
+ <LinkIcon />
+ </Button>
+
+ <BindModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ </>
)
}
\ No newline at end of file
--
Gitblit v1.9.1