From 0fe2b0811ac79cf4f42b22e3eb91bac2aef02ced Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 三月 2026 15:23:47 +0800
Subject: [PATCH] 数字显示改为字符
---
rsf-admin/src/page/task/TaskList.jsx | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index eeed97a..51a6b7a 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -46,6 +46,8 @@
import GradingOutlinedIcon from '@mui/icons-material/GradingOutlined';
import StickyDataTable from "@/page/components/StickyDataTable";
import useTableLayout from '@/utils/useTableLayout';
+import AccountTreeOutlinedIcon from '@mui/icons-material/AccountTreeOutlined';
+import FlowStepInstanceModal from './FlowStepInstanceModal';
const TaskList = (props) => {
const translate = useTranslate();
@@ -53,6 +55,10 @@
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')) || [];
+
+ // state for FlowStepInstanceModal
+ const [flowStepModalOpen, setFlowStepModalOpen] = useState(false);
+ const [currentTaskRecord, setCurrentTaskRecord] = useState(null);
useEffect(() => {
getConfig()
@@ -136,7 +142,13 @@
)}
perPage={DEFAULT_PAGE_SIZE}
>
- <TableItems drawerVal={drawerVal} />
+ <TableItems
+ drawerVal={drawerVal}
+ onOpenFlowStep={(record) => {
+ setCurrentTaskRecord(record);
+ setFlowStepModalOpen(true);
+ }}
+ />
</List>
<PageDrawer
title='Task Detail'
@@ -144,6 +156,11 @@
setDrawerVal={setDrawerVal}
>
</PageDrawer>
+ <FlowStepInstanceModal
+ open={flowStepModalOpen}
+ setOpen={setFlowStepModalOpen}
+ record={currentTaskRecord}
+ />
</Box>
)
}
@@ -151,7 +168,7 @@
export default TaskList;
-const TableItems = ({ drawerVal }) => {
+const TableItems = ({ drawerVal, onOpenFlowStep }) => {
const omittedFields = ['id', 'createTime', 'createBy$', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status', 'warehType$', 'orderType', 'order_type', 'orderType$'];
const { boxMaxWidth, boxMaxHeight } = useTableLayout(drawerVal);
return (
@@ -201,12 +218,28 @@
<CheckButton />
<PickButton />
<SetTopButton />
+ <FlowStepButton onClick={onOpenFlowStep} />
</WrapperField>
</StickyDataTable>
</Box>
)
}
+
+const FlowStepButton = ({ onClick }) => {
+ const record = useRecordContext();
+ return (
+ <Button
+ label="toolbar.flowStep"
+ onClick={(e) => {
+ e.stopPropagation();
+ onClick(record);
+ }}
+ >
+ <AccountTreeOutlinedIcon />
+ </Button>
+ )
+}
/**
* 鐩樼偣
@@ -310,8 +343,9 @@
notify(msg);
}
}
+ // 浠呭綋鎺ュ彛杩斿洖 canComplete 涓� true 鏃跺睍绀猴紙瀛樺湪姝ラ婊¤冻 taskStatus=wmsNowTaskStatus 涓� wmsNextTaskStatus!=null锛�
return (
- ((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} />) : (<></>)
+ record?.canComplete === true ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
)
}
--
Gitblit v1.9.1