Merge remote-tracking branch 'origin/devlop' into devlop

zjj

9 天以前 eab76cd34bff799686f68e6b70f86c9001e4913f

 rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx

@@ -15,6 +15,8 @@
import ConfirmModal from "@/page/components/ConfirmModal";
import { DataGrid } from '@mui/x-data-grid';
import request from '@/utils/request';
import { haveChildren } from '@/utils/common';


const LocAreaMatPanel = () => {
    const record = useRecordContext();
@@ -94,7 +96,7 @@
        const { data: { code, data, msg } } = await request.get(`/locAreaMatRela/groups/${record.id}`);

        if (code === 200) {
            setMatnrTree(data || [])
            setMatnrTree(haveChildren(data) || [])
        } else {
            notify(msg);
        }
@@ -104,7 +106,7 @@
        const { data: { code, data, msg } } = await request.get(`/locAreaMatRela/locType/${record.id}`);

        if (code === 200) {
            setLocTree(data || [])
            setLocTree(haveChildren(data) || [])
        } else {
            notify(msg);
        }