From fe88c3671515ab5ed0e66100fd1bf22102ffdc0c Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 08 四月 2025 11:05:31 +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 | 333 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 207 insertions(+), 126 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index 2942d22..90e2269 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -51,16 +51,22 @@
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";
const AsnOrderModal = (props) => {
- const { open, setOpen, asnId } = props;
+ const { open, setOpen, asnId, billReload } = props;
const translate = useTranslate();
const notify = useNotify();
const refresh = useRefresh();
+ const [disabled, setDisabled] = useState(false)
+
const [createDialog, setCreateDialog] = useState(false);
+
+ const tableRef = useRef();
useEffect(() => {
if (open && asnId !== 0) {
@@ -73,41 +79,72 @@
if (reason !== "backdropClick") {
setOpen(false);
refresh();
- setFormData({ type: '' })
+ setFormData({ type: '', wkType: '' })
setTableData([])
}
};
const [formData, setFormData] = useState({
type: '',
+ wkType: '',
});
const [tabelData, setTableData] = useState([]);
- const handleChange = (e) => {
- const { name, value } = e.target;
+
+ const handleChange = (value, name) => {
setFormData((prevData) => ({
...prevData,
[name]: value
}));
};
+ 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,
"items": tabelData,
}
+
const res = await request.post(`/asnOrder/items/save`, parmas);
if (res?.data?.code === 200) {
setOpen(false);
refresh();
+ billReload?.current()
} else {
notify(res.data.msg);
}
} else {
- setOpen(false);
+ const parmas = {
+ "orders": formData,
+ "items": tabelData,
+ }
+ const res = await request.post(`/asnOrder/items/update`, parmas);
+ if (res?.data?.code === 200) {
+ setOpen(false);
+ refresh();
+ billReload?.current()
+
+ } else {
+ notify(res.data.msg);
+ }
}
+ setDisabled(false)
};
@@ -140,13 +177,14 @@
}
}
- const requestSetHead = async () => {
- if (asnId !== 0) {
- const res = await request.post(`/asnOrder/update`, { ...formData });
- refresh()
- }
- }
+ const [selectedRows, setSelectedRows] = useState([]);
+
+
+ const handleDeleteItem = () => {
+ const newTableData = _.filter(tabelData, (item) => !selectedRows.includes(item.matnrId));
+ setTableData(newTableData);
+ }
return (
<>
@@ -157,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',
@@ -171,52 +209,51 @@
</Box>
</DialogTitle>
<DialogContent sx={{ mt: 2 }}>
- <Box component="form" sx={{ display: 'flex', flexDirection: 'column', gap: 3 }}>
- <form>
+ <Box sx={{ display: 'flex', flexDirection: 'column', gap: 3 }}>
+ <Form>
<Grid container spacing={2}>
- <Grid item xs={4}>
- <TextField
- label={translate('table.field.asnOrder.type')}
- name="type"
+ <Grid item md={4}>
+ <DictSelect
+ label={translate("table.field.asnOrder.type")}
value={formData.type}
- onChange={handleChange}
- onBlur={requestSetHead}
- variant="outlined"
- size="small"
- validate={required()}
+ onChange={(e) => handleChange(e.target.value, 'type')}
+ dictTypeCode="sys_order_type"
+ required
/>
+
+
</Grid>
- {/* <Grid item xs={4}>
- <TextField
- label={translate('table.field.asnOrder.wkType')}
- name="wkType"
- value={formData.wkType}
- onChange={handleChange}
- variant="outlined"
- size="small"
- />
- </Grid> */}
+ <Grid item md={4}>
+ <DictSelect
+ label={translate("table.field.asnOrder.wkType")}
+ value={formData.wkType}
+ onChange={(e) => handleChange(e.target.value, 'wkType')}
+ dictTypeCode="sys_business_type"
+ required
+ />
+ </Grid>
</Grid>
- </form>
+ </Form>
</Box>
<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} tableRef={tableRef}></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>
</DialogActions>
@@ -235,77 +272,35 @@
export default AsnOrderModal;
-const AsnOrderModalTable = ({ tabelData, setTableData, asnId }) => {
+const AsnOrderModalTable = ({ tabelData, setTableData, asnId, selectedRows, setSelectedRows, tableRef }) => {
const translate = useTranslate();
+ const notify = useNotify();
- const columns = [
- {
- field: 'action',
- headerName: '鎿嶄綔',
- minWidth: 100,
- sticky: 'right',
- flex: 1,
- 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,
- },
+ const [columns, setColumns] = useState([
+
{
field: 'maktx',
headerName: translate('table.field.asnOrderItem.maktx'),
- minWidth: 100,
- flex: 1,
- editable: true,
+ width: 250,
+ editable: false,
},
{
- field: 'poDetlId',
- headerName: translate('table.field.asnOrderItem.poDetlId'),
- minWidth: 100,
- flex: 1,
- },
- {
- field: 'poDetlCode',
- headerName: translate('table.field.asnOrderItem.poDetlCode'),
- minWidth: 100,
- flex: 1,
+ field: 'matnrCode',
+ headerName: translate('table.field.asnOrderItem.matnrCode'),
+ width: 130,
+ editable: false,
},
{
field: 'anfme',
- headerName: translate('table.field.asnOrderItem.anfme'),
- minWidth: 100,
- flex: 1,
- editable: true,
- },
- {
- field: 'stockUnit',
- headerName: translate('table.field.asnOrderItem.stockUnit'),
- minWidth: 100,
- flex: 1,
- editable: true,
- },
- {
- field: 'purQty',
headerName: translate('table.field.asnOrderItem.purQty'),
+ type: 'number',
minWidth: 100,
flex: 1,
editable: true,
- },
- {
- field: 'purUnit',
- headerName: translate('table.field.asnOrderItem.purUnit'),
- minWidth: 100,
- flex: 1,
- editable: true,
+ // preProcessEditCellProps: (params) => {
+ // const hasError = params.props.value.length !== '';
+ // return { ...params.props, error: hasError };
+ // },
},
{
field: 'splrCode',
@@ -321,58 +316,134 @@
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: 'qrcode',
- headerName: translate('table.field.asnOrderItem.qrcode'),
+ field: 'platItemId',
+ headerName: translate('table.field.asnOrderItem.platItemId'),
minWidth: 100,
flex: 1,
- editable: true,
- },
- {
- field: 'barcode',
- headerName: translate('table.field.asnOrderItem.barcode'),
- minWidth: 100,
- flex: 1,
- editable: true,
- },
- {
- field: 'packName',
- headerName: translate('table.field.asnOrderItem.packName'),
- minWidth: 100,
- flex: 1,
- editable: true,
},
- ];
+ {
+ field: 'stockUnit',
+ headerName: translate('table.field.asnOrderItem.stockUnit'),
+ minWidth: 100,
+ flex: 1,
+ editable: false,
+ },
+ // {
+ // field: 'purQty',
+ // headerName: translate('table.field.asnOrderItem.purQty'),
+ // minWidth: 100,
+ // flex: 1,
+ // editable: true,
+ // },
+ {
+ field: 'purUnit',
+ headerName: translate('table.field.asnOrderItem.purUnit'),
+ minWidth: 100,
+ flex: 1,
+ editable: false,
+ },
- const requestSetBody = async (row) => {
- if (asnId !== 0) {
- const res = await request.post(`/asnOrderItem/update`, row);
- }
+
+
+ ])
+
+ 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([]);
+
+
+ useEffect(() => {
+ getDynamicFields();
+ }, []);
+
+ useEffect(() => {
+ cdata.current = tabelData
+ }, [tabelData]);
+
+
+ const getDynamicFields = async () => {
+ const {
+ data: { code, data, msg },
+ } = await request.get("/fields/enable/list");
+ if (code === 200) {
+ const cols = data.map(el => ({
+ field: el.fields,
+ headerName: el.fieldsAlise,
+ minWidth: 100,
+ flex: 1,
+ editable: false
+ }))
+ setColumns([...columns, ...cols, action])
+ } else {
+ notify(msg);
+ }
+ }
+
+
+
const handleDelete = (row) => {
- const newData = _.filter(tabelData, (item) => item.matnrId !== row.matnrId);
+ const newData = _.filter(cdata.current, (item) => item.matnrId !== row.matnrId);
setTableData(newData);
};
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
+ // )
- requestSetBody(newRow)
+ // );
+
return newRow;
};
+
+
+
+ const handleSelectionChange = (ids) => {
+ setSelectedRows(ids)
+
+ };
+
+ tableRef.current = useGridApiRef();
return (
<div style={{ height: 400, width: '100%' }}>
<DataGrid
+ apiRef={tableRef}
rows={tabelData}
columns={columns}
disableRowSelectionOnClick
@@ -382,6 +453,16 @@
disableColumnSorting
disableMultipleColumnsSorting
processRowUpdate={processRowUpdate}
+ autoPageSize
+ editMode="row"
+ checkboxSelection
+ onRowSelectionModelChange={handleSelectionChange}
+ selectionModel={selectedRows}
+ sx={{
+ '& .MuiDataGrid-cell input': {
+ border: '1px solid #ccc'
+ },
+ }}
/>
</div>
);
--
Gitblit v1.9.1