From 9681ec4b36c4402070482ddfd4ae0ea2de409d8d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 09:58:53 +0800
Subject: [PATCH] #新增 1. 综合订单界面优化 2. 添加库位详细界面
---
rsf-admin/src/page/orders/stock/OrderItemList.jsx | 106 ++++++++++++++++++++++++++---------------------------
1 files changed, 52 insertions(+), 54 deletions(-)
diff --git a/rsf-admin/src/page/orders/order/OrderItemList.jsx b/rsf-admin/src/page/orders/stock/OrderItemList.jsx
similarity index 70%
rename from rsf-admin/src/page/orders/order/OrderItemList.jsx
rename to rsf-admin/src/page/orders/stock/OrderItemList.jsx
index 6a301f7..7b0f1fe 100644
--- a/rsf-admin/src/page/orders/order/OrderItemList.jsx
+++ b/rsf-admin/src/page/orders/stock/OrderItemList.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';
@@ -59,28 +60,28 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
- <NumberInput source="orderId" label="table.field.orderItem.orderId" />,
- <TextInput source="orderCode" label="table.field.orderItem.orderCode" />,
- <TextInput source="sourceItemId" label="table.field.orderItem.sourceItemId" />,
- <TextInput source="matnrId" label="table.field.orderItem.matnrId" />,
- <TextInput source="matnrCode" label="table.field.orderItem.matnrCode" />,
- <TextInput source="maktx" label="table.field.orderItem.maktx" />,
- <NumberInput source="anfme" label="table.field.orderItem.anfme" />,
- <TextInput source="stockUnit" label="table.field.orderItem.stockUnit" />,
- <NumberInput source="workQty" label="table.field.orderItem.workQty" />,
- <NumberInput source="purQty" label="table.field.orderItem.purQty" />,
- <TextInput source="purUnit" label="table.field.orderItem.purUnit" />,
- <NumberInput source="qty" label="table.field.orderItem.qty" />,
- <TextInput source="splrCode" label="table.field.orderItem.splrCode" />,
- <TextInput source="batch" label="table.field.orderItem.batch" />,
- <TextInput source="splrBatch" label="table.field.orderItem.splrBatch" />,
- <TextInput source="splrName" label="table.field.orderItem.splrName" />,
- <TextInput source="trackCode" label="table.field.orderItem.trackCode" />,
- <TextInput source="barcode" label="table.field.orderItem.barcode" />,
- <TextInput source="prodTime" label="table.field.orderItem.prodTime" />,
- <TextInput source="packName" label="table.field.orderItem.packName" />,
+ <DateInput label='common.time.after' source="timeStart" />,
+ <DateInput label='common.time.before' source="timeEnd" />,
+ <NumberInput source="orderId" label="table.field.stockItem.orderId" />,
+ <TextInput source="orderCode" label="table.field.stockItem.orderCode" />,
+ <TextInput source="sourceItemId" label="table.field.stockItem.sourceItemId" />,
+ <TextInput source="matnrId" label="table.field.stockItem.matnrId" />,
+ <TextInput source="matnrCode" label="table.field.stockItem.matnrCode" />,
+ <TextInput source="maktx" label="table.field.stockItem.maktx" />,
+ <NumberInput source="anfme" label="table.field.stockItem.anfme" />,
+ <TextInput source="stockUnit" label="table.field.stockItem.stockUnit" />,
+ <NumberInput source="workQty" label="table.field.stockItem.workQty" />,
+ <NumberInput source="purQty" label="table.field.stockItem.purQty" />,
+ <TextInput source="purUnit" label="table.field.stockItem.purUnit" />,
+ <NumberInput source="qty" label="table.field.stockItem.qty" />,
+ <TextInput source="splrCode" label="table.field.stockItem.splrCode" />,
+ <TextInput source="batch" label="table.field.stockItem.batch" />,
+ <TextInput source="splrBatch" label="table.field.stockItem.splrBatch" />,
+ <TextInput source="splrName" label="table.field.stockItem.splrName" />,
+ <TextInput source="trackCode" label="table.field.stockItem.trackCode" />,
+ <TextInput source="barcode" label="table.field.stockItem.barcode" />,
+ <TextInput source="prodTime" label="table.field.stockItem.prodTime" />,
+ <TextInput source="packName" label="table.field.stockItem.packName" />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -95,13 +96,14 @@
const OrderItemList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+ const stockId = useGetRecordId();
return (
<Box display="flex">
<List
+ resource="stockItem"
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -110,22 +112,22 @@
}),
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
- title={"menu.orderItem"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ title={"menu.stockItem"}
+ empty={false}
filters={filters}
+ filter={{ stockId: stockId }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
- <SelectColumnsButton preferenceKey='orderItem' />
+ <SelectColumnsButton preferenceKey='stockItem' />
<MyExportButton />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
- preferenceKey='orderItem'
+ preferenceKey='stockItem'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
expand={false}
@@ -133,29 +135,29 @@
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
- <NumberField source="orderId" label="table.field.orderItem.orderId" />
- <TextField source="orderCode" label="table.field.orderItem.orderCode" />
- <TextField source="sourceItemId" label="table.field.orderItem.sourceItemId" />
- <TextField source="matnrId" label="table.field.orderItem.matnrId" />
- <TextField source="matnrCode" label="table.field.orderItem.matnrCode" />
- <TextField source="maktx" label="table.field.orderItem.maktx" />
- <NumberField source="anfme" label="table.field.orderItem.anfme" />
- <TextField source="stockUnit" label="table.field.orderItem.stockUnit" />
- <NumberField source="workQty" label="table.field.orderItem.workQty" />
- <NumberField source="purQty" label="table.field.orderItem.purQty" />
- <TextField source="purUnit" label="table.field.orderItem.purUnit" />
- <NumberField source="qty" label="table.field.orderItem.qty" />
- <TextField source="splrCode" label="table.field.orderItem.splrCode" />
- <TextField source="batch" label="table.field.orderItem.batch" />
- <TextField source="splrBatch" label="table.field.orderItem.splrBatch" />
- <TextField source="splrName" label="table.field.orderItem.splrName" />
- <TextField source="trackCode" label="table.field.orderItem.trackCode" />
- <TextField source="barcode" label="table.field.orderItem.barcode" />
- <TextField source="prodTime" label="table.field.orderItem.prodTime" />
- <TextField source="packName" label="table.field.orderItem.packName" />
+ <NumberField source="orderId" label="table.field.stockItem.orderId" />
+ <TextField source="orderCode" label="table.field.stockItem.orderCode" />
+ <TextField source="sourceItemId" label="table.field.stockItem.sourceItemId" />
+ <TextField source="matnrId" label="table.field.stockItem.matnrId" />
+ <TextField source="matnrCode" label="table.field.stockItem.matnrCode" />
+ <TextField source="maktx" label="table.field.stockItem.maktx" />
+ <NumberField source="anfme" label="table.field.stockItem.anfme" />
+ <TextField source="stockUnit" label="table.field.stockItem.stockUnit" />
+ <NumberField source="workQty" label="table.field.stockItem.workQty" />
+ <NumberField source="purQty" label="table.field.stockItem.purQty" />
+ <TextField source="purUnit" label="table.field.stockItem.purUnit" />
+ <NumberField source="qty" label="table.field.stockItem.qty" />
+ <TextField source="splrCode" label="table.field.stockItem.splrCode" />
+ <TextField source="batch" label="table.field.stockItem.batch" />
+ <TextField source="splrBatch" label="table.field.stockItem.splrBatch" />
+ <TextField source="splrName" label="table.field.stockItem.splrName" />
+ <TextField source="trackCode" label="table.field.stockItem.trackCode" />
+ <TextField source="barcode" label="table.field.stockItem.barcode" />
+ <TextField source="prodTime" label="table.field.stockItem.prodTime" />
+ <TextField source="packName" label="table.field.stockItem.packName" />
<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} />
<TextField source="memo" label="common.field.memo" sortable={false} />
@@ -165,12 +167,8 @@
</WrapperField>
</StyledDatagrid>
</List>
- <OrderItemCreate
- open={createDialog}
- setOpen={setCreateDialog}
- />
<PageDrawer
- title='OrderItem Detail'
+ title='stockItem Detail'
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
--
Gitblit v1.9.1