From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/taskLog/TaskLogList.jsx | 50 +++++++++++++++++++-------------------------------
1 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/rsf-admin/src/page/taskLog/TaskLogList.jsx b/rsf-admin/src/page/taskLog/TaskLogList.jsx
index 5ffad18..fd93f6e 100644
--- a/rsf-admin/src/page/taskLog/TaskLogList.jsx
+++ b/rsf-admin/src/page/taskLog/TaskLogList.jsx
@@ -54,7 +54,7 @@
'& .column-name': {
},
'& .opt': {
- width: 200
+ width: 250
},
}));
@@ -125,43 +125,31 @@
<StyledDatagrid
preferenceKey='taskLog'
bulkActionButtons={false}
- rowClick={(id, resource, record) => false}
- expand={() => <TaskLogPanel />}
+ rowClick={'edit'}
+ expand={false}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'robotCode', 'exceStatus', 'sort', 'expCode']}
>
<NumberField source="id" />
- <NumberField source="taskId" label="table.field.taskLog.taskId" />
- <TextField source="taskCode" label="table.field.taskLog.taskCode" />
- <NumberField source="taskStatus" label="table.field.taskLog.taskStatus" />
- <NumberField source="taskType" label="table.field.taskLog.taskType" />
- <TextField source="orgLoc" label="table.field.taskLog.orgLoc" />
- <TextField source="orgSite" label="table.field.taskLog.orgSite" />
- <TextField source="targLoc" label="table.field.taskLog.targLoc" />
- <TextField source="targSite" label="table.field.taskLog.targSite" />
- <TextField source="barcode" label="table.field.taskLog.barcode" />
- <TextField source="robotCode" label="table.field.taskLog.robotCode" />
- <NumberField source="exceStatus" label="table.field.taskLog.exceStatus" />
- <TextField source="expDesc" label="table.field.taskLog.expDesc" />
- <NumberField source="sort" label="table.field.taskLog.sort" />
- <TextField source="expCode" label="table.field.taskLog.expCode" />
- <DateField source="startTime" label="table.field.taskLog.startTime" showTime />
- <DateField source="endTime" label="table.field.taskLog.endTime" showTime />
-
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="taskCode" label="table.field.task.taskCode" />
+ <NumberField source="taskStatus$" label="table.field.task.taskStatus" />
+ <NumberField source="taskType$" label="table.field.task.taskType" />
+ <TextField source="orgLoc" label="table.field.task.orgLoc" />
+ <TextField source="orgSite" label="table.field.task.orgSite" />
+ <TextField source="targLoc" label="table.field.task.targLoc" />
+ <TextField source="targSite" label="table.field.task.targSite" />
+ <TextField source="barcode" label="table.field.task.barcode" />
+ <TextField source="robotCode" label="table.field.task.robotCode" />
+ <NumberField source="exceStatus" label="table.field.task.exceStatus" />
+ <TextField source="expDesc" label="table.field.task.expDesc" />
+ <NumberField source="sort" label="table.field.task.sort" />
+ <TextField source="expCode" label="table.field.task.expCode" />
+ <TextField source="updateBy$" label="common.field.updateBy" />
+ <TextField source="createBy$" label="common.field.createBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <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="statusBool" label="common.field.status" sortable={false} />
+ {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
<TextField source="memo" label="common.field.memo" sortable={false} />
- <WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- </WrapperField>
</StyledDatagrid>
</List>
{/* <TaskLogCreate
--
Gitblit v1.9.1