#
whycq
2025-02-21 735c1b82a64d48ef7fc9e274b971732ab0693345
#
3个文件已修改
39 ■■■■ 已修改文件
rsf-admin/src/page/matnr/MatnrListAside.jsx 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/matnr/MatnrListAside.jsx
@@ -3,6 +3,7 @@
import {
    SavedQueriesList,
    FilterLiveSearch,
    useNotify,
    FilterList,
    FilterListItem,
    useStore,
@@ -22,9 +23,32 @@
const MatListAside = () => {
    const theme = useTheme();
    const notify = useNotify();
    const { setFilters } = useListContext(); // 获取列表上下文
    const [selectedOption, setSelectedOption] = useState(null);
    const treeData = [
    const [treeData, setTreeData] = useState([]);
    useEffect(() => {
        request.get('/matnrGroup/tree')
        .then(res => {
            console.log('Tree Data:', res);
            if (res?.data?.code === 200) {
                setTreeData(res.data.data);
            } else {
                notify(res.data);
            }
        })
        .catch(error => {
            notify('Error fetching tree data');
        });
    },[]);
    const treeData1 = [
        {
            id: '19',
            label: '半成品 ',
@@ -63,6 +87,9 @@
        setFilters({ groupId: nodeId });
        // 在这里可以根据 nodeId 更新主内容区域
    };
    const handleSearch = () => {
            console.log('Search Input:', selectedOption);
    };
    const CustomCheckbox = React.forwardRef(function CustomCheckbox(props, ref) {
@@ -96,7 +123,7 @@
        >
            <CardContent>
                <SavedQueriesList icon={<BookmarkIcon />} />
                <FilterLiveSearch source='condition' hiddenLabel  />
                <FilterLiveSearch source="condition"  />
                <RichTreeView
                    defaultExpandedItems={['grid', 'pickers']}
                    expansionTrigger="iconContainer"
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
@@ -106,8 +106,8 @@
    }
    @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
    @GetMapping("/matnrGroup/tree")
    public R tree() {
    @PostMapping("/matnrGroup/tree")
    public R tree(@RequestBody Map<String, Object> map) {
        List<MatnrGroup> matnrs = matnrGroupService.list(new LambdaQueryWrapper<>());
        List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
        return R.ok().add(treeData);
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
@@ -196,4 +196,8 @@
        }
    }
    public String getLabel(){
        return this.name;
    }
}