From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx
index f4ff897..dc5b49e 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx
@@ -39,13 +39,9 @@
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': {
@@ -59,12 +55,18 @@
'& .opt': {
width: 200
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
+
}));
const filters = [
<SearchInput source="condition" alwaysOn />,
- <NumberInput source="asnId" label="table.field.outStockItem.asnId" />,
- <TextInput source="asnCode" label="table.field.outStockItem.asnCode" alwaysOn />,
+ <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 />,
@@ -116,15 +118,13 @@
}}
title={"menu.outStockItem"}
empty={false}
- filter={{ asnId: asnId, deleted: 0 }}
+ filter={{ orderId: asnId, deleted: 0 }}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='outStockItem' />
- {/* <MyExportButton /> */}
</TopToolbar>
)}
perPage={DEFAULT_ITEM_PAGE_SIZE}
@@ -132,15 +132,13 @@
<StyledDatagrid
preferenceKey='outStockItem'
bulkActionButtons={false}
- rowClick={(id, resource, record) => {
- setSelect(record)
- setEditDialog(true)
- }}
- omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty', 'purUnit', 'trackCode', 'packName','qrcode', 'splrName', '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.outStockItem.asnId" />
- <TextField source="asnCode" label="table.field.outStockItem.asnCode" />
+ <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" />
@@ -151,17 +149,21 @@
<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" />
- <TextField source="updateBy$" label="common.field.updateBy" />
<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>
--
Gitblit v1.9.1