From d692259553b83ed00ada0ba2792ae91704a4def2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 13:52:22 +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 | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
index eb097b3..11405c2 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
@@ -31,6 +31,8 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ Button,
+ useRefresh
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -43,6 +45,8 @@
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
+import AddIcon from '@mui/icons-material/Add';
+import request from '@/utils/request';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -118,7 +122,7 @@
>
<StyledDatagrid
preferenceKey='waitPakin'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={<> <CreateTaskButton /> <BulkDeleteButton mutationMode={OPERATE_MODE} /></>}
rowClick={(id, resource, record) => false}
expand={() => <WaitPakinPanel />}
expandSingle={true}
@@ -127,7 +131,7 @@
<NumberField source="id" />
<TextField source="code" label="table.field.waitPakin.code" />
{/* <NumberField source="ansId" label="table.field.waitPakin.ansId" /> */}
- <TextField source="asnCode" label="table.field.waitPakin.asnCode" />
+ {/* <TextField source="asnCode" label="table.field.waitPakin.asnCode" /> */}
<TextField source="barcode" label="table.field.waitPakin.barcode" />
<NumberField source="anfme" label="table.field.waitPakin.anfme" />
<TextField source="ioStatus$" label="table.field.waitPakin.ioStatus" sortable={false} />
@@ -163,3 +167,32 @@
}
export default WaitPakinList;
+
+const CreateTaskButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const { selectedIds, onUnselectItems, data } = useListContext();
+ const createTask = async () => {
+ 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);
+ }
+ }
+
+ return (
+ <>
+ <Button onClick={() => createTask()} label={"toolbar.createTask"}>
+ <AddIcon />
+ </Button>
+
+
+ </>
+
+ )
+}
--
Gitblit v1.9.1