From 777b31903904801e81bbf89b6eddb3d2f0feed87 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 27 三月 2025 09:17:44 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx index 84a4abb..977bfab 100644 --- a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx +++ b/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); } -- Gitblit v1.9.1