From 912b4dab5f847ab1108b18df1b5e06e85c71881e Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期二, 03 二月 2026 17:32:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx b/rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx
index e571383..4ca857f 100644
--- a/rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx
+++ b/rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx
@@ -124,18 +124,22 @@
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId', 'trackCode', 'spec', 'model']}
>
<NumberField source="id" />
<NumberField source="taskId" label="table.field.taskItemLog.taskId" />
<NumberField source="orderId" label="table.field.taskItemLog.orderId" />
<TextField source="orderType" label="table.field.taskItemLog.orderType" />
<NumberField source="orderItemId" label="table.field.taskItemLog.orderItemId" />
+ <NumberField source="orderType$" label="table.field.taskItem.orderType" />,
+ <NumberField source="wkType$" label="table.field.taskItem.wkType" />,
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextField source="platItemId" label="table.field.asnOrderItemLog.platItemId" />,
+ <TextField source="trackCode" label="table.field.taskItemLog.trackCode" />
<NumberField source="source" label="table.field.taskItemLog.source" />
<NumberField source="matnrId" label="table.field.taskItemLog.matnrId" />
<TextField source="maktx" label="table.field.taskItemLog.maktx" />
- <TextField source="matnrCode" label="table.field.taskItemLog.matnrCode" />
- <TextField source="trackCode" label="table.field.taskItemLog.trackCode" />
+ <TextField source="matnrCode" label="table.field.taskItemLog.matnrCode" />
<TextField source="unit" label="table.field.taskItemLog.unit" />
<NumberField source="anfme" label="table.field.taskItemLog.anfme" />
<TextField source="batch" label="table.field.taskItemLog.batch" />
--
Gitblit v1.9.1