From bfc43ca0e4683c1c0322a6cad5d5be2bc07decc3 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 24 七月 2025 15:00:44 +0800 Subject: [PATCH] 新增调拔单功能 盘点功能优化 --- rsf-admin/src/page/orders/purchase/PurchaseList.jsx | 35 +++++++++++++++++++++++++---------- 1 files changed, 25 insertions(+), 10 deletions(-) diff --git a/rsf-admin/src/page/orders/purchase/PurchaseList.jsx b/rsf-admin/src/page/orders/purchase/PurchaseList.jsx index 2a505de..f1d37e6 100644 --- a/rsf-admin/src/page/orders/purchase/PurchaseList.jsx +++ b/rsf-admin/src/page/orders/purchase/PurchaseList.jsx @@ -38,6 +38,7 @@ import PurchasePanel from "./PurchasePanel"; import EmptyData from "../../components/EmptyData"; import MyCreateButton from "../../components/MyCreateButton"; +import BillStatusField from '../../components/BillStatusField'; import MyExportButton from '../../components/MyExportButton'; import PageDrawer from "../../components/PageDrawer"; import MyField from "../../components/MyField"; @@ -57,6 +58,11 @@ '& .opt': { width: 200 }, + '& .MuiTableCell-root': { + whiteSpace: 'nowrap', + overflow: 'visible', + textOverflow: 'unset' + } })); const filters = [ @@ -112,7 +118,7 @@ actions={( <TopToolbar> <FilterButton /> - <MyCreateButton onClick={() => { setCreateDialog(true) }} /> + {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */} <SelectColumnsButton preferenceKey='purchase' /> <ImportButton value={'purchaseItem'} /> <MyExportButton /> @@ -122,35 +128,36 @@ > <StyledDatagrid preferenceKey='purchase' - bulkActionButtons={() => <BulkDeleteButton mutationMode="pessimistic"/>} - rowClick={'edit'} + bulkActionButtons={() => <BulkDeleteButton mutationMode="pessimistic" />} + rowClick={false} expand={false} expandSingle={true} - omit={['id', 'createTime', 'createBy','channel', 'platCode', 'memo', 'preArr', 'channel','startTime','workQty', 'endTime']} + omit={['id', 'createTime', 'createBy', 'channel', 'platCode', 'memo', 'channel', 'startTime', 'workQty', 'endTime', 'createBy$']} > <NumberField source="id" /> <TextField source="code" label="table.field.purchase.code" /> <TextField source="type$" label="table.field.purchase.type" /> <TextField source="wkType$" label="table.field.purchase.wkType" /> <TextField source="source" label="table.field.purchase.source" /> - <DateField source="preArr" label="table.field.purchase.preArr" showTime /> <NumberField source="anfme" label="table.field.purchase.anfme" /> <NumberField source="qty" label="table.field.purchase.qty" /> {/* <NumberField source="workQty" label="table.field.purchase.workQty" /> */} <TextField source="channel" label="table.field.purchase.channel" /> <TextField source="platCode" label="table.field.purchase.platCode" /> + <DateField source="preArr" label="table.field.purchase.preArr" showTime /> <DateField source="startTime" label="table.field.purchase.startTime" showTime /> <DateField source="endTime" label="table.field.purchase.endTime" showTime /> <TextField source="project" label="table.field.purchase.project" /> - <TextField source="updateBy$" label="common.field.updateBy" /> + <TextField source="updateBy$" label="common.field.updateBy" /> <DateField source="updateTime" label="common.field.updateTime" showTime /> - <TextField source="createBy$" label="common.field.createBy" /> + <TextField source="createBy$" label="common.field.createBy" /> <DateField source="createTime" label="common.field.createTime" showTime /> - <BooleanField source="statusBool" label="common.field.status" sortable={false} /> + <BillStatusField cellClassName="status" source="exceStatus" label="table.field.asnOrder.exceStatus" /> + {/* <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"> - <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} /> - <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode="pessimistic"/> + <EditButton label="toolbar.detail" sx={{ padding: '1px', fontSize: '.75rem' }} /> + <DeleteButtons /> </WrapperField> </StyledDatagrid> </List> @@ -168,4 +175,12 @@ ) } + +const DeleteButtons = () => { + const record = useRecordContext(); + return ( + record?.exceStatus == 0 ? <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode="pessimistic" /> : <></> + ) +} + export default PurchaseList; -- Gitblit v1.9.1