From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/task/TaskList.jsx | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 8c5573c..81b19c1 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -25,6 +25,7 @@
SelectInput,
NumberInput,
Button,
+ EditButton,
} from 'react-admin';
import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -42,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': {
@@ -129,7 +131,7 @@
<BulkDeleteButton mutationMode={OPERATE_MODE} />
</>
}
- rowClick={'edit'}
+ rowClick={false}
expand={false}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status', 'sort']}
@@ -138,7 +140,7 @@
<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.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" />
@@ -156,9 +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" />
<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>
@@ -176,6 +179,31 @@
/**
+ * 鎷ｆ枡鍑哄簱
+ * @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 == 198 ? <ConfirmButton label={"toolbar.pick"} startIcon={<ColorizeOutlinedIcon />} onConfirm={pickClick} /> : <></>
+ )
+}
+
+
+/**
* 瀹屾垚鎿嶄綔
* @returns
*/
@@ -183,8 +211,7 @@
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
- const clickComplete = (event) => {
- event.stopPropagation();
+ const clickComplete = () => {
completeTask(record)
};
//瀹屾垚浠诲姟
@@ -198,7 +225,7 @@
}
}
return (
- <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} />) : (<></>)
)
}
--
Gitblit v1.9.1