From a6991a33e18f69264f93a63459a4b64ea799295a Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 05 八月 2025 13:02:24 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/orders/transfer/ManualCreate.jsx | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rsf-admin/src/page/orders/transfer/ManualCreate.jsx b/rsf-admin/src/page/orders/transfer/ManualCreate.jsx index 3704528..2990e16 100644 --- a/rsf-admin/src/page/orders/transfer/ManualCreate.jsx +++ b/rsf-admin/src/page/orders/transfer/ManualCreate.jsx @@ -38,9 +38,9 @@ import ConfirmationNumberIcon from '@mui/icons-material/ConfirmationNumber'; import DialogCloseButton from "../../components/DialogCloseButton.jsx"; import WarehouseSelect from "../../components/WarehouseSelect.jsx"; -import { useFormContext, useWatch } from "react-hook-form"; import { DataGrid, useGridApiRef } from '@mui/x-data-grid'; import ConfirmButton from "../../components/ConfirmButton"; +import { useFormContext, useWatch } from "react-hook-form"; import CreateBySelectMats from "./CreateBySelectMats.jsx"; import { Add, Edit, Delete } from '@mui/icons-material'; import DictSelect from "../../components/DictSelect"; @@ -148,6 +148,8 @@ notify("鐩爣搴撳尯涓嶈兘涓虹┖锛侊紒", { type: 'error' }) return } + console.log(formData); + setCreateDialog(true) } @@ -216,11 +218,12 @@ </Button> </Toolbar> <CreateBySelectMats + data={tabelData} + queryForm={formData} open={createDialog} setOpen={setCreateDialog} selectedRows={selectedRows} setSelectedRows={setSelectedRows} - data={tabelData} setData={setTableData} /> </Box> @@ -468,7 +471,7 @@ const tableIds = tabelData.map(map => map.id); // setSelectedRows(tableIds); // // console.log(selectedRows); - + return ( <Box> -- Gitblit v1.9.1