From ebd4f8785d327fef77bf6be6af75086b1c30b645 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 14 四月 2025 13:03:27 +0800
Subject: [PATCH] 任务优化
---
rsf-admin/src/page/task/TaskItemList.jsx | 2 +-
rsf-admin/src/page/task/TaskList.jsx | 21 ++++++++++++++++-----
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 11 +++++++++++
3 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskItemList.jsx b/rsf-admin/src/page/task/TaskItemList.jsx
index 67ae0ab..8013991 100644
--- a/rsf-admin/src/page/task/TaskItemList.jsx
+++ b/rsf-admin/src/page/task/TaskItemList.jsx
@@ -106,7 +106,7 @@
<StyledDatagrid
preferenceKey='taskItem'
bulkActionButtons={false}
- rowClick={(id, resource, record) => false}
+ rowClick={false}
// expand={() => <TaskItemPanel />}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 7f6cce0..ecaad61 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -122,7 +122,7 @@
<BulkDeleteButton mutationMode={OPERATE_MODE} />
</>
}
- rowClick={'edit'}
+ rowClick={false}
expand={false}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status', 'sort']}
@@ -141,8 +141,8 @@
<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"/>
+ <TextField source="updateBy$" label="common.field.updateBy" />
+ <TextField source="createBy$" label="common.field.createBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<DateField source="createTime" label="common.field.createTime" showTime />
{/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
@@ -173,11 +173,22 @@
*/
const DoneButton = () => {
const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
const clickComplete = () => {
+ console.log('------->');
completeTask([record])
};
//瀹屾垚浠诲姟
- const completeTask = async (row) => { }
+ const completeTask = async (row) => {
+ const { data: { code, data, msg } } = await request.post(`task/complete/` + row.id);
+ if (code === 200) {
+ notify(msg);
+ refresh();
+ } else {
+ notify(msg);
+ }
+ }
return (
<Button
onClick={clickComplete}
@@ -237,7 +248,7 @@
} else {
notify(msg);
}
- }
+ }
return (
<Button
onClick={clickTop}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index 11a8dc0..db1768b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -150,6 +150,17 @@
}
@PreAuthorize("hasAuthority('manager:task:update')")
+ @ApiOperation("鍙栨秷浠诲姟")
+ @PostMapping("/task/cancel/{id}")
+ public R cancelTask(@PathVariable String id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok();
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:task:update')")
@ApiOperation("浠诲姟鍑哄簱缃《")
@PostMapping("/task/top/{id}")
public R setTop(@PathVariable String id) {
--
Gitblit v1.9.1