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

skyouc

2025-02-28 c42cf7476479ccf5c21de5752868270f560d0091

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

 rsf-admin/src/page/basicInfo/matnr/MatnrListAside.jsx

@@ -43,16 +43,10 @@
    useEffect(() => {
        request.post('/matnrGroup/tree')
            .then(res => {
                console.log('Tree Data:', res);
                if (res?.data?.code === 200) {
                    let data = res.data.data;
                    // for (let k of data) {
                    //     k.id = k.id.toString();

                    // }
                    let items = haveChildren(data)
                    setTreeData(items)
                    console.log('Tree Data:', items);
                } else {
                    notify(res.data.msg);
                }

 rsf-admin/src/page/components/EditTopToolBar.jsx

@@ -8,6 +8,8 @@
    const navigate = useNavigate();
    const resource = useResourceContext();
    const translate = useTranslate();

    
    return (
        <TopToolbar sx={{
            marginTop: 1,

 rsf-admin/src/page/dictData/DictDataEdit.jsx

@@ -43,11 +43,12 @@
const DictDataEdit = () => {
    const translate = useTranslate();


    return (
        <Edit
            redirect="list"
            mutationMode={EDIT_MODE}
            actions={<CustomerTopToolBar />}
            actions={<CustomerTopToolBar backPrevious={true} />}
            aside={<EditBaseAside />}
        >
            <SimpleForm

 rsf-admin/src/page/dictData/DictDataList.jsx

@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
import { useNavigate } from 'react-router-dom';
import { useNavigate, useLocation } from 'react-router-dom';
import {
    List,
    DatagridConfigurable,
@@ -43,6 +43,8 @@
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import CustomerTopToolBar from "../components/EditTopToolBar";


const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
@@ -87,9 +89,21 @@

    const [createDialog, setCreateDialog] = useState(false);
    const [drawerVal, setDrawerVal] = useState(false);
    const [fit, setFilters] = useState(filters);
    const location = useLocation();
    const queryParams = new URLSearchParams(location.search);
    const dictTypeId = queryParams.get('dictTypeId');
    console.log(dictTypeId);
    if (dictTypeId != null && dictTypeId != undefined) {
        console.log(dictTypeId);
        console.log(fit);
    }

    return (
        <>
            {dictTypeId && <CustomerTopToolBar backPrevious={true} />}
        <Box display="flex">

            <List
                sx={{
                    flexGrow: 1,
@@ -102,6 +116,7 @@
                title={"menu.dictData"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
                filters={filters}
                    filter={dictTypeId ? { dictTypeId } : undefined}
                sort={{ field: "create_time", order: "desc" }}
                actions={(
                    <TopToolbar>
@@ -156,6 +171,8 @@
            >
            </PageDrawer>
        </Box>
        </>

    )
}


 rsf-admin/src/page/dictType/DictTypeEdit.jsx

@@ -31,7 +31,6 @@

const FormToolbar = () => {
    const { getValues } = useFormContext();

    return (
        <Toolbar sx={{ justifyContent: 'space-between' }}>
            <SaveButton />

 rsf-admin/src/page/dictType/DictTypeList.jsx

@@ -85,6 +85,11 @@
    const [createDialog, setCreateDialog] = useState(false);
    const [drawerVal, setDrawerVal] = useState(false);

    const navigate = useNavigate();
    const assign = (record) => {
        navigate(`/dictData?dictTypeId=${record.id}`);
    }

    return (
        <Box display="flex">
            <List
@@ -119,7 +124,12 @@
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.dictType.code" />
                    <MyField source="code" label="table.field.dictType.code"
                        onClick={(event, record, val) => {
                            event.stopPropagation();
                            assign(record);
                        }}
                    />
                    <TextField source="name" label="table.field.dictType.name" />
                    <TextField source="description" label="table.field.dictType.description" />

@@ -143,12 +153,6 @@
                open={createDialog}
                setOpen={setCreateDialog}
            />
            <PageDrawer
                title='DictType Detail'
                drawerVal={drawerVal}
                setDrawerVal={setDrawerVal}
            >
            </PageDrawer>
        </Box>
    )
}