From 6cfcfa0b4d2d5a5cd28f4486594eb5db16b679c4 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 14 七月 2025 19:18:01 +0800 Subject: [PATCH] 盘点单功能优化 --- rsf-admin/src/page/orders/check/CheckOrderList.jsx | 47 ++++++----------------------------------------- 1 files changed, 6 insertions(+), 41 deletions(-) diff --git a/rsf-admin/src/page/orders/check/CheckOrderList.jsx b/rsf-admin/src/page/orders/check/CheckOrderList.jsx index 228316d..3fec11a 100644 --- a/rsf-admin/src/page/orders/check/CheckOrderList.jsx +++ b/rsf-admin/src/page/orders/check/CheckOrderList.jsx @@ -38,6 +38,8 @@ import DetailsIcon from '@mui/icons-material/Details'; import AddTaskIcon from '@mui/icons-material/AddTask'; import PublicIcon from '@mui/icons-material/Public'; +import SelectMatnrModal from "./SelectMatnrModal"; +import CheckOrderModal from "./CheckOrderModal"; import EditIcon from '@mui/icons-material/Edit'; import AddIcon from '@mui/icons-material/Add'; import request from '@/utils/request'; @@ -70,7 +72,7 @@ <ReferenceInput source="type" reference="dictData" filter={{ dictTypeCode: 'sys_order_type', group: '3' }} label="table.field.checkOrder.type" alwaysOn> <AutocompleteInput label="table.field.checkOrder.type" optionValue="value" /> </ReferenceInput>, - <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_check_order_type'}} label="table.field.checkOrder.wkType" alwaysOn> + <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_check_order_type' }} label="table.field.checkOrder.wkType" alwaysOn> <AutocompleteInput label="table.field.checkOrder.wkType" optionValue="value" /> </ReferenceInput>, <NumberInput source="anfme" label="table.field.checkOrder.anfme" />, @@ -97,7 +99,6 @@ const translate = useTranslate(); const refresh = useRefresh(); const notify = useNotify(); - const [createDialog, setCreateDialog] = useState(false); const [manualDialog, setManualDialog] = useState(false); const [selectIds, setSelectIds] = useState([]); @@ -140,7 +141,6 @@ actions={( <TopToolbar> <FilterButton /> - <CreateByOrderButton setCreateDialog={setCreateDialog} /> <MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} /> <SelectColumnsButton preferenceKey='check' /> <ImportButton value={'checkItem'} /> @@ -175,27 +175,20 @@ <MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} /> <EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton> <CancelButton /> - <PublicButton setDrawerVal={setDrawerVal} drawerVal={drawerVal} setSelect={setSelect} /> </WrapperField> </StyledDatagrid> </List> - {/* <OutOrderCreate + {/* <CheckOrderCreate open={manualDialog} setOpen={setManualDialog} /> */} - {/* <SelectMatnrModal + <SelectMatnrModal asnId={modalType} billReload={billReload} open={manualDialog} setOpen={setManualDialog} /> - <OutOrderModal - open={createDialog} - setOpen={setCreateDialog} - preview={preview} - setPreview={setPreview} - /> - <OutStockWaveDialog open={waveRule} setOpen={setWaveRule} onClose={closeDialog} /> + {/* <OutStockWaveDialog open={waveRule} setOpen={setWaveRule} onClose={closeDialog} /> <OutOrderPreview open={preview} setOpen={setPreview} /> <PageEditDrawer title={"toolbar.publicWorking"} @@ -251,19 +244,6 @@ ) } -const CreateByOrderButton = ({ setCreateDialog }) => { - const record = useRecordContext(); - const notify = useNotify(); - const refresh = useRefresh(); - const createByOrder = async (event) => { - event.stopPropagation(); - setCreateDialog(true); - } - - return ( - <Button onClick={createByOrder} label={'toolbar.asnCreate'}> <AddIcon /> </Button> - ) -} const CancelButton = () => { const record = useRecordContext(); @@ -281,20 +261,5 @@ return ( record?.exceStatus == 10 ? <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelOutlinedIcon />} onConfirm={cancelOrder} size={"small"} /> : <></> - ) -} - -//涓嬪彂鎵ц -const PublicButton = ({ setDrawerVal, setSelect }) => { - const record = useRecordContext(); - const refresh = useRefresh(); - const taskEvent = () => { - setDrawerVal(true) - setSelect(record) - refresh(); - } - - return ( - record.workQty < record.anfme ? <Button label={"toolbar.publicWorking"} startIcon={<AddTaskIcon />} onClick={taskEvent} size={"small"} /> : <></> ) } -- Gitblit v1.9.1