From 60a665f3c576f8fe368ddfaabc9117a9c5dd47bf Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 02 八月 2025 09:56:30 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/transfer/TransferItemList.jsx | 47 +++++++++++++++++++----------------------------
1 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/rsf-admin/src/page/orders/transfer/TransferItemList.jsx b/rsf-admin/src/page/orders/transfer/TransferItemList.jsx
index db16ab8..b03628b 100644
--- a/rsf-admin/src/page/orders/transfer/TransferItemList.jsx
+++ b/rsf-admin/src/page/orders/transfer/TransferItemList.jsx
@@ -31,6 +31,7 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ useGetRecordId,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -91,77 +92,67 @@
const TransferItemList = () => {
const translate = useTranslate();
-
- const [createDialog, setCreateDialog] = useState(false);
+ const orderId = useGetRecordId();
const [drawerVal, setDrawerVal] = useState(false);
+ const [createDialog, setCreateDialog] = useState(false);
return (
<Box display="flex">
<List
+ resource="transferItem"
sx={{
flexGrow: 1,
transition: (theme) =>
theme.transitions.create(['all'], {
duration: theme.transitions.duration.enteringScreen,
}),
- marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
- title={"menu.transferItem"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ title={false}
+ empty={false}
filters={filters}
+ filter={{transferId: orderId}}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='transferItem' />
- <MyExportButton />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
preferenceKey='transferItem'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
expand={false}
expandSingle={false}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'transferId', 'matnrId', 'createTime', 'createBy', 'workQty', 'qty', 'memo', 'platItemId', 'splrId', 'fieldsIndex', 'platOrderCode', 'platWorkCode', 'projectCode']}
>
<NumberField source="id" />
<NumberField source="transferId" label="table.field.transferItem.transferId" />
<TextField source="transferCode" label="table.field.transferItem.transferCode" />
<NumberField source="matnrId" label="table.field.transferItem.matnrId" />
- <TextField source="maktx" label="table.field.transferItem.maktx" />
<TextField source="matnrCode" label="table.field.transferItem.matnrCode" />
- <TextField source="unit" label="table.field.transferItem.unit" />
- <NumberField source="anfme" label="table.field.transferItem.anfme" />
- <NumberField source="qty" label="table.field.transferItem.qty" />
- <NumberField source="workQty" label="table.field.transferItem.workQty" />
- <TextField source="batch" label="table.field.transferItem.batch" />
- <NumberField source="splrId" label="table.field.transferItem.splrId" />
+ <TextField source="maktx" label="table.field.transferItem.maktx" />
<TextField source="spec" label="table.field.transferItem.spec" />
<TextField source="model" label="table.field.transferItem.model" />
+ <TextField source="batch" label="table.field.transferItem.batch" />
+ <TextField source="unit" label="table.field.transferItem.unit" />
+ <NumberField source="anfme" label="table.field.transferItem.anfme" />
+ <NumberField source="workQty" label="table.field.transferItem.workQty" />
+ <NumberField source="qty" label="table.field.transferItem.qty" />
+ <NumberField source="splrId" label="table.field.transferItem.splrId" />
<TextField source="fieldsIndex" label="table.field.transferItem.fieldsIndex" />
<TextField source="platItemId" label="table.field.transferItem.platItemId" />
<TextField source="platOrderCode" label="table.field.transferItem.platOrderCode" />
<TextField source="platWorkCode" label="table.field.transferItem.platWorkCode" />
<TextField source="projectCode" label="table.field.transferItem.projectCode" />
-
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ {/* <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={OPERATE_MODE} />
- </WrapperField>
</StyledDatagrid>
</List>
<PageDrawer
--
Gitblit v1.9.1