From d96cb8a176a2cd7406de97b9a6e321f8ecd4c707 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 07:59:54 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrder/AsnWareModal.jsx | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnWareModal.jsx b/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
index 63b4c63..d4591f8 100644
--- a/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
@@ -18,7 +18,7 @@
import request from '@/utils/request';
import { DataGrid } from '@mui/x-data-grid';
import SaveIcon from '@mui/icons-material/Save';
-import { use } from "react";
+import TreeSelectInput from "@/page/components/TreeSelectInput";
const AsnWareModal = (props) => {
const { open, setOpen, data, setData } = props;
@@ -125,34 +125,32 @@
<DialogContent sx={{ mt: 2 }}>
<Box component="form" onSubmit={handleSubmit} sx={{ display: 'flex', flexDirection: 'column', gap: 3 }}>
<Grid container spacing={2}>
- <Grid item xs={4}>
+ <Grid item md={4}>
<TextField
label={translate('table.field.matnr.name')}
name="name"
value={formData.name}
onChange={handleChange}
- variant="outlined"
size="small"
/>
</Grid>
- <Grid item xs={4}>
+ <Grid item md={4}>
<TextField
label={translate('table.field.matnr.code')}
name="code"
value={formData.code}
onChange={handleChange}
- variant="outlined"
size="small"
/>
</Grid>
- <Grid item xs={4}>
- <TextField
- label={translate('table.field.matnr.groupId')}
- name="groupId"
+ <Grid item md={4}>
+ <TreeSelectInput
+ label="table.field.matnr.groupId"
value={formData.groupId}
+ resource={'matnrGroup'}
+ source="groupId"
+ name="groupId"
onChange={handleChange}
- variant="outlined"
- size="small"
/>
</Grid>
</Grid>
@@ -191,9 +189,10 @@
const notify = useNotify();
const [columns, setColumns] = useState([
- { field: 'id', headerName: 'ID', width: 100 },
- { field: 'name', headerName: translate('table.field.matnr.name'), width: 100 },
+ // { field: 'id', headerName: 'ID', width: 100 },
+ { field: 'name', headerName: translate('table.field.matnr.name'), width: 300 },
{ field: 'code', headerName: translate('table.field.matnr.code'), width: 100 },
+ { field: 'groupId$', headerName: translate('table.field.matnr.groupId'), width: 100 },
{ field: 'spec', headerName: translate('table.field.matnr.spec'), width: 100 },
{ field: 'model', headerName: translate('table.field.matnr.model'), width: 100 },
{ field: 'weight', headerName: translate('table.field.matnr.weight'), width: 100 },
--
Gitblit v1.9.1