From bed735aae42b6e0c75bf3fd63d9cd0996fba9355 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 五月 2025 14:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/task/TaskList.jsx | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 068a809..f4fd8d1 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -43,6 +43,7 @@
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';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -157,10 +158,10 @@
{/* <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()} >
- <EditButton label="toolbar.detail"/>
+ <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>
+ <PickButton />
</WrapperField>
</StyledDatagrid>
</List>
@@ -178,6 +179,25 @@
/**
+ * 鎷ｆ枡鍑哄簱
+ * @returns
+ */
+const PickButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+ const pickClick = () => {
+
+ }
+
+ return (
+ record?.taskStatus == 103 ? <ConfirmButton label={"toolbar.pick"} startIcon={<ColorizeOutlinedIcon />} onConfirm={pickClick}/> : <></>
+ )
+}
+
+
+/**
* 瀹屾垚鎿嶄綔
* @returns
*/
--
Gitblit v1.9.1