From 1504150a9e26ef221fc6ac4e0ad494446968d06d Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 30 八月 2025 16:28:22 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx | 34 ++++++----------------------------
1 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx b/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx
index 34e824a..70e29ce 100644
--- a/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx
+++ b/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx
@@ -49,9 +49,7 @@
const translate = useTranslate();
const notify = useNotify();
const refresh = useRefresh();
- console.log("-----=====>");
- console.log(queryForm);
-
+
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
setOpen(false);
@@ -89,6 +87,7 @@
batch: el.batch,
spec: el.spec,
model: el.model,
+ fieldsIndex: el.fieldsIndex,
stockUnit: el.unit || '',
...dynamicFields
}
@@ -112,7 +111,6 @@
const { data } = res.data;
setTableData(data?.records);
setRowCount(data?.total);
-
} else {
notify(res.data.msg);
}
@@ -134,7 +132,7 @@
aria-labelledby="form-dialog-title"
fullWidth
disableRestoreFocus
- maxWidth="lg"
+ maxWidth="xl"
>
<DialogTitle id="form-dialog-title" sx={{
position: 'sticky',
@@ -174,7 +172,7 @@
</Grid>
</Box>
- <Box sx={{ mt: 2, height: 400, width: '100%' }}>
+ <Box sx={{ mt: 2, height: 600, width: '100%' }}>
<SelectMatsTableView
tableData={tableData}
setTableData={setTableData}
@@ -213,7 +211,7 @@
const [columns, setColumns] = useState([
{ 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: 'locCode', headerName: translate('table.field.locItem.locCode'), 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 },
@@ -221,26 +219,6 @@
{ field: 'unit', headerName: translate('table.field.matnr.unit'), width: 100 },
{ field: 'wareArea', headerName: translate('table.field.locItem.wareArea'), width: 100, sortable: false },
])
-
- 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;
- console.log('====-->');
- console.log(data);
- setTableData(data?.records);
- setRowCount(data?.total);
-
- } else {
- notify(res.data.msg);
- }
- };
const handleSelectionChange = (ids) => {
setSelectedRows(ids)
@@ -276,7 +254,7 @@
}
return (
- <div style={{ height: 400, width: '100%' }}>
+ <div style={{ height: 590, width: '100%' }}>
<DataGrid
rows={tableData}
rowCount={rowCount}
--
Gitblit v1.9.1