From 05951bf4f4eacc72552eb6763c640aa8b2067105 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 08 四月 2025 17:27:40 +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 | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 64b1462..86afa4c 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -1,5 +1,7 @@
import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
import { useNavigate } from 'react-router-dom';
+import request from '@/utils/request';
+
import {
List,
DatagridConfigurable,
@@ -15,6 +17,7 @@
useRecordContext,
useTranslate,
useNotify,
+ useRefresh,
useListContext,
FunctionField,
TextField,
@@ -111,9 +114,9 @@
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.task"}
- // empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "sort", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
@@ -135,8 +138,8 @@
</>
}
rowClick={(id, resource, record) => false}
- // expand={() => <TaskPanel />}
- // expandSingle={true}
+ expand={() => <TaskPanel />}
+ expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'sort']}
>
<NumberField source="id" />
@@ -171,10 +174,6 @@
</WrapperField>
</StyledDatagrid>
</List>
- {/* <TaskCreate
- open={createDialog}
- setOpen={setCreateDialog}
- /> */}
<PageDrawer
title='Task Detail'
drawerVal={drawerVal}
@@ -212,11 +211,22 @@
*/
const CancelButton = () => {
const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
const clickCancel = () => {
- cancleTask([record])
+ cancleTask(record)
};
//鍙栨秷浠诲姟
- const cancleTask = async (row) => {}
+ const cancleTask = async (row) => {
+ console.log(row);
+ const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id);
+ if (code === 200) {
+ notify(msg);
+ refresh();
+ } else {
+ notify(msg);
+ }
+ }
return (
<Button
onClick={clickCancel}
@@ -231,11 +241,21 @@
*/
const SetTopButton = () => {
const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
const clickTop = () => {
- topTask([record])
+ topTask(record)
};
//缃《浠诲姟
- const topTask = async (row) => { }
+ const topTask = async (row) => {
+ const { data: { code, data, msg } } = await request.post(`/task/top/` + row.id);
+ if (code === 200) {
+ notify(msg);
+ refresh();
+ } else {
+ notify(msg);
+ }
+ }
return (
<Button
onClick={clickTop}
@@ -255,7 +275,7 @@
cancleTask([record])
};
//鍙栨秷浠诲姟
- const cancleTask = async (row) => {}
+ const cancleTask = async (row) => { }
return (
<Button
onClick={clickCancel}
@@ -283,5 +303,4 @@
<SwapVertIcon />
</Button>
)
-
}
\ No newline at end of file
--
Gitblit v1.9.1