From 985fb87ddf52860446f58056be4ca49844f57147 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 02 七月 2025 14:26:23 +0800
Subject: [PATCH] 终止下发波次优化
---
rsf-admin/src/page/task/TaskList.jsx | 36 ++++++++++++------------------------
1 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index e630c39..b460c03 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -29,16 +29,12 @@
} from 'react-admin';
import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
import { styled } from '@mui/material/styles';
-import TaskCreate from "./TaskCreate";
-import TaskPanel from "./TaskPanel";
-import EmptyData from "../components/EmptyData";
-import MyCreateButton from "../components/MyCreateButton";
-import MyExportButton from '../components/MyExportButton';
import SwapVertIcon from '@mui/icons-material/SwapVert';
import AlignVerticalTopIcon from '@mui/icons-material/AlignVerticalTop';
import TaskAltIcon from '@mui/icons-material/TaskAlt';
import CancelIcon from '@mui/icons-material/Cancel';
import PageDrawer from "../components/PageDrawer";
+import TaskPanel from "./TaskPanel";
import MyField from "../components/MyField";
import ConfirmButton from "../components/ConfirmButton";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
@@ -135,15 +131,9 @@
>
<StyledDatagrid
preferenceKey='task'
- bulkActionButtons={
- <>
- <BulkResortButton />
- <BulkCancelButton />
- <BulkDeleteButton mutationMode={OPERATE_MODE} />
- </>
- }
+ bulkActionButtons={false}
rowClick={false}
- expand={false}
+ expand={<TaskPanel />}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status']}
>
@@ -259,7 +249,7 @@
}
}
return (
- ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 198)) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
+ ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 198)) || (record?.taskType == 11 && record?.taskStatus == 101) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
)
}
@@ -271,13 +261,11 @@
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
- const clickCancel = (event) => {
- event.stopPropagation();
+ const clickCancel = () => {
cancleTask(record)
};
//鍙栨秷浠诲姟
const cancleTask = async (row) => {
- console.log(row);
const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id);
if (code === 200) {
notify(msg);
@@ -288,11 +276,11 @@
}
return (
(record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11) ?
- <Button
- onClick={clickCancel}
- label="toolbar.cancel">
- <CancelIcon />
- </Button>
+ <ConfirmButton
+ onConfirm={clickCancel}
+ startIcon={<CancelIcon />}
+ label={"toolbar.cancel"}>
+ </ConfirmButton>
:
<></>
)
@@ -326,8 +314,8 @@
label="toolbar.top">
<AlignVerticalTopIcon />
</Button>
- :
- <></>
+ :
+ <></>
)
}
--
Gitblit v1.9.1