Merge branch 'front' into devlop

skyouc

2025-03-20 210988b56322931b9e0c91194f5c50f84b007688

 rsf-admin/src/page/asnOrder/AsnOrderModal.jsx

@@ -53,6 +53,7 @@
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;
@@ -84,8 +85,8 @@

    const [tabelData, setTableData] = useState([]);

    const handleChange = (e) => {
        const { name, value } = e.target;

    const handleChange = (value, name) => {
        setFormData((prevData) => ({
            ...prevData,
            [name]: value
@@ -171,20 +172,19 @@
                    </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}
                                        onBlur={requestSetHead}
                                        variant="outlined"
                                        onChange={(e) => handleChange(+e.target.value, 'type')}
                                        size="small"
                                        required
                                        dictTypeCode="sys_bill_type"
                                    />

                                </Grid>

                                {/* <Grid item xs={4}>
@@ -198,7 +198,7 @@
                                />
                            </Grid> */}
                            </Grid>
                        </form>
                        </Form>
                    </Box>

                    <Box sx={{ mt: 2 }}>