verou
2025-03-26 c3e30a405f41d87a924bbd0aa48801d3d763f2c0
fix:逻辑分区加字段
6个文件已修改
107 ■■■■ 已修改文件
rsf-admin/src/i18n/en.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/i18n/zh.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatCreate.jsx 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx 45 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/components/ImportModal.jsx 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/i18n/en.js
@@ -375,6 +375,9 @@
            locAreaMat: {
                code: "code",
                depict: "depict",
                name: "name",
                warehouseId: "warehouseId",
                areaId: "areaId",
            },
            locAreaMatRela: {
                areaId: "areaId",
rsf-admin/src/i18n/zh.js
@@ -375,6 +375,9 @@
            locAreaMat: {
                code: "逻辑编码",
                depict: "逻辑描述",
                name: "名称",
                warehouseId: "仓库",
                areaId: "库区",
            },
            locAreaMatRela: {
                areaId: "库区",
rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatCreate.jsx
@@ -52,6 +52,12 @@
        notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
    };
    const [warehouseId, setWrehouseId] = useState();
    const warehouseChange = (val) => {
        setWrehouseId(val)
    }
    return (
        <>
            <CreateBase
@@ -92,18 +98,42 @@
                                        autoFocus
                                    />
                                </Grid>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.locAreaMat.warehouseId"
                                        source="warehouseId"
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.locAreaMat.name"
                                        source="name"
                                        parse={v => v}
                                        autoFocus
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.locAreaMat.areaId"
                                        source="areaId"
                                    <ReferenceInput
                                        source="warehouseId"
                                        reference="warehouse"
                                    >
                                        <AutocompleteInput
                                            label="table.field.loc.warehouseId"
                                            optionText="name"
                                            validate={[required()]}
                                            onChange={warehouseChange}
                                            filterToQuery={(val) => ({ name: val })}
                                    />
                                </Grid> */}
                                    </ReferenceInput>
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="areaId"
                                        reference="warehouseAreas"
                                        filter={{ warehouseId }}
                                    >
                                        <AutocompleteInput
                                            label="table.field.loc.areaId"
                                            optionText="name"
                                            validate={[required()]}
                                            filterToQuery={(val) => ({ name: val })}
                                        />
                                    </ReferenceInput>
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.locAreaMat.depict"
rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx
@@ -43,6 +43,11 @@
const LocAreaMatEdit = () => {
    const translate = useTranslate();
    const [warehouseId, setWrehouseId] = useState();
    const warehouseChange = (val) => {
        setWrehouseId(val)
    }
    return (
        <Edit
            redirect="list"
@@ -71,18 +76,42 @@
                                autoFocus
                            />
                        </Stack>
                        {/* <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.locAreaMat.warehouseId"
                        <Grid item xs={6} display="flex" gap={1}>
                            <TextInput
                                label="table.field.locAreaMat.name"
                                source="name"
                                parse={v => v}
                                autoFocus
                            />
                        </Grid>
                        <Grid item xs={6} display="flex" gap={1}>
                            <ReferenceInput
                                source="warehouseId"
                                reference="warehouse"
                            >
                                <AutocompleteInput
                                    label="table.field.loc.warehouseId"
                                    optionText="name"
                                    validate={[required()]}
                                    onChange={warehouseChange}
                                    filterToQuery={(val) => ({ name: val })}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.locAreaMat.areaId"
                            </ReferenceInput>
                        </Grid>
                        <Grid item xs={6} display="flex" gap={1}>
                            <ReferenceInput
                                source="areaId"
                                reference="warehouseAreas"
                                filter={{ warehouseId }}
                            >
                                <AutocompleteInput
                                    label="table.field.loc.areaId"
                                    optionText="name"
                                    validate={[required()]}
                                    filterToQuery={(val) => ({ name: val })}
                            />
                        </Stack> */}
                            </ReferenceInput>
                        </Grid>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.locAreaMat.depict"
rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx
@@ -119,8 +119,10 @@
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.locAreaMat.code" />
                    {/* <NumberField source="warehouseId" label="table.field.locAreaMat.warehouseId" />
                    <NumberField source="areaId" label="table.field.locAreaMat.areaId" /> */}
                    <TextField source="name" label="table.field.locAreaMat.name" />
                    <TextField source="warehouseId$" label="table.field.locAreaMat.warehouseId" />
                    <TextField source="areaId$" label="table.field.locAreaMat.areaId" />
                    <TextField source="depict" label="table.field.locAreaMat.depict" />
                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
rsf-admin/src/page/components/ImportModal.jsx
@@ -80,7 +80,9 @@
    };
    const downloadTemplate = async (type) => {
        const res = await request.post(`/${value}/template/download`, {})
        const res = await request.post(`/${value}/template/download`, {}, {
            responseType: "blob",
        })
        const url = window.URL.createObjectURL(
            new Blob([res.data], { type: res.headers["content-type"] }),
        );