From c6230b5765eb0b8ac69f8a17c191cc5757d42b18 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 十月 2024 12:56:49 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx | 113 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 61 insertions(+), 52 deletions(-)
diff --git a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
index 6a596e4..275fbac 100644
--- a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
+++ b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
@@ -1,5 +1,4 @@
import React, { useRef, useEffect, useState } from 'react';
-import * as THREE from 'three';
import { useTranslate } from 'react-admin';
import {
Box,
@@ -10,13 +9,10 @@
Button,
Divider,
Stack,
- Card,
- CardContent,
} from '@mui/material';
import ShelfThree from './ShelfThree';
import { getLocGroup } from '../../http';
import { grey } from '@mui/material/colors';
-import { styled } from '@mui/system';
let shelfThree;
@@ -96,6 +92,7 @@
getLocGroup(data.row, data.bay, (response) => {
setInfo(response);
setCurLocNo(response[0]?.locNo);
+ setSelectedLoc(response[0]);
});
}
}, [data]);
@@ -116,10 +113,6 @@
}
return endThree;
}, [info]);
-
- useEffect(() => {
- console.log(selectedLoc);
- }, [selectedLoc])
return (
<Box display="flex" height="100%">
@@ -142,57 +135,53 @@
)}
</Box>
<Box width="50%" height="100%" overflow="auto" pl={1}>
- <Paper elevation={3} style={{ padding: '16px' }}>
- <Typography
- variant="subtitle1"
- flexWrap="nowrap"
- gutterBottom
- >
- {translate('table.field.loc.locNo')}: {curLocNo}
- </Typography>
- <Divider />
+ <Paper elevation={1} style={{
+ height: "100%",
+ padding: '16px',
+ display: 'flex',
+ flexDirection: 'column',
+ justifyContent: 'space-between',
+ }}>
+ <Box>
+ <Grid container spacing={2} style={{ marginTop: '0px' }}>
+ <Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.loc.locNo')} value={selectedLoc?.locNo || 'N/A'} />
+ </Grid>
+ <Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.loc.row')} value={selectedLoc?.row || 'N/A'} />
+ </Grid>
+ <Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.loc.bay')} value={selectedLoc?.bay || 'N/A'} />
+ </Grid>
+ <Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.loc.lev')} value={selectedLoc?.lev || 'N/A'} />
+ </Grid>
+ <Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.loc.offset')} value={selectedLoc?.offset || 'N/A'} />
+ </Grid>
+ <Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.loc.locSts')} value={selectedLoc?.locSts$ || 'N/A'} />
+ </Grid>
+ <Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.loc.zoneId')} value={selectedLoc?.zoneId$ || 'N/A'} />
+ </Grid>
+ <Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.loc.code')} value={selectedLoc?.code$ || 'N/A'} />
+ </Grid>
+ </Grid>
+ </Box>
+
<Grid container spacing={2} style={{ marginTop: '0px' }}>
- <Grid item xs={12}>
- <Stack direction='row'>
- <Typography
- variant="body2"
- flexWrap="nowrap"
- >
- {translate('table.field.loc.locSts')}
- </Typography>
- <Typography
- variant="body2"
- flexWrap="nowrap"
- >
- {selectedLoc?.locSts$}
- </Typography>
- </Stack>
- </Grid>
- <Grid item xs={12}>
- <Typography variant="subtitle1">
- {translate('table.field.loc.zoneId')}
- </Typography>
- <Typography variant="body1">{info?.zoneId$}</Typography>
- </Grid>
- <Grid item xs={12}>
- <Typography variant="subtitle1">
- {translate('table.field.loc.code')}
- </Typography>
- <Typography variant="body1">{info?.code$}</Typography>
- </Grid>
<Grid item xs={12}>
<Typography variant="subtitle1">
{translate('common.field.opt')}
</Typography>
<Stack spacing={2} mt={2}>
- <Button variant="contained" color="error" fullWidth>
- {translate('map.loc.lock')}
- </Button>
- <Button variant="contained" disabled fullWidth>
- {translate('map.loc.unlock')}
- </Button>
<Button variant="contained" fullWidth>
- {translate('map.loc.reset')}
+ {translate('page.map.insight.shelf.updateStatus')}
+ </Button>
+ <Button variant="contained" color="error" disabled={selectedLoc?.locStsEl !== 'STOCK'} fullWidth>
+ {translate('page.map.insight.shelf.outbound')}
</Button>
</Stack>
</Grid>
@@ -203,4 +192,24 @@
);
};
+const KeyValuePair = ({ label, value }) => (
+ <>
+ <Stack direction="row" alignItems="center" spacing={1} sx={{ mb: 1 }}>
+ <Typography
+ variant="body2"
+ sx={{ width: '80px', fontWeight: 'bold', color: 'text.secondary', textAlign: 'left' }}
+ >
+ {label}:
+ </Typography>
+ <Typography
+ variant="body2"
+ sx={{ flexGrow: 1, color: 'text.primary', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}
+ >
+ {value}
+ </Typography>
+ </Stack>
+ <Divider />
+ </>
+);
+
export default ShelfMain;
--
Gitblit v1.9.1