From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/task/TaskItemList.jsx | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskItemList.jsx b/rsf-admin/src/page/task/TaskItemList.jsx
index 9fd01f6..295fb18 100644
--- a/rsf-admin/src/page/task/TaskItemList.jsx
+++ b/rsf-admin/src/page/task/TaskItemList.jsx
@@ -58,6 +58,9 @@
<TextInput source="matnrCode" label="table.field.taskItem.matnrCode" />,
<TextInput source="unit" label="table.field.taskItem.unit" />,
<NumberInput source="anfme" label="table.field.taskItem.anfme" />,
+ <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="batch" label="table.field.taskItem.batch" />,
<TextInput source="spec" label="table.field.taskItem.spec" />,
<TextInput source="model" label="table.field.taskItem.model" />,
@@ -149,6 +152,9 @@
<TextField source="matnrCode" label="table.field.taskItem.matnrCode" />,
<TextField source="unit" label="table.field.taskItem.unit" />,
<NumberField source="anfme" label="table.field.taskItem.anfme" />,
+ <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<TextField source="batch" label="table.field.taskItem.batch" />,
<TextField source="isptResult$" label="table.field.taskItem.isptResult" />,
<TextField source="spec" label="table.field.taskItem.spec" />,
@@ -193,7 +199,7 @@
rowClick={false}
// expand={() => <TaskItemPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId', 'platWorkCode', 'projectCode']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
--
Gitblit v1.9.1