From 0d3a5be1512815a38f37ae81e7d9fc0948fd3f16 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 25 三月 2025 13:54:57 +0800
Subject: [PATCH] 1
---
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 110 +++++++++++++++++++++++++++++++------------------------
1 files changed, 62 insertions(+), 48 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index 66af5ed..debec59 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -53,11 +53,10 @@
import { Add, Edit, Delete } from '@mui/icons-material';
import _ from 'lodash';
import { DataGrid } from '@mui/x-data-grid';
+import DictionarySelect from "../components/DictionarySelect";
const AsnOrderModal = (props) => {
const { open, setOpen, asnId } = props;
-
-
const translate = useTranslate();
const notify = useNotify();
@@ -86,8 +85,8 @@
const [tabelData, setTableData] = useState([]);
- const handleChange = (e) => {
- const { name, value } = e.target;
+
+ const handleChange = (value, name) => {
setFormData((prevData) => ({
...prevData,
[name]: value
@@ -95,16 +94,22 @@
};
const handleSubmit = async () => {
- const parmas = {
- "orders": formData,
- "items": tabelData,
- }
- const res = await request.post(`/asnOrder/items/save`, parmas);
- if (res?.data?.code === 200) {
- setOpen(false);
+ 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();
+ } else {
+ notify(res.data.msg);
+ }
} else {
- notify(res.data.msg);
+ setOpen(false);
}
+
};
@@ -125,7 +130,6 @@
} else {
notify(res.data.msg);
}
-
}
const requestGetBody = async () => {
@@ -134,6 +138,13 @@
setTableData(res.data.data.records)
} else {
notify(res.data.msg);
+ }
+ }
+
+ const requestSetHead = async () => {
+ if (asnId !== 0) {
+ const res = await request.post(`/asnOrder/update`, { ...formData });
+ refresh()
}
}
@@ -161,33 +172,33 @@
</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')}
+ <DictionarySelect
+ label={translate("table.field.asnOrder.type")}
name="type"
value={formData.type}
- onChange={handleChange}
- variant="outlined"
+ onChange={(e) => handleChange(+e.target.value, 'type')}
size="small"
- validate={required()}
+ dictTypeCode="sys_order_type"
/>
+
</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}>
+ <DictionarySelect
+ label={translate("table.field.asnOrder.wkType")}
+ name="wkType"
+ value={formData.wkType}
+ onChange={(e) => handleChange(+e.target.value, 'wkType')}
+ size="small"
+ dictTypeCode="sys_business_type"
+ />
+ </Grid>
</Grid>
- </form>
+ </Form>
</Box>
<Box sx={{ mt: 2 }}>
@@ -199,13 +210,13 @@
</Box>
<Box sx={{ mt: 2 }}>
- <AsnOrderModalTable tabelData={tabelData} setTableData={setTableData} ></AsnOrderModalTable>
+ <AsnOrderModalTable tabelData={tabelData} setTableData={setTableData} asnId={asnId} ></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 />}>
- 纭
+ {translate('toolbar.confirm')}
</Button>
</Toolbar>
</DialogActions>
@@ -224,7 +235,7 @@
export default AsnOrderModal;
-const AsnOrderModalTable = ({ tabelData, setTableData }) => {
+const AsnOrderModalTable = ({ tabelData, setTableData, asnId }) => {
const translate = useTranslate();
const columns = [
@@ -247,11 +258,11 @@
headerName: translate('table.field.asnOrderItem.matnrId'),
minWidth: 100,
flex: 1,
- editable: false, // 鍋囪 matnrId 涓嶅彲缂栬緫
+ editable: false,
},
{
- field: 'matnk',
- headerName: translate('table.field.asnOrderItem.matnk'),
+ field: 'maktx',
+ headerName: translate('table.field.asnOrderItem.maktx'),
minWidth: 100,
flex: 1,
editable: true,
@@ -261,14 +272,12 @@
headerName: translate('table.field.asnOrderItem.poDetlId'),
minWidth: 100,
flex: 1,
- editable: true,
},
{
field: 'poDetlCode',
headerName: translate('table.field.asnOrderItem.poDetlCode'),
minWidth: 100,
flex: 1,
- editable: true,
},
{
field: 'anfme',
@@ -336,22 +345,27 @@
];
+ const requestSetBody = async (row) => {
+ if (asnId !== 0) {
+ const res = await request.post(`/asnOrderItem/update`, row);
+ }
+
+ }
+
const handleDelete = (row) => {
const newData = _.filter(tabelData, (item) => item.matnrId !== row.matnrId);
setTableData(newData);
};
- const handleEdit = (field, row, value) => {
- setTableData((prevData) =>
- prevData.map((r) =>
- r.matnrId === row.matnrId ? { ...r, [field]: value } : r
- )
- );
- };
const processRowUpdate = (newRow, oldRow) => {
- const field = Object.keys(newRow).find((key) => newRow[key] !== oldRow[key]);
- handleEdit(field, oldRow, newRow[field]);
+ setTableData((prevData) =>
+ prevData.map((r) =>
+ r.matnrId === newRow.matnrId ? { ...newRow } : r
+ )
+ );
+
+ requestSetBody(newRow)
return newRow;
};
--
Gitblit v1.9.1