From c5e5befb594587bd0c5144695ec59503333a6b9b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 17:05:05 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 148 +++++++++++++++++++++++++++++-------------------
1 files changed, 89 insertions(+), 59 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index 94bbfef..33caa47 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -62,6 +62,7 @@
const translate = useTranslate();
const notify = useNotify();
const refresh = useRefresh();
+ const [disabled, setDisabled] = useState(false)
const [createDialog, setCreateDialog] = useState(false);
@@ -97,6 +98,7 @@
};
const handleSubmit = async () => {
+ setDisabled(true)
if (asnId === 0) {
const parmas = {
"orders": formData,
@@ -123,7 +125,7 @@
notify(res.data.msg);
}
}
-
+ setDisabled(false)
};
@@ -156,6 +158,13 @@
}
}
+ const [selectedRows, setSelectedRows] = useState([]);
+
+ const handleDeleteItem = () => {
+ const newTableData = _.filter(tabelData, (item) => !selectedRows.includes(item.matnrId));
+ setTableData(newTableData);
+ }
+
return (
<>
<Dialog
@@ -182,7 +191,7 @@
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 3 }}>
<Form>
<Grid container spacing={2}>
- <Grid item xs={4}>
+ <Grid item md={4}>
<DictSelect
label={translate("table.field.asnOrder.type")}
value={formData.type}
@@ -194,7 +203,7 @@
</Grid>
- <Grid item xs={4}>
+ <Grid item md={4}>
<DictSelect
label={translate("table.field.asnOrder.wkType")}
value={formData.wkType}
@@ -210,18 +219,19 @@
<Box sx={{ mt: 2 }}>
<Stack direction="row" spacing={2}>
<Button variant="contained" onClick={() => setCreateDialog(true)}>鏂板鐗╂枡</Button>
- {asnId !== '' && <ConfirmButton label={'鍒犻櫎'} variant="outlined" color="error" onConfirm={handleDelete} />}
+ {/* {asnId !== '' && <ConfirmButton label={'鍒犻櫎'} variant="outlined" color="error" onConfirm={handleDelete} />} */}
+ <ConfirmButton label={'鍒犻櫎'} variant="outlined" color="error" onConfirm={handleDeleteItem} />
</Stack>
</Box>
<Box sx={{ mt: 2 }}>
- <AsnOrderModalTable tabelData={tabelData} setTableData={setTableData} asnId={asnId} ></AsnOrderModalTable>
+ <AsnOrderModalTable tabelData={tabelData} setTableData={setTableData} asnId={asnId} selectedRows={selectedRows} setSelectedRows={setSelectedRows} ></AsnOrderModalTable>
</Box>
</DialogContent>
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
<Toolbar sx={{ width: '100%', justifyContent: 'space-between' }} >
- <Button onClick={handleSubmit} variant="contained" startIcon={<SaveIcon />}>
+ <Button disabled={disabled} onClick={handleSubmit} variant="contained" startIcon={<SaveIcon />}>
{translate('toolbar.confirm')}
</Button>
</Toolbar>
@@ -241,50 +251,25 @@
export default AsnOrderModal;
-const AsnOrderModalTable = ({ tabelData, setTableData, asnId }) => {
+const AsnOrderModalTable = ({ tabelData, setTableData, asnId, selectedRows, setSelectedRows }) => {
const translate = useTranslate();
const notify = useNotify();
const [columns, setColumns] = useState([
- {
- field: 'action',
- headerName: '鎿嶄綔',
- width: 70,
- lockPosition: 'left',
- renderCell: (params) => (
- <Tooltip title="Delete">
- <IconButton onClick={() => handleDelete(params.row)}>
- <Delete />
- </IconButton>
- </Tooltip>
- ),
- },
- {
- field: 'matnrId',
- headerName: translate('table.field.asnOrderItem.matnrId'),
- minWidth: 100,
- flex: 1,
- editable: false,
- },
{
field: 'maktx',
headerName: translate('table.field.asnOrderItem.maktx'),
minWidth: 100,
flex: 1,
- editable: true,
+ editable: false,
},
{
- field: 'poDetlId',
- headerName: translate('table.field.asnOrderItem.poDetlId'),
+ field: 'maktxCode',
+ headerName: translate('table.field.asnOrderItem.maktxCode'),
minWidth: 100,
flex: 1,
- },
- {
- field: 'poDetlCode',
- headerName: translate('table.field.asnOrderItem.poDetlCode'),
- minWidth: 100,
- flex: 1,
+ editable: false,
},
{
field: 'anfme',
@@ -293,6 +278,40 @@
flex: 1,
editable: true,
},
+ {
+ field: 'splrCode',
+ headerName: translate('table.field.asnOrderItem.splrCode'),
+ minWidth: 100,
+ flex: 1,
+ editable: true,
+ },
+ {
+ field: 'splrName',
+ headerName: translate('table.field.asnOrderItem.splrName'),
+ minWidth: 100,
+ flex: 1,
+ editable: true,
+ },
+ // {
+ // field: 'packName',
+ // headerName: translate('table.field.asnOrderItem.packName'),
+ // minWidth: 100,
+ // flex: 1,
+ // editable: true,
+ // },
+ // {
+ // field: 'poDetlId',
+ // headerName: translate('table.field.asnOrderItem.poDetlId'),
+ // minWidth: 100,
+ // flex: 1,
+ // },
+ {
+ field: 'platItemId',
+ headerName: translate('table.field.asnOrderItem.platItemId'),
+ minWidth: 100,
+ flex: 1,
+ },
+
{
field: 'stockUnit',
headerName: translate('table.field.asnOrderItem.stockUnit'),
@@ -314,29 +333,25 @@
flex: 1,
editable: false,
},
- {
- field: 'splrCode',
- headerName: translate('table.field.asnOrderItem.splrCode'),
- minWidth: 100,
- flex: 1,
- editable: true,
- },
- {
- field: 'splrName',
- headerName: translate('table.field.asnOrderItem.splrName'),
- minWidth: 100,
- flex: 1,
- editable: true,
- },
- {
- field: 'packName',
- headerName: translate('table.field.asnOrderItem.packName'),
- minWidth: 100,
- flex: 1,
- editable: true,
- },
+
+
])
+
+ const action = {
+ field: 'action',
+ headerName: '鎿嶄綔',
+ width: 70,
+ lockPosition: 'left',
+ renderCell: (params) => (
+ <Tooltip title="Delete">
+ <IconButton onClick={() => handleDelete(params.row)}>
+ <Delete />
+ </IconButton>
+ </Tooltip>
+ ),
+
+ }
let cdata = useRef([]);
@@ -360,9 +375,9 @@
headerName: el.fieldsAlise,
minWidth: 100,
flex: 1,
- editable: el.unique
+ editable: false
}))
- setColumns([...columns, ...cols])
+ setColumns([...columns, ...cols, action])
} else {
notify(msg);
}
@@ -387,6 +402,12 @@
};
+
+ const handleSelectionChange = (ids) => {
+ setSelectedRows(ids)
+
+ };
+
return (
<div style={{ height: 400, width: '100%' }}>
<DataGrid
@@ -400,6 +421,15 @@
disableMultipleColumnsSorting
processRowUpdate={processRowUpdate}
autoPageSize
+ editMode="row"
+ checkboxSelection
+ onRowSelectionModelChange={handleSelectionChange}
+ selectionModel={selectedRows}
+ sx={{
+ '& .MuiDataGrid-cell input': {
+ border: '1px solid #ccc'
+ },
+ }}
/>
</div>
);
--
Gitblit v1.9.1