From f300ac5af5afc40c7a225768ad4cfa36ff99a11f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 19 七月 2025 13:50:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx
index 21579c4..dc5b49e 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx
@@ -55,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 />,
@@ -112,7 +118,7 @@
}}
title={"menu.outStockItem"}
empty={false}
- filter={{ asnId: asnId, deleted: 0 }}
+ filter={{ orderId: asnId, deleted: 0 }}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -127,11 +133,11 @@
preferenceKey='outStockItem'
bulkActionButtons={false}
rowClick={false}
- omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty', 'purUnit', 'trackCode', 'packName', 'qrcode', 'splrName', 'matnrId', 'asnId']}
+ 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" />
--
Gitblit v1.9.1