From 668590b860e572990b357747f39810e955823caf Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 19 五月 2025 20:16:53 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
index a435d24..eab6bc6 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -73,6 +73,9 @@
<TextInput source="barcode" label="table.field.warehouseAreasItem.barcode" />,
<NumberInput source="anfme" label="table.field.warehouseAreasItem.anfme" />,
<TextInput source="batch" label="table.field.warehouseAreasItem.batch" />,
+ <TextInput source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextInput source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextInput source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<TextInput source="unit" label="table.field.warehouseAreasItem.unit" />,
<TextInput source="stockUnit" label="table.field.warehouseAreasItem.stockUnit" />,
<TextInput source="brand" label="table.field.warehouseAreasItem.brand" />,
@@ -181,6 +184,9 @@
<NumberField key="anfme" source="anfme" label="table.field.warehouseAreasItem.anfme" />,
<NumberField key="workQty" source="workQty" label="table.field.warehouseAreasItem.workQty" />,
<NumberField key="qty" source="qty" label="table.field.warehouseAreasItem.qty" />,
+ <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
// <MyField source="isptQty" label="table.field.qlyIsptItem.anfme"
// onClick={(event, record, val) => {
// event.stopPropagation();
@@ -211,13 +217,13 @@
setColumns([...arr, ...fields, ...lastArr]);
//filters娣诲姞杩囨护瀛楁
data.map(el => {
- var i =0;
- filters.map((item) =>{
- if(item.key === el.fields){
- i = 1;
+ var i = 0;
+ filters.map((item) => {
+ if (item.key === el.fields) {
+ i = 1;
}
})
- i===0 && filters.push(<TextInput key={el.fields} source={el.fields} label={el.fieldsAlise} />)
+ i === 0 && filters.push(<TextInput key={el.fields} source={el.fields} label={el.fieldsAlise} />)
})
} else {
notify(msg);
@@ -242,7 +248,7 @@
preferenceKey='warehouseAreasItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'memo', 'areaId', 'brand', 'createBy$', 'weight', 'matnrId', 'batch', 'shipperId', 'splrId']}
+ omit={['id', 'createTime', 'memo', 'areaId', 'brand', 'createBy$', 'weight', 'matnrId', 'batch', 'shipperId', 'splrId', 'platWorkCode', 'projectCode']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
--
Gitblit v1.9.1