From becc33ce9681fcc75d26eb2b8fbe650d53cb1f89 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 七月 2025 14:55:26 +0800
Subject: [PATCH] 1. 调拔单功能优化 2. 7.30问题及bug修复
---
rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx | 115 +++++++++++++++++++++++++++++----------------------------
1 files changed, 59 insertions(+), 56 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx
index 4d73b97..dc5b49e 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx
@@ -39,18 +39,13 @@
import { Box, Typography, Card, Stack, Dialog, DialogActions, DialogTitle } from '@mui/material';
import { styled } from '@mui/material/styles';
import OutOrderItemCreate from "./OutOrderItemCreate";
-import EmptyData from "../../components/EmptyData";
-import MyCreateButton from "../../components/MyCreateButton";
-import MyExportButton from '../../components/MyExportButton';
import PageDrawer from "../../components/PageDrawer";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
import OutOrderItemEdit from "./OutOrderItemEdit";
-import ImportButton from "../../components/ImportButton";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
height: '.9em',
-
},
'& .RaDatagrid-row': {
cursor: 'auto'
@@ -60,26 +55,32 @@
'& .opt': {
width: 200
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
+
}));
const filters = [
<SearchInput source="condition" alwaysOn />,
- <NumberInput source="asnId" label="table.field.asnOrderItem.asnId" />,
- <TextInput source="asnCode" label="table.field.asnOrderItem.asnCode" />,
- <TextInput source="poDetlId" label="table.field.asnOrderItem.poDetlId" />,
- <TextInput source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />,
- <TextInput source="matnrId" label="table.field.asnOrderItem.matnrId" />,
- <TextInput source="maktx" label="table.field.asnOrderItem.maktx" />,
- <NumberInput source="anfme" label="table.field.asnOrderItem.anfme" />,
- <TextInput source="stockUnit" label="table.field.asnOrderItem.stockUnit" />,
- <NumberInput source="purQty" label="table.field.asnOrderItem.purQty" />,
- <TextInput source="purUnit" label="table.field.asnOrderItem.purUnit" />,
- <NumberInput source="qty" label="table.field.asnOrderItem.qty" />,
- <TextInput source="splrCode" label="table.field.asnOrderItem.splrCode" />,
- <TextInput source="splrName" label="table.field.asnOrderItem.splrName" />,
- <TextInput source="qrcode" label="table.field.asnOrderItem.qrcode" />,
- <TextInput source="trackCode" label="table.field.asnOrderItem.barcode" />,
- <TextInput source="packName" label="table.field.asnOrderItem.packName" />,
+ <NumberInput source="orderId" label="table.field.outStockItem.orderId" />,
+ <TextInput source="orderCode" label="table.field.outStockItem.orderCode" alwaysOn />,
+ <TextInput source="poDetlId" label="table.field.outStockItem.poDetlId" />,
+ <TextInput source="matnrId" label="table.field.outStockItem.matnrId" />,
+ <TextInput source="maktx" label="table.field.outStockItem.maktx" alwaysOn />,
+ <TextInput source="matnrCode" label="table.field.outStockItem.matnrCode" alwaysOn />,
+ <NumberInput source="anfme" label="table.field.outStockItem.anfme" />,
+ <TextInput source="stockUnit" label="table.field.outStockItem.stockUnit" />,
+ <NumberInput source="purQty" label="table.field.outStockItem.purQty" />,
+ <TextInput source="purUnit" label="table.field.outStockItem.purUnit" />,
+ <NumberInput source="qty" label="table.field.outStockItem.qty" />,
+ <TextInput source="splrCode" label="table.field.outStockItem.splrCode" />,
+ <TextInput source="splrName" label="table.field.outStockItem.splrName" />,
+ <TextInput source="qrcode" label="table.field.outStockItem.qrcode" />,
+ <TextInput source="trackCode" label="table.field.outStockItem.barcode" />,
+ <TextInput source="packName" label="table.field.outStockItem.packName" />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -99,13 +100,14 @@
const [drawerVal, setDrawerVal] = useState(false);
const [select, setSelect] = useState({});
const asnId = useGetRecordId();
- const { data: dicts, isPending, error } = useGetOne('asnOrder', { id: asnId });
+ const { data: dicts, isPending, error } = useGetOne('outStock', { id: asnId });
return (
<>
<Box display="flex">
<List
- resource="asnOrderItem"
+ resource="outStockItem"
+ storeKey='outStockItem'
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -114,53 +116,54 @@
}),
marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
- title={"menu.asnOrderItem"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
- filter={{ asnId: asnId, deleted: 0 }}
+ title={"menu.outStockItem"}
+ empty={false}
+ filter={{ orderId: asnId, deleted: 0 }}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
- <SelectColumnsButton preferenceKey='asnOrderItem' />
- {/* <MyExportButton /> */}
+ <SelectColumnsButton preferenceKey='outStockItem' />
</TopToolbar>
)}
perPage={DEFAULT_ITEM_PAGE_SIZE}
>
<StyledDatagrid
- preferenceKey='asnOrderItem'
+ preferenceKey='outStockItem'
bulkActionButtons={false}
- rowClick={(id, resource, record) => {
- setSelect(record)
- setEditDialog(true)
- }}
- omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'matnrId', 'asnId']}
+ rowClick={false}
+ omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty', 'purUnit', 'trackCode', 'packName', 'qrcode', 'splrCode', 'matnrId', 'orderId','platOrderCode']}
>
<NumberField source="id" />
- <NumberField source="asnId" label="table.field.asnOrderItem.asnId" />
- <TextField source="asnCode" label="table.field.asnOrderItem.asnCode" />
- <TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" />
- <TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />
- <TextField source="matnrId" label="table.field.asnOrderItem.matnrId" />
- <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" />
- <TextField source="maktx" label="table.field.asnOrderItem.maktx" />
- <NumberField source="anfme" label="table.field.asnOrderItem.anfme" />
- <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />
- <NumberField source="purQty" label="table.field.asnOrderItem.purQty" />
- <TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />
- <NumberField source="qty" label="table.field.asnOrderItem.qty" />
- <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />
- <TextField source="splrName" label="table.field.asnOrderItem.splrName" />
- <TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />
- <TextField source="trackCode" label="table.field.asnOrderItem.barcode" />
- <TextField source="packName" label="table.field.asnOrderItem.packName" />
- <TextField source="updateBy$" label="common.field.updateBy" />
+ <NumberField source="orderId" label="table.field.outStockItem.orderId" />
+ <TextField source="orderCode" label="table.field.outStockItem.orderCode" />
+ <TextField source="poCode" label="table.field.outStockItem.poCode" />
+ <TextField source="poDetlId" label="table.field.outStockItem.poDetlId" />
+ <TextField source="matnrId" label="table.field.outStockItem.matnrId" />
+ <TextField source="matnrCode" label="table.field.outStockItem.matnrCode" />
+ <TextField source="maktx" label="table.field.outStockItem.maktx" />
+ <TextField source="platOrderCode" label="table.field.outStockItem.platOrderCode" />
+ <NumberField source="anfme" label="table.field.outStockItem.anfme" />
+ <NumberField source="purQty" label="table.field.outStockItem.purQty" />
+ <NumberField source="workQty" label="table.field.outStockItem.workQty" />
+ <NumberField source="qty" label="table.field.outStockItem.qty" />
+ <TextField source="stockUnit" label="table.field.outStockItem.stockUnit" />
+ <TextField source="splrBatch" label="table.field.outStockItem.splrBatch" />
+ <TextField source="purUnit" label="table.field.outStockItem.purUnit" />
+ <TextField source="splrCode" label="table.field.outStockItem.splrCode" />
+ <TextField source="splrName" label="table.field.outStockItem.splrName" />
+ <TextField source="qrcode" label="table.field.outStockItem.qrcode" />
+ <TextField source="trackCode" label="table.field.outStockItem.barcode" />
+ <TextField source="packName" label="table.field.outStockItem.packName" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <TextField source="createBy$" label="common.field.createBy" />
+ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>,
+ <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>,
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="status$" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
</StyledDatagrid>
</List>
@@ -175,7 +178,7 @@
record={select}
/>
<PageDrawer
- title='AsnOrderItem Detail'
+ title='OutStockItem Detail'
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
--
Gitblit v1.9.1