From 401e85bb3749bb9107f65ddaa15868a0a9ba852e Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 11 四月 2025 14:18:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/purchase/PurchaseItemList.jsx | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/rsf-admin/src/page/purchaseItem/PurchaseItemList.jsx b/rsf-admin/src/page/purchase/PurchaseItemList.jsx
similarity index 87%
rename from rsf-admin/src/page/purchaseItem/PurchaseItemList.jsx
rename to rsf-admin/src/page/purchase/PurchaseItemList.jsx
index ce3083d..970263d 100644
--- a/rsf-admin/src/page/purchaseItem/PurchaseItemList.jsx
+++ b/rsf-admin/src/page/purchase/PurchaseItemList.jsx
@@ -31,19 +31,16 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ useGetRecordId,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
import PurchaseItemCreate from "./PurchaseItemCreate";
-import PurchaseItemPanel from "./PurchaseItemPanel";
import EmptyData from "../components/EmptyData";
import MyCreateButton from "../components/MyCreateButton";
import MyExportButton from '../components/MyExportButton';
import PageDrawer from "../components/PageDrawer";
-import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import * as Common from '@/utils/common';
-import CustomerTopToolBar from "../components/EditTopToolBar";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -90,19 +87,15 @@
const PurchaseItemList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
-
- const location = useLocation();
- const queryParams = new URLSearchParams(location.search);
- const poId = queryParams.get("poId");
+ const poId = useGetRecordId();
return (
<>
- {poId && <CustomerTopToolBar backPrevious={true} />}
<Box display="flex">
<List
+ resource="purchaseItem"
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -114,6 +107,7 @@
title={"menu.purchaseItem"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
filters={filters}
+ filter={{ purchaseId: poId }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
@@ -129,7 +123,7 @@
preferenceKey='purchaseItem'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime','purchaseId', 'platItemId', 'createBy', 'memo']}
>
<NumberField source="id" />
<NumberField source="purchaseId" label="table.field.purchaseItem.purchaseId" />
@@ -145,14 +139,9 @@
<TextField source="splrName" label="table.field.purchaseItem.splrName" />
<TextField source="splrCode" label="table.field.purchaseItem.splrCode" />
<TextField source="splrBatch" label="table.field.purchaseItem.splrBatch" />
-
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="updateBy$" label="common.field.updateBy" reference="user" />
<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} />
<TextField source="memo" label="common.field.memo" sortable={false} />
--
Gitblit v1.9.1