From 307d5a291ca19496d4abee0e099ebe3eb39ac7d2 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 02 四月 2025 10:59:19 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/task/TaskList.jsx | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index c46301c..5cd8e66 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -78,7 +78,6 @@
<TextInput source="expCode" label="table.field.task.expCode" />,
<DateInput source="startTime" label="table.field.task.startTime" />,
<DateInput source="endTime" label="table.field.task.endTime" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -132,8 +131,8 @@
>
<NumberField source="id" />
<TextField source="taskCode" label="table.field.task.taskCode" />
- <NumberField source="taskStatus" label="table.field.task.taskStatus" />
- <NumberField source="taskType" label="table.field.task.taskType" />
+ <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" />
@@ -144,9 +143,6 @@
<TextField source="expDesc" label="table.field.task.expDesc" />
<NumberField source="sort" label="table.field.task.sort" />
<TextField source="expCode" label="table.field.task.expCode" />
- <DateField source="startTime" label="table.field.task.startTime" showTime />
- <DateField source="endTime" label="table.field.task.endTime" showTime />
-
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
--
Gitblit v1.9.1