From f04d6876ff130b240700ba8dec4c9d0a3980a687 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 03 四月 2025 13:10:36 +0800 Subject: [PATCH] 1. 任务明细界面修改 2. 任务历史档数据处理 --- rsf-admin/src/page/asnOrder/AsnOrderList.jsx | 98 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 72 insertions(+), 26 deletions(-) diff --git a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx index 96dbf12..70af9af 100644 --- a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx +++ b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx @@ -15,6 +15,7 @@ useRecordContext, useTranslate, useNotify, + useRefresh, useListContext, FunctionField, TextField, @@ -47,7 +48,7 @@ import ConstructionIcon from "@mui/icons-material/Construction"; import FileDownloadIcon from '@mui/icons-material/FileDownload'; import EditIcon from '@mui/icons-material/Edit'; - +import request from '@/utils/request'; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ @@ -66,7 +67,6 @@ const filters = [ <SearchInput source="condition" alwaysOn />, - <TextInput source="code" label="table.field.asnOrder.code" />, <TextInput source="poCode" label="table.field.asnOrder.poCode" />, <NumberInput source="poId" label="table.field.asnOrder.poId" />, @@ -107,11 +107,6 @@ navigate(`/asnOrderItem?asnId=${record.id}`); }; - - const inspection = () => { }; - const print = () => { }; - - return ( <Box display="flex"> <List @@ -130,9 +125,6 @@ actions={( <TopToolbar> - <Button onClick={inspection} label={"toolbar.inspection"}> - <ConstructionIcon /> - </Button> <FilterButton /> <MyCreateButton onClick={() => { setCreateDialog(true); setmodalType(0) }} /> <SelectColumnsButton preferenceKey='asnOrder' /> @@ -144,25 +136,18 @@ > <StyledDatagrid preferenceKey='asnOrder' - bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />} - rowClick={(id, resource, record) => false} - expand={(e) => <AsnOrderPanel key={Math.floor(Math.random() * 100)} />} + bulkActionButtons={<> <InspectionsButton /><BulkDeleteButton mutationMode={OPERATE_MODE} /></>} + rowClick={() => false} + expand={<AsnOrderPanel />} expandSingle={true} - omit={['id', 'createTime', 'createBy', 'memo']} + omit={['id', 'createTime', 'createBy', 'memo', 'poId']} > <NumberField source="id" /> - <MyField - source="code" - label="table.field.asnOrder.code" - onClick={(event, record, val) => { - event.stopPropagation(); - assign(record); - }} - /> + <TextField source="code" label="table.field.asnOrder.code" /> <TextField source="poCode" label="table.field.asnOrder.poCode" /> <NumberField source="poId" label="table.field.asnOrder.poId" /> - <TextField source="type" label="table.field.asnOrder.type" /> - <TextField source="wkType" label="table.field.asnOrder.wkType" /> + <TextField source="type$" label="table.field.asnOrder.type" /> + <TextField source="wkType$" label="table.field.asnOrder.wkType" /> <NumberField source="anfme" label="table.field.asnOrder.anfme" /> <NumberField source="qty" label="table.field.asnOrder.qty" /> <TextField source="logisNo" label="table.field.asnOrder.logisNo" /> @@ -180,9 +165,9 @@ <BooleanField source="statusBool" label="common.field.status" sortable={false} /> <TextField source="memo" label="common.field.memo" sortable={false} /> <WrapperField cellClassName="opt" label="common.field.opt" > - <Button label="toolbar.print" onClick={print}> + {/* <Button label="toolbar.print" onClick={print}> <FileDownloadIcon /> - </Button> + </Button> */} {/* <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} /> */} <MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} /> {/* <Button @@ -193,6 +178,7 @@ label={'ra.action.edit'} > </Button> */} + <InspectionButton /> <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> </WrapperField> </StyledDatagrid> @@ -232,3 +218,63 @@ </Button> ) } + +const InspectionButton = () => { + const record = useRecordContext(); + const notify = useNotify(); + const refresh = useRefresh(); + const inspection = () => { + requestInspect([record]) + }; + + const requestInspect = async (rows) => { + const { data: { code, data, msg } } = await request.post(`/asnOrder/inspect`, rows); + + if (code === 200) { + notify(msg); + refresh() + } else { + notify(msg); + } + } + + + return ( + <Button onClick={inspection} label={"toolbar.inspection"}> + <ConstructionIcon /> + </Button> + ) +} + +const InspectionsButton = () => { + const { selectedIds, onUnselectItems, data } = useListContext(); + const notify = useNotify(); + const refresh = useRefresh(); + const inspection = () => { + if (selectedIds.length === 0) { + notify('璇烽�夋嫨閫氱煡鍗�'); + return; + } else { + const rows = data.filter((item) => selectedIds.includes(item.id)) + requestInspect(rows) + } + }; + + const requestInspect = async (rows) => { + const { data: { code, data, msg } } = await request.post(`/asnOrder/inspect`, rows); + + if (code === 200) { + notify(msg); + refresh() + } else { + notify(msg); + } + } + + + return ( + <Button onClick={inspection} label={"toolbar.inspection"}> + <ConstructionIcon /> + </Button> + ) +} -- Gitblit v1.9.1