From a1f5c7974cb66943c2d0edd285902bc34c4294c8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 四月 2025 17:29:06 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/waitPakin/WaitPakinList.jsx | 73 +++++++++++++++++-------------------
1 files changed, 34 insertions(+), 39 deletions(-)
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
index bb39a6f..c306d20 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
@@ -43,9 +43,6 @@
import PageDrawer from "../components/PageDrawer";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import AddIcon from '@mui/icons-material/Add';
-import request from '@/utils/request';
-import TaskIcon from '@mui/icons-material/Task';
-import { width } from "@mui/system";
import SelectSiteModel from "./SelectSiteModel";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -94,11 +91,39 @@
const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
const [siteDialog, setSiteDialog] = useState(false);
+ const [source, setSource] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+
+ const CreateTaskButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const { selectedIds, onUnselectItems, data } = useListContext();
+ const rows = data.filter(map => selectedIds.includes(map.id));
+ const createTask = () => {
+ setSiteDialog(true)
+ setSource(rows)
+ refresh()
+ }
+
+ return (
+ <>
+ <Button onClick={() => createTask()} label={"toolbar.createTask"}>
+ <AddIcon />
+ </Button>
+ </>
+ )
+ }
+
+ const BulkActionButtons = () => {
+
+ }
+
return (
<Box display="flex">
<List
+ resource="waitPakin"
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -122,12 +147,12 @@
>
<StyledDatagrid
preferenceKey='waitPakin'
- bulkActionButtons={<Box> <Button label="ra.action.edit" onClick={()=>{
- setSiteDialog(true)
- }} /> <BulkDeleteButton mutationMode={OPERATE_MODE} /></Box>}
+ bulkActionButtons={
+ <>
+ <CreateTaskButton />
+ <BulkDeleteButton mutationMode={OPERATE_MODE} />
+ </>}
rowClick='edit'
- expand={false}
- expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
@@ -148,7 +173,7 @@
</WrapperField>
</StyledDatagrid>
</List>
- <SelectSiteModel open={siteDialog} setOpen={setSiteDialog}/>
+ <SelectSiteModel open={siteDialog} setOpen={setSiteDialog} source={source} />
<WaitPakinCreate
open={createDialog}
setOpen={setCreateDialog}
@@ -165,34 +190,4 @@
export default WaitPakinList;
-const CreateTaskButton = () => {
- const record = useRecordContext();
- const [siteDialog, setSiteDialog] = useState(false);
- const notify = useNotify();
- const refresh = useRefresh();
- const { selectedIds, onUnselectItems, data } = useListContext();
- const createTask = () => {
- // const rows = data.filter((item) => selectedIds.includes(item.id)) || [];
- // const res = await request.post(`/waitPakin/merge`, rows);
- // if (res?.data?.code === 200) {
- // refresh();
- // notify(res.data.msg);
- // } else {
- // notify(res.data.msg);
- // }
- console.log('-------->');
- setSiteDialog(true)
-
- }
- // return (
- // <ConfirmButton label={"toolbar.createTask"} startIcon={<TaskIcon />} onConfirm={createTask} />
- // )
- return (
- <>
- <Button onClick={() => createTask()} label={"toolbar.createTask"}>
- <AddIcon />
- </Button>
- </>
- )
-}
--
Gitblit v1.9.1