From 83207d8367cf5cdce0aedb5cf92b007ff9c7f7cd Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期五, 18 四月 2025 13:28:38 +0800 Subject: [PATCH] #收货历史单明细导出问题修复 --- rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 157 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 144 insertions(+), 13 deletions(-) diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx index 5dc0c6c..f1aae39 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,16 +87,16 @@ overflow: 'hidden', textOverflow: 'ellipsis', display: 'block', - width: '300px', + 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"> @@ -194,7 +195,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>, @@ -207,12 +208,22 @@ <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]); - + + //filters娣诲姞杩囨护瀛楁 + data.map(el => { + var i =0; + filters.map((item) =>{ + if(item.key === el.fields){ + i = 1; + } + }) + i===0 && filters.push(<TextInput key={el.fields} source={el.fields} label={el.fieldsAlise} />) + }) } else { notify(msg); } @@ -239,9 +250,13 @@ <StyledDatagrid preferenceKey='matnr' bulkActionButtons={<> - <BatchButton /> + <BatchGroupButton /> + <BatchWarnButton /> + <BatchFlagButton /> + <BatchStatusButton /> + <BatchLevelButton /> <BindButton /> - <PrintButton /> + <BatchPrintButton /> <BulkDeleteButton mutationMode={OPERATE_MODE} /> </>} rowClick={(id, resource, record) => false} @@ -259,7 +274,6 @@ const MatnrList = () => { const translate = useTranslate(); - const [createDialog, setCreateDialog] = useState(false); const [drawerVal, setDrawerVal] = useState(false); const notify = useNotify(); @@ -337,7 +351,7 @@ ) } -const BatchButton = () => { +const BatchStatusButton = () => { const record = useRecordContext(); const notify = useNotify(); const refresh = useRefresh(); @@ -347,11 +361,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} /> @@ -360,7 +469,7 @@ ) } -const PrintButton = () => { +const BatchPrintButton = () => { const record = useRecordContext(); const { resource, selectedIds } = useListContext(); const notify = useNotify(); @@ -380,7 +489,29 @@ 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]} + /> + </> ) } -- Gitblit v1.9.1