From fcf0c2bbfae0a82d516dfa8b71f97e6ea817e0b4 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 03 二月 2026 09:16:29 +0800
Subject: [PATCH] 任务管理查询明细修正
---
rsf-admin/src/page/task/TaskList.jsx | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 4fa167a..5fdfbb1 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -37,7 +37,10 @@
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 { 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';
import ColorizeOutlinedIcon from '@mui/icons-material/ColorizeOutlined';
import GradingOutlinedIcon from '@mui/icons-material/GradingOutlined';
@@ -67,7 +70,19 @@
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(() => {
@@ -127,6 +142,8 @@
sort={{ field: "sort", order: "desc" }}
actions={(
<TopToolbar>
+ <BulkAutoStartButton autoExce={autoExce} setAutoExce={setAutoExce}/>
+ <BulkAutoPauseButton autoExce={autoExce} setAutoExce={setAutoExce} />
<FilterButton />
<SelectColumnsButton preferenceKey='task' />
</TopToolbar>
@@ -139,7 +156,7 @@
rowClick={false}
expand={<TaskPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy$', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status','warehType$']}
+ omit={['id', 'createTime', 'createBy$', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status','warehType$', 'orderType', 'order_type', 'orderType$']}
>
<NumberField source="id" />
<TextField source="taskCode" label="table.field.task.taskCode" />
@@ -147,9 +164,9 @@
<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="orgSite$" label="table.field.task.orgSite" />
<TextField source="targLoc" label="table.field.task.targLoc" />
- <TextField source="targSite" label="table.field.task.targSite" />
+ <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" />
@@ -205,6 +222,40 @@
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
--
Gitblit v1.9.1