From 028ef9e952135505871d7a05d9c3af3a8fbcce79 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 11 五月 2025 15:18:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/orders/qlyInspect/InspectModal.jsx | 34 ++++++----------------------------
1 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/rsf-admin/src/page/orders/qlyInspect/InspectModal.jsx b/rsf-admin/src/page/orders/qlyInspect/InspectModal.jsx
index 2faa6ce..627a035 100644
--- a/rsf-admin/src/page/orders/qlyInspect/InspectModal.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/InspectModal.jsx
@@ -149,33 +149,15 @@
backgroundColor: 'background.paper',
zIndex: 1000
}}>
- 鎵ц璐ㄦ
<Box sx={{ position: 'absolute', top: 8, right: 8, zIndex: 1001 }}>
<DialogCloseButton onClose={handleClose} />
</Box>
</DialogTitle>
<DialogContent sx={{ mt: 2 }}>
- {/* <Box component="form" onSubmit={handleSubmit} sx={{ display: 'flex', flexDirection: 'column', gap: 3 }}>
- <Grid container spacing={2}>
- <Grid item md={4}>
- <TextField
- label={translate('table.field.asnOrder.code')}
- name="code"
- value={formData.code}
- onChange={handleChange}
- size="small"
- />
- </Grid>
- </Grid>
- </Box> */}
<Box sx={{ mt: 2 }}>
- {/* <Stack direction="row" spacing={2}>
- <Button variant="contained" onClick={handleSearch}>鎼滅储</Button>
- </Stack> */}
-
<Stack direction="row" spacing={2}>
- <Button variant="contained" onClick={batchQualified}>鎵归噺鍚堟牸</Button>
- <Button variant="contained" color="error" onClick={batchUnQualified}>鎵归噺涓嶅悎鏍�</Button>
+ <Button variant="contained" onClick={batchQualified}>{translate('common.action.batchSafe')} </Button>
+ <Button variant="contained" color="error" onClick={batchUnQualified}>{translate('common.action.batchDef')} </Button>
</Stack>
</Box>
<Box sx={{ mt: 2, height: 400, width: '100%' }}>
@@ -188,7 +170,7 @@
</Box>
</DialogContent>
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
- <Box sx={{ width: '100%', display: 'flex', justifyContent: 'space-between' }}>
+ <Box sx={{ width: '100%', display: 'flex', justifyContent: 'end' }}>
<Button onClick={handleSubmit} variant="contained" startIcon={<SaveIcon />}>
{translate('toolbar.confirm')}
</Button>
@@ -210,16 +192,14 @@
};
-
-
const [columns, setColumns] = useState([
// { field: 'id', headerName: 'ID', width: 100 },
- { field: 'maktx', headerName: translate('table.field.qlyIsptItem.maktx'), width: 300 },
{ field: 'matnrCode', headerName: translate('table.field.qlyIsptItem.matnrCode') },
+ { field: 'maktx', headerName: translate('table.field.qlyIsptItem.maktx'), width: 300 },
{ field: 'splrName', headerName: translate('table.field.qlyIsptItem.splrName') },
{ field: 'splrBatch', headerName: translate('table.field.qlyIsptItem.splrBatch') },
- { field: 'stockBatch', headerName: translate('table.field.qlyIsptItem.stockBatch') },
- { field: 'dlyQty', headerName: translate('table.field.qlyIsptItem.dlyQty') },
+ // { field: 'stockBatch', headerName: translate('table.field.qlyIsptItem.stockBatch') },
+ // { field: 'dlyQty', headerName: translate('table.field.qlyIsptItem.dlyQty') },
{ field: 'rcptQty', headerName: translate('table.field.qlyIsptItem.rcptQty') },
{
field: 'safeQty', headerName: translate('table.field.qlyIsptItem.safeQty'), editable: true, type: 'number',
@@ -245,8 +225,6 @@
field: 'isptResult', headerName: translate('table.field.qlyIsptItem.isptResult'), width: 150, type: 'singleSelect',
editable: true, valueOptions: [{ value: '1', label: '鍚堟牸' }, { value: '2', label: '涓嶅悎鏍�' }, { value: '3', label: '寰呭畾' }, { value: '4', label: '閮ㄥ垎鍚堟牸' }],
},
-
-
])
const processRowUpdate = (newRow, oldRow) => {
--
Gitblit v1.9.1