From 8233002dffa7ae961c6115ba8e47138d3ddefb3e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 30 五月 2025 15:24:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/task/TaskList.jsx | 96 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 72 insertions(+), 24 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 05d5d2a..5d40fac 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -29,20 +29,18 @@
} 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';
import * as Common from '@/utils/common';
+import ColorizeOutlinedIcon from '@mui/icons-material/ColorizeOutlined';
+import GradingOutlinedIcon from '@mui/icons-material/GradingOutlined';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -61,8 +59,17 @@
const TaskList = (props) => {
const translate = useTranslate();
+ const refresh = useRefresh();
const [drawerVal, setDrawerVal] = useState(false);
const dict = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_warehouse_type')) || [];
+
+ // useEffect(() => {
+ // const interval = setInterval(() => {
+ // refresh();
+ // }, 5000); // 姣�5绉掑埛鏂颁竴娆�
+
+ // return () => clearInterval(interval); // 娓呴櫎瀹氭椂鍣�
+ // }, [refresh])
const filters = [
<SearchInput source="condition" alwaysOn />,
@@ -101,6 +108,7 @@
return (
<Box display="flex">
<List
+ queryOptions={{ refetchInterval: 5000 }}
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -112,7 +120,7 @@
title={"menu.task"}
empty={false}
filters={filters}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "sort", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
@@ -123,17 +131,17 @@
>
<StyledDatagrid
preferenceKey='task'
- bulkActionButtons={
- <>
- <BulkResortButton />
- <BulkCancelButton />
- <BulkDeleteButton mutationMode={OPERATE_MODE} />
- </>
+ bulkActionButtons={false
+ // <>
+ // <BulkResortButton />
+ // <BulkCancelButton />
+ // <BulkDeleteButton mutationMode={OPERATE_MODE} />
+ // </>
}
rowClick={false}
- expand={false}
+ expand={<TaskPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status', 'sort']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status']}
>
<NumberField source="id" />
<TextField source="taskCode" label="table.field.task.taskCode" />
@@ -160,7 +168,9 @@
<EditButton label="toolbar.detail" />
<DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
<CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- {/* <SetTopButton sx={{ padding: '1px', fontSize: '.75rem' }} ></SetTopButton> */}
+ <CheckButton />
+ <PickButton />
+ <SetTopButton />
</WrapperField>
</StyledDatagrid>
</List>
@@ -176,14 +186,49 @@
export default TaskList;
+/**
+ * 鐩樼偣
+ * @returns te
+ */
+const CheckButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const checkClick = async () => {
+ const { data: { code, data, msg } } = await request.post(`/task/check/` + record.id);
+ if (code === 200) {
+ notify(msg);
+ refresh();
+ } else {
+ notify(msg);
+ }
+ }
+
+ return (record?.taskStatus == 199 && record?.taskType == 107 ? <ConfirmButton label={"toolbar.check"} startIcon={<GradingOutlinedIcon />} onConfirm={checkClick} /> : <></>)
+}
+
+/**
+ * 鎷ｆ枡鍑哄簱
+ * @returns
+ */
const PickButton = () => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
+ const pickClick = async () => {
+ const { data: { code, data, msg } } = await request.post(`/task/pick/` + record.id);
+ if (code === 200) {
+ notify(msg);
+ refresh();
+ } else {
+ notify(msg);
+ }
+ }
+
return (
- record?.taskStatus == 103 ? <ConfirmButton label={""} />
+ record?.taskStatus == 199 && record?.taskType == 103 ? <ConfirmButton label={"toolbar.pick"} startIcon={<ColorizeOutlinedIcon />} onConfirm={pickClick} /> : <></>
)
}
@@ -210,7 +255,7 @@
}
}
return (
- record?.taskStatus < 98 ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
+ ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 198)) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
)
}
@@ -238,7 +283,7 @@
}
}
return (
- record.taskStatus === 1 ?
+ (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">
@@ -268,14 +313,17 @@
refresh();
} else {
notify(msg);
- }
+ }
}
return (
- <Button
- onClick={clickTop}
- label="toolbar.top">
- <AlignVerticalTopIcon />
- </Button>
+ (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11) ?
+ <Button
+ onClick={clickTop}
+ label="toolbar.top">
+ <AlignVerticalTopIcon />
+ </Button>
+ :
+ <></>
)
}
--
Gitblit v1.9.1