From 0330693f16b106cfd8dc451ff82b8a8ebdee8963 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期六, 29 三月 2025 16:29:55 +0800
Subject: [PATCH] feat:组盘
---
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 163 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 94 insertions(+), 69 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index 2942d22..cce1a27 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -53,6 +53,8 @@
import { Add, Edit, Delete } from '@mui/icons-material';
import _ from 'lodash';
import { DataGrid } from '@mui/x-data-grid';
+import DictionarySelect from "../components/DictionarySelect";
+import DictSelect from "../components/DictSelect";
const AsnOrderModal = (props) => {
const { open, setOpen, asnId } = props;
@@ -60,6 +62,7 @@
const translate = useTranslate();
const notify = useNotify();
const refresh = useRefresh();
+
const [createDialog, setCreateDialog] = useState(false);
useEffect(() => {
@@ -73,19 +76,20 @@
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
@@ -98,6 +102,7 @@
"orders": formData,
"items": tabelData,
}
+
const res = await request.post(`/asnOrder/items/save`, parmas);
if (res?.data?.code === 200) {
setOpen(false);
@@ -106,8 +111,19 @@
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();
+ } else {
+ notify(res.data.msg);
+ }
}
+
};
@@ -140,14 +156,6 @@
}
}
- const requestSetHead = async () => {
- if (asnId !== 0) {
- const res = await request.post(`/asnOrder/update`, { ...formData });
- refresh()
- }
- }
-
-
return (
<>
<Dialog
@@ -171,34 +179,32 @@
</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"
+ <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 xs={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 }}>
@@ -216,7 +222,7 @@
<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 />}>
- 纭
+ {translate('toolbar.confirm')}
</Button>
</Toolbar>
</DialogActions>
@@ -237,14 +243,14 @@
const AsnOrderModalTable = ({ tabelData, setTableData, asnId }) => {
const translate = useTranslate();
+ const notify = useNotify();
- const columns = [
+ const [columns, setColumns] = useState([
{
field: 'action',
headerName: '鎿嶄綔',
- minWidth: 100,
- sticky: 'right',
- flex: 1,
+ width: 70,
+ lockPosition: 'left',
renderCell: (params) => (
<Tooltip title="Delete">
<IconButton onClick={() => handleDelete(params.row)}>
@@ -252,6 +258,7 @@
</IconButton>
</Tooltip>
),
+
},
{
field: 'matnrId',
@@ -263,6 +270,13 @@
{
field: 'maktx',
headerName: translate('table.field.asnOrderItem.maktx'),
+ minWidth: 100,
+ flex: 1,
+ editable: true,
+ },
+ {
+ field: 'maktxCode',
+ headerName: translate('table.field.asnOrderItem.maktxCode'),
minWidth: 100,
flex: 1,
editable: true,
@@ -281,7 +295,7 @@
},
{
field: 'anfme',
- headerName: translate('table.field.asnOrderItem.anfme'),
+ headerName: translate('table.field.asnOrderItem.purQty'),
minWidth: 100,
flex: 1,
editable: true,
@@ -291,21 +305,21 @@
headerName: translate('table.field.asnOrderItem.stockUnit'),
minWidth: 100,
flex: 1,
- editable: true,
+ editable: false,
},
- {
- field: 'purQty',
- headerName: translate('table.field.asnOrderItem.purQty'),
- minWidth: 100,
- flex: 1,
- editable: true,
- },
+ // {
+ // 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: true,
+ editable: false,
},
{
field: 'splrCode',
@@ -322,20 +336,6 @@
editable: true,
},
{
- field: 'qrcode',
- headerName: translate('table.field.asnOrderItem.qrcode'),
- 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,
@@ -343,17 +343,42 @@
editable: true,
},
- ];
+ ])
- const requestSetBody = async (row) => {
- if (asnId !== 0) {
- const res = await request.post(`/asnOrderItem/update`, row);
+ 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: el.unique
+ }))
+ setColumns([...columns, ...cols])
+ } 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);
};
@@ -365,7 +390,6 @@
)
);
- requestSetBody(newRow)
return newRow;
};
@@ -382,6 +406,7 @@
disableColumnSorting
disableMultipleColumnsSorting
processRowUpdate={processRowUpdate}
+ autoPageSize
/>
</div>
);
--
Gitblit v1.9.1