From de2365da21526a6af8e0c1504ed489dcc3617de9 Mon Sep 17 00:00:00 2001 From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com> Date: 星期一, 07 四月 2025 20:45:55 +0800 Subject: [PATCH] #修改 任务主单明细显示优化 --- rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 55 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 44 insertions(+), 11 deletions(-) diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx index 3f6b568..90e2269 100644 --- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx +++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx @@ -51,8 +51,8 @@ import SaveIcon from '@mui/icons-material/Save'; import request from '@/utils/request'; import { Add, Edit, Delete } from '@mui/icons-material'; -import _ from 'lodash'; -import { DataGrid } from '@mui/x-data-grid'; +import _, { set } from 'lodash'; +import { DataGrid, useGridApiRef } from '@mui/x-data-grid'; import DictionarySelect from "../components/DictionarySelect"; import DictSelect from "../components/DictSelect"; @@ -65,6 +65,8 @@ const [disabled, setDisabled] = useState(false) const [createDialog, setCreateDialog] = useState(false); + + const tableRef = useRef(); useEffect(() => { if (open && asnId !== 0) { @@ -97,8 +99,22 @@ })); }; + const setFinally = () => { + const rows = tableRef.current.state.editRows; + for (const key in rows) { + const find = tabelData.find(item => item.matnrId === +key); + find.anfme = rows[key].anfme.value; + } + setTableData([...tabelData]); + + } + + + const handleSubmit = async () => { + setFinally() setDisabled(true) + if (asnId === 0) { const parmas = { "orders": formData, @@ -108,8 +124,8 @@ const res = await request.post(`/asnOrder/items/save`, parmas); if (res?.data?.code === 200) { setOpen(false); - billReload() refresh(); + billReload?.current() } else { notify(res.data.msg); } @@ -122,6 +138,7 @@ if (res?.data?.code === 200) { setOpen(false); refresh(); + billReload?.current() } else { notify(res.data.msg); @@ -162,6 +179,8 @@ const [selectedRows, setSelectedRows] = useState([]); + + const handleDeleteItem = () => { const newTableData = _.filter(tabelData, (item) => !selectedRows.includes(item.matnrId)); setTableData(newTableData); @@ -176,7 +195,7 @@ aria-hidden fullWidth disableRestoreFocus - maxWidth="md" // 'xs' | 'sm' | 'md' | 'lg' | 'xl' + maxWidth="lg" // 'xs' | 'sm' | 'md' | 'lg' | 'xl' > <DialogTitle id="form-dialog-title" sx={{ position: 'sticky', @@ -228,7 +247,7 @@ </Box> <Box sx={{ mt: 2 }}> - <AsnOrderModalTable tabelData={tabelData} setTableData={setTableData} asnId={asnId} selectedRows={selectedRows} setSelectedRows={setSelectedRows} ></AsnOrderModalTable> + <AsnOrderModalTable tabelData={tabelData} setTableData={setTableData} asnId={asnId} selectedRows={selectedRows} setSelectedRows={setSelectedRows} tableRef={tableRef}></AsnOrderModalTable> </Box> </DialogContent> <DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}> @@ -253,7 +272,7 @@ export default AsnOrderModal; -const AsnOrderModalTable = ({ tabelData, setTableData, asnId, selectedRows, setSelectedRows }) => { +const AsnOrderModalTable = ({ tabelData, setTableData, asnId, selectedRows, setSelectedRows, tableRef }) => { const translate = useTranslate(); const notify = useNotify(); @@ -274,9 +293,14 @@ { field: 'anfme', headerName: translate('table.field.asnOrderItem.purQty'), + type: 'number', minWidth: 100, flex: 1, editable: true, + // preProcessEditCellProps: (params) => { + // const hasError = params.props.value.length !== ''; + // return { ...params.props, error: hasError }; + // }, }, { field: 'splrCode', @@ -392,11 +416,16 @@ const processRowUpdate = (newRow, oldRow) => { - setTableData((prevData) => - prevData.map((r) => - r.matnrId === newRow.matnrId ? { ...newRow } : r - ) - ); + const rows = tabelData.map((r) => + r.matnrId === newRow.matnrId ? { ...newRow } : r + ) + setTableData(rows) + // setTableData((prevData) => + // prevData.map((r) => + // r.matnrId === newRow.matnrId ? { ...newRow } : r + // ) + + // ); return newRow; }; @@ -408,9 +437,13 @@ }; + tableRef.current = useGridApiRef(); + + return ( <div style={{ height: 400, width: '100%' }}> <DataGrid + apiRef={tableRef} rows={tabelData} columns={columns} disableRowSelectionOnClick -- Gitblit v1.9.1