Merge remote-tracking branch 'origin/devlop' into devlop

zjj

2025-06-30 eeb96ed3c9830f996dc85cc9d4a8113aba91692b

 rsf-admin/src/page/orders/outStock/OutOrderPreview.jsx

@@ -16,7 +16,7 @@


const OutOrderPreview = (props) => {
    const { open, setOpen, record, selectedIds } = props;
    const { open, setOpen, record, selectedIds, setCloseParent } = props;
    const translate = useTranslate();
    const gridRef = useGridApiRef();
    const [rows, setRows] = useState([]);
@@ -26,6 +26,7 @@
        if (reason !== "backdropClick") {
            // const res = await request.get(`/outStock/items/cancel/` + selectedIds);
            setOpen(false);
            setCloseParent(false)
        }
    };

@@ -66,7 +67,7 @@
                    </Grid>
                </Grid>
                <Toolbar sx={{ justifyContent: 'end' }}>
                    <ConfirmButton label="toolbar.confirm" variant="contained" size="large" gridRef={gridRef} setOpen={setOpen} />
                    <ConfirmButton label="toolbar.confirm" variant="contained" size="large" gridRef={gridRef} setOpen={setOpen} setCloseParent={setCloseParent}/>
                </Toolbar>
            </DialogContent>
        </Dialog>
@@ -75,7 +76,7 @@

export default OutOrderPreview;

const ConfirmButton = ({ gridRef, setOpen }) => {
const ConfirmButton = ({ gridRef, setOpen, setCloseParent }) => {
    const refresh = useRefresh();
    const notify = useNotify();
    const confirm = async () => {
@@ -85,6 +86,7 @@
            notify(msg);
            refresh()
            setOpen(false)
            setCloseParent(false)
        } else {
            notify(msg);
        }