#

luxiaotao1123

2024-10-18 a5ebda3b139fc7348335f918e9f6984b25c80965

#

 zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx

@@ -1,5 +1,5 @@
import React, { useRef, useEffect, useState } from 'react';
import { useTranslate, useDataProvider } from 'react-admin';
import { useTranslate, useDataProvider, useRedirect } from 'react-admin';
import {
    Box,
    CircularProgress,
@@ -13,6 +13,7 @@
import ShelfThree from './ShelfThree';
import { getLocGroup } from '../../http';
import { grey } from '@mui/material/colors';
import ConfirmButton from '../../../page/components/ConfirmButton';

let shelfThree;

@@ -80,9 +81,10 @@
}

const ShelfMain = (props) => {
    const { curLocNo, curShelfInfo: info, setCurLocNo } = props;
    const { row, bay, curLocNo, curShelfInfo: info, setCurLocNo } = props;
    const translate = useTranslate();
    const dataProvider = useDataProvider();
    const redirect = useRedirect();
    const containerRef = useRef();

    const [selectedLoc, setSelectedLoc] = useState(null);   // loc obj
@@ -149,8 +151,11 @@
                    flexDirection: 'column',
                    justifyContent: 'space-between',
                }}>
                    <Box>
                        <Grid container spacing={2} style={{ marginTop: '0px' }}>
                    <Box sx={{
                        height: "70%",
                        overflowY: 'auto'
                    }}>
                        <Grid container spacing={1.5} style={{ marginTop: '0px' }}>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.loc.locNo')} value={selectedLoc?.locNo || 'N/A'} />
                            </Grid>
@@ -178,21 +183,39 @@
                        </Grid>
                    </Box>

                    <Box sx={{
                        height: "30%",
                        display: 'flex',
                        flexDirection: 'column',
                        justifyContent: 'flex-end'
                    }}>
                    <Grid container spacing={2} style={{ marginTop: '0px' }}>
                        <Grid item xs={12}>
                            <Typography variant="subtitle1">
                                {translate('common.field.opt')}
                            </Typography>
                            <Stack spacing={2} mt={2}>
                                <Button variant="contained" fullWidth>
                                    {translate('page.map.insight.shelf.updateStatus')}
                                    <Button
                                        color="primary"
                                        variant="contained"
                                        onClick={() => {
                                            const searchQuery = encodeURIComponent(JSON.stringify({ row, bay }));
                                            redirect(`/loc?filter=${searchQuery}`);
                                        }}
                                    >
                                        {translate('page.map.settings.map.more.title')}
                                </Button>
                                    <ConfirmButton
                                        label="page.map.insight.shelf.updateStatus"
                                        color="primary" // inherit
                                        variant="contained"
                                        onConfirm={() => {
                                        }}
                                    />
                                <Button variant="contained" color="error" disabled={selectedLoc?.locStsEl !== 'STOCK'} fullWidth>
                                    {translate('page.map.insight.shelf.outbound')}
                                </Button>
                            </Stack>
                        </Grid>
                    </Grid>
                    </Box>
                </Paper>
            </Box>
        </Box>

 zy-acs-flow/src/map/insight/shelf/index.jsx

@@ -67,6 +67,8 @@
            <Box flex={1} pt={2}>
                {activeTab === 0 && (
                    <ShelfMain
                        row={sprite?.data?.row}
                        bay={sprite?.data?.bay}
                        curLocNo={curLocNo}
                        curShelfInfo={curShelfInfo}
                        setCurLocNo={setCurLocNo}