From 0f2b6af557eb0ebe12bad8ff706f8e7f06a1c4d4 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 07 二月 2026 16:59:44 +0800
Subject: [PATCH] #任务页面
---
rsf-admin/src/page/task/TaskList.jsx | 355 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 238 insertions(+), 117 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 84fd054..eeed97a 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -7,7 +7,7 @@
DatagridConfigurable,
SearchInput,
TopToolbar,
- SelectColumnsButton,
+ ColumnsButton,
FilterButton,
BulkDeleteButton,
WrapperField,
@@ -18,80 +18,99 @@
TextField,
NumberField,
DateField,
+ AutocompleteInput,
BooleanField,
TextInput,
DateInput,
SelectInput,
NumberInput,
Button,
+ EditButton,
} 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 { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import ConfirmButton from "../components/ConfirmButton";
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, AUTO_RUN_CHECK_ORDERS } from '@/config/setting';
+import PlayArrowOutlinedIcon from '@mui/icons-material/PlayArrowOutlined';
+import PauseIcon from '@mui/icons-material/Pause';
+import PauseCircleOutlineIcon from '@mui/icons-material/PauseCircleOutline';
import * as Common from '@/utils/common';
-
-const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
- '& .css-1vooibu-MuiSvgIcon-root': {
- height: '.9em'
- },
- '& .RaDatagrid-row': {
- cursor: 'auto'
- },
- '& .column-name': {
- },
- '& .opt': {
- width: 248
- },
-}));
-
-const filters = [
- <SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" />,
- <DateInput label='common.time.before' source="timeEnd" />,
- <TextInput source="taskCode" label="table.field.task.taskCode" />,
- <NumberInput source="taskStatus" label="table.field.task.taskStatus" />,
- <NumberInput source="taskType" label="table.field.task.taskType" />,
- <TextInput source="orgLoc" label="table.field.task.orgLoc" />,
- <TextInput source="orgSite" label="table.field.task.orgSite" />,
- <TextInput source="targLoc" label="table.field.task.targLoc" />,
- <TextInput source="targSite" label="table.field.task.targSite" />,
- <TextInput source="barcode" label="table.field.task.barcode" />,
- <TextInput source="robotCode" label="table.field.task.robotCode" />,
- <NumberInput source="exceStatus" label="table.field.task.exceStatus" />,
- <TextInput source="expDesc" label="table.field.task.expDesc" />,
- <NumberInput source="sort" label="table.field.task.sort" />,
- <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"
- source="status"
- choices={[
- { id: '1', name: 'common.enums.statusTrue' },
- { id: '0', name: 'common.enums.statusFalse' },
- ]}
- resettable
- />,
-]
+import ColorizeOutlinedIcon from '@mui/icons-material/ColorizeOutlined';
+import GradingOutlinedIcon from '@mui/icons-material/GradingOutlined';
+import StickyDataTable from "@/page/components/StickyDataTable";
+import useTableLayout from '@/utils/useTableLayout';
const TaskList = (props) => {
const translate = useTranslate();
+ const refresh = useRefresh();
const [drawerVal, setDrawerVal] = useState(false);
+ const [autoExce, setAutoExce] = useState(false);
+ const dict = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_warehouse_type')) || [];
+
+ useEffect(() => {
+ getConfig()
+ }, [])
+
+ const getConfig = async () => {
+ const { data: { code, data, msg } } = await request.get('/config/flag/' + AUTO_RUN_CHECK_ORDERS);
+ if (code === 200) {
+ setAutoExce(JSON.parse(data?.val))
+ }
+ }
+
+ // useEffect(() => {
+ // const interval = setInterval(() => {
+ // refresh();
+ // }, 5000); // 姣�5绉掑埛鏂颁竴娆�
+
+ // return () => clearInterval(interval); // 娓呴櫎瀹氭椂鍣�
+ // }, [refresh])
+
+ const filters = [
+ <SearchInput source="condition" alwaysOn />,
+ <DateInput label='common.time.after' source="timeStart" />,
+ <DateInput label='common.time.before' source="timeEnd" />,
+ <TextInput source="taskCode" label="table.field.task.taskCode" />,
+ <NumberInput source="taskStatus" label="table.field.task.taskStatus" />,
+ <NumberInput source="taskType" label="table.field.task.taskType" />,
+ <AutocompleteInput choices={dict} optionText='label' optionValue="value" source="warehType" label="table.field.task.warehType" />,
+ <TextInput source="orgLoc" label="table.field.task.orgLoc" />,
+ <TextInput source="orgSite" label="table.field.task.orgSite" />,
+ <TextInput source="targLoc" label="table.field.task.targLoc" />,
+ <TextInput source="targSite" label="table.field.task.targSite" />,
+ <TextInput source="barcode" label="table.field.task.barcode" />,
+ <TextInput source="robotCode" label="table.field.task.robotCode" />,
+ <NumberInput source="exceStatus" label="table.field.task.exceStatus" />,
+ <TextInput source="expDesc" label="table.field.task.expDesc" />,
+ <NumberInput source="sort" label="table.field.task.sort" />,
+ <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"
+ source="status"
+ choices={[
+ { id: '1', name: 'common.enums.statusTrue' },
+ { id: '0', name: 'common.enums.statusFalse' },
+ ]}
+ resettable
+ />,
+ ]
+
return (
- <Box display="flex">
+ <Box display="flex" sx={{
+
+ }}>
<List
+ queryOptions={{ refetchInterval: 5000 }}
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -99,6 +118,9 @@
duration: theme.transitions.duration.enteringScreen,
}),
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ },
}}
title={"menu.task"}
empty={false}
@@ -106,52 +128,15 @@
sort={{ field: "sort", order: "desc" }}
actions={(
<TopToolbar>
+ <BulkAutoStartButton autoExce={autoExce} setAutoExce={setAutoExce} />
+ <BulkAutoPauseButton autoExce={autoExce} setAutoExce={setAutoExce} />
<FilterButton />
- <SelectColumnsButton preferenceKey='task' />
+ <ColumnsButton storeKey='task' />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
>
- <StyledDatagrid
- preferenceKey='task'
- bulkActionButtons={
- <>
- <BulkResortButton />
- <BulkCancelButton />
- <BulkDeleteButton mutationMode={OPERATE_MODE} />
- </>
- }
- rowClick={'edit'}
- expand={false}
- expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status', 'sort']}
- >
- <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" />
- <TextField source="orgLoc" label="table.field.task.orgLoc" />
- <TextField source="orgSite" label="table.field.task.orgSite" />
- <TextField source="targLoc" label="table.field.task.targLoc" />
- <TextField source="targSite" label="table.field.task.targSite" />
- <TextField source="barcode" label="table.field.task.barcode" />
- <TextField source="robotCode" label="table.field.task.robotCode" />
- <NumberField source="exceStatus" label="table.field.task.exceStatus" />
- <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" />
- <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} /> */}
- <TextField source="memo" label="common.field.memo" sortable={false} />
- <WrapperField cellClassName="opt" label="common.field.opt" onClick={(e) => e.stopPropagation()} >
- <DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
- <CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- <SetTopButton sx={{ padding: '1px', fontSize: '.75rem' }} ></SetTopButton>
- </WrapperField>
- </StyledDatagrid>
+ <TableItems drawerVal={drawerVal} />
</List>
<PageDrawer
title='Task Detail'
@@ -166,21 +151,157 @@
export default TaskList;
+const TableItems = ({ drawerVal }) => {
+ const omittedFields = ['id', 'createTime', 'createBy$', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status', 'warehType$', 'orderType', 'order_type', 'orderType$'];
+ const { boxMaxWidth, boxMaxHeight } = useTableLayout(drawerVal);
+ return (
+ <Box sx={{
+ position: 'relative',
+ maxHeight: boxMaxHeight,
+ maxWidth: boxMaxWidth,
+ overflowX: 'auto',
+ overflowY: 'auto',
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ }
+ }}>
+ <StickyDataTable
+ stickyRight={['opt']}
+ storeKey='task'
+ bulkActionButtons={false}
+ rowClick={false}
+ hiddenColumns={omittedFields}
+ expand={<TaskPanel />}
+ expandSingle={true}
+ >
+ <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="warehType$" label="table.field.task.warehType" />
+ <TextField source="orgLoc" label="table.field.task.orgLoc" />
+ <TextField source="orgSite$" label="table.field.task.orgSite" />
+ <TextField source="targLoc" label="table.field.task.targLoc" />
+ <TextField source="targSite$" label="table.field.task.targSite" />
+ <TextField source="barcode" label="table.field.task.barcode" />
+ <TextField source="robotCode" label="table.field.task.robotCode" />
+ <NumberField source="exceStatus" label="table.field.task.exceStatus" />
+ <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" />
+ <DateField source="updateTime" label="common.field.updateTime" showTime />
+ <DateField source="createTime" label="common.field.createTime" showTime />
+ <TextField source="memo" label="common.field.memo" sortable={false} />
+ <WrapperField source="opt" cellClassName="opt" label="common.field.opt" onClick={(e) => e.stopPropagation()} >
+ <EditButton label="toolbar.detail" />
+ <DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
+ <CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ <CheckButton />
+ <PickButton />
+ <SetTopButton />
+ </WrapperField>
+ </StickyDataTable>
+ </Box>
+ )
+}
+
+
+/**
+ * 鐩樼偣
+ * @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} /> : <></>)
+}
+
+/**鑷姩涓嬪彂浠诲姟**/
+const BulkAutoStartButton = ({ autoExce, setAutoExce }) => {
+ const notify = useNotify();
+ const startClick = async () => {
+ setAutoExce(true)
+ const { data: { code, data, msg } } = await request.post('/config/byFlag', { val: true, flag: 'AUTO_RUN_CHECK_ORDERS' });
+ if (code === 200) {
+ notify(msg);
+ } else {
+ notify(msg);
+ }
+ }
+ return (
+ !autoExce ? <Button label="toolbar.autoStartLocs" onClick={startClick} startIcon={<PlayArrowOutlinedIcon />} /> : <></>
+ )
+}
+
+const BulkAutoPauseButton = ({ autoExce, setAutoExce }) => {
+ const notify = useNotify();
+ const pauseClick = async () => {
+ const { data: { code, data, msg } } = await request.post('/config/byFlag', { val: false, flag: 'AUTO_RUN_CHECK_ORDERS' });
+ if (code === 200) {
+ notify(msg);
+ setAutoExce(false)
+ } else {
+ notify(msg);
+ }
+ }
+ return (
+ autoExce ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<PauseIcon />} /> : <></>
+ )
+}
+
+
+/**
+ * 鎷ｆ枡鍑哄簱
+ * @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 == 199 && record?.taskType == 103 ? <ConfirmButton label={"toolbar.pick"} startIcon={<ColorizeOutlinedIcon />} onConfirm={pickClick} /> : <></>
+ )
+}
+
+
/**
* 瀹屾垚鎿嶄綔
* @returns
*/
const DoneButton = (props) => {
const record = useRecordContext();
- const notify = useNotify();
+ const notify = useNotify();
const refresh = useRefresh();
- const clickComplete = (event) => {
- event.stopPropagation();
+ const clickComplete = () => {
completeTask(record)
};
//瀹屾垚浠诲姟
const completeTask = async (row) => {
- console.log(row.id);
const { data: { code, data, msg } } = await request.post(`task/complete/` + row.id);
if (code === 200) {
notify(msg);
@@ -190,11 +311,7 @@
}
}
return (
- <Button
- onClick={clickComplete}
- label="toolbar.complete">
- <TaskAltIcon />
- </Button>
+ ((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} />) : (<></>)
)
}
@@ -206,13 +323,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 cancleTask = async (row) => {
const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id);
if (code === 200) {
notify(msg);
@@ -222,11 +337,14 @@
}
}
return (
- <Button
- onClick={clickCancel}
- label="toolbar.cancel">
- <CancelIcon />
- </Button>
+ (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 107 || record.taskType == 103 || record.taskType == 11) ?
+ <ConfirmButton
+ onConfirm={clickCancel}
+ startIcon={<CancelIcon />}
+ label={"toolbar.cancel"}>
+ </ConfirmButton>
+ :
+ <></>
)
}
/**
@@ -252,11 +370,14 @@
}
}
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