From e2f5d7f8e9818977b0eb3b163447c10f8caca2b5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 七月 2025 12:58:31 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx | 76 ++++++++++++++++---------------------
1 files changed, 33 insertions(+), 43 deletions(-)
diff --git a/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx b/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx
index ef7023d..f2eee48 100644
--- a/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx
+++ b/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx
@@ -69,9 +69,8 @@
const reset = () => {
setFormData({
- name: '',
- code: '',
- groupId: 0
+ maktx: '',
+ matnrCode: '',
})
}
@@ -84,35 +83,35 @@
return acc;
}, {});
return {
- matnrId: el.id,
- maktx: el.name,
- matnrCode: el.code,
- stockUnit: el.stockUnit || '',
- purUnit: el.purchaseUnit || '',
+ matnrId: el.matnrId,
+ maktx: el.maktx,
+ matnrCode: el.matnrCode,
+ anfme: el.anfme,
+ batch: el.batch,
+ spec: el.spec,
+ model: el.model,
+ stockUnit: el.unit || '',
...dynamicFields
}
- }))
+ }));
setData([...data, ...value]);
+
+ console.log(data);
setOpen(false);
reset();
};
const getData = async () => {
- const res = await request.post(`/matnr/page`, {
+ const res = await request.post(`/transfer/locs/items`, {
...formData,
current: page,
pageSize: pageSize,
orderBy: "create_time desc"
});
if (res?.data?.code === 200) {
- const {data} = res.data;
+ const { data } = res.data;
setTableData(data?.records);
- setRowCount(data?.total)
-
- console.log(rowCount);
- console.log(data);
-
-
+ setRowCount(data?.total);
} else {
notify(res.data.msg);
}
@@ -120,7 +119,7 @@
useEffect(() => {
getData();
- }, [open]);
+ }, [open, page]);
const handleSearch = () => {
getData()
@@ -152,8 +151,8 @@
<Grid item md={3}>
<TextField
label={translate('table.field.matnr.name')}
- name="name"
- value={formData.name}
+ name="maktx"
+ value={formData.maktx}
onChange={handleChange}
size="small"
/>
@@ -161,20 +160,10 @@
<Grid item md={3}>
<TextField
label={translate('table.field.matnr.code')}
- name="code"
- value={formData.code}
+ name="matnrCode"
+ value={formData.matnrCode}
onChange={handleChange}
size="small"
- />
- </Grid>
- <Grid item md={3}>
- <TreeSelectInput
- label="table.field.matnr.groupId"
- value={formData.groupId}
- resource={'matnrGroup'}
- source="groupId"
- name="groupId"
- onChange={handleChange}
/>
</Grid>
<Grid item md={2} sx={{ margin: 'auto' }}>
@@ -213,25 +202,21 @@
export default CreateBySelectMats;
-const SelectMatsTableView = ({ tableData, page, pageSize,setPage, setPageSize, rowCount, setTableData, selectedRows, setSelectedRows, dyFields, setDyFields }) => {
+const SelectMatsTableView = ({ tableData, page, pageSize, setPage, setPageSize, rowCount, setTableData, selectedRows, setSelectedRows, dyFields, setDyFields }) => {
const translate = useTranslate();
-
const notify = useNotify();
const [extendColumns, setExtendColumns] = useState([]);
const [columns, setColumns] = useState([
- { field: 'name', headerName: translate('table.field.matnr.name'), width: 300 },
- { field: 'code', headerName: translate('table.field.matnr.code'), width: 200 },
- { field: 'groupId$', headerName: translate('table.field.matnr.groupId'), width: 100 },
+ { field: 'maktx', headerName: translate('table.field.matnr.name'), width: 300 },
+ { field: 'matnrCode', headerName: translate('table.field.matnr.code'), width: 200 },
+ // { field: 'groupId$', headerName: translate('table.field.matnr.groupId'), width: 100 },
{ field: 'spec', headerName: translate('table.field.matnr.spec'), width: 100 },
+ { field: 'batch', headerName: translate('table.field.locItem.batch'), width: 100 },
{ field: 'model', headerName: translate('table.field.matnr.model'), width: 100 },
- { field: 'weight', headerName: translate('table.field.matnr.weight'), width: 100 },
- { field: 'describle', headerName: translate('table.field.matnr.describle'), width: 100 },
- { field: 'nromNum', headerName: translate('table.field.matnr.nromNum'), width: 100 },
+ { field: 'anfme', headerName: translate('table.field.locItem.anfme'), width: 100 },
{ field: 'unit', headerName: translate('table.field.matnr.unit'), width: 100 },
- { field: 'purchaseUnit', headerName: translate('table.field.matnr.purUnit'), width: 100 },
- { field: 'stockUnit', headerName: translate('table.field.matnr.stockUnit'), width: 100 },
- { field: 'stockLeval$', headerName: translate('table.field.matnr.stockLevel'), width: 100, sortable: false },
+ { field: 'wareArea', headerName: translate('table.field.locItem.wareArea'), width: 100, sortable: false },
])
const handleSelectionChange = (ids) => {
@@ -239,6 +224,11 @@
};
useEffect(() => {
+ console.log('------->');
+ console.log(page);
+ }, [page])
+
+ useEffect(() => {
if (extendColumns == undefined || extendColumns.length < 1) {
getDynamicFields();
}
--
Gitblit v1.9.1