Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-08-05 a6991a33e18f69264f93a63459a4b64ea799295a

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

@@ -44,24 +44,24 @@
    MenuItem

} from '@mui/material';

import { DataGrid, useGridApiRef, GRID_DATE_COL_DEF,  GRID_DATETIME_COL_DEF,  getGridDateOperators, useGridApiContext } from '@mui/x-data-grid';
import { useForm, Controller, useWatch, FormProvider, useFormContext } from "react-hook-form";
import { LocalizationProvider, DatePicker, DateTimePicker } from '@mui/x-date-pickers';
import DialogCloseButton from "../../components/DialogCloseButton";
import StatusSelectInput from "../../components/StatusSelectInput";
import ConfirmButton from "../../components/ConfirmButton";
import AsnWareModal from "./AsnWareModal";
import { useForm, Controller, useWatch, FormProvider, useFormContext } from "react-hook-form";
import SaveIcon from '@mui/icons-material/Save';
import request from '@/utils/request';
import { Add, Edit, Delete } from '@mui/icons-material';
import _, { set } from 'lodash';
import { DataGrid, useGridApiRef, GRID_DATE_COL_DEF,  GRID_DATETIME_COL_DEF,  getGridDateOperators, useGridApiContext } from '@mui/x-data-grid';
import { LocalizationProvider, DatePicker, DateTimePicker } from '@mui/x-date-pickers';
import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
import DictionarySelect from "../../components/DictionarySelect";
import DictSelect from "../../components/DictSelect";
import "./asnOrder.css";
import { 'zhCN' as locale } from 'date-fns/locale';
import { format, } from 'date-fns';
import { DemoContainer } from '@mui/x-date-pickers/internals/demo';
import DictionarySelect from "../../components/DictionarySelect";
import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
import ConfirmButton from "../../components/ConfirmButton";
import { Add, Edit, Delete } from '@mui/icons-material';
import DictSelect from "../../components/DictSelect";
import SaveIcon from '@mui/icons-material/Save';
import AsnWareModal from "./AsnWareModal";
import request from '@/utils/request';
import _, { set } from 'lodash';
import "./asnOrder.css";


const AsnOrderModal = (props) => {
    const { open, setOpen, asnId, billReload } = props;
@@ -106,7 +106,6 @@
            ...prevData,
            [name]: value
        }));
        console.log(formData);
    };

    const resetData = () => {
@@ -188,7 +187,7 @@
    }

    const requestGetBody = async () => {
        const res = await request.post(`/asnOrderItem/page`, { asnId });
        const res = await request.post(`/asnOrderItem/page`, { orderId: asnId });
        if (res?.data?.code === 200) {
            setTableData(res.data.data.records)
        } else {
@@ -344,7 +343,6 @@
        } = await request.post("companys/page", parmas);
        if (code === 200) {
            setFormData(data.records)
            console.log(data.records)
        } else {
            notify(msg);
        }
@@ -447,7 +445,6 @@
        } = await request.post("companys/page", parmas);
        if (code === 200) {
            setFormData(data.records)
            console.log(data.records)
        } else {
            notify(msg);
        }
@@ -676,9 +673,7 @@
    };


    const handleSelectionChange = (ids) => {
        console.log(ids);
        
    const handleSelectionChange = (ids) => {        
        setSelectedRows(ids)

    };
@@ -706,7 +701,7 @@
                        },
                    },
                }}
                pageSizeOptions={[10, 25, 50, 100]}
                pageSizeOptions={[15, 25, 50, 100]}
                editMode="row"
                checkboxSelection
                onRowSelectionModelChange={handleSelectionChange}