parent: fac10dcb | 补丁 | 提交 | ignore whitespace
skyouc
2025-03-19 3bd07e5f90d5d832b8502252e1daebdd014320f8 
Merge branch 'front' into devlop
13个文件已修改
174 ■■■■■ 已修改文件
rsf-admin/src/App.jsx 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/loc/LocCreate.jsx 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/loc/LocEdit.jsx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/loc/LocList.jsx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/container/ContainerCreate.jsx 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/container/ContainerEdit.jsx 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/container/ContainerList.jsx 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 rsf-admin/src/App.jsx


@@ -11,6 +11,7 @@


} from "react-admin";


import polyglotI18nProvider from "ra-i18n-polyglot";


import englishMessages from "./i18n/en";


import zhMessages from "./i18n/zh";


import { Layout } from "./layout";


import AuthProvider from "./config/authProvider";


import DataProvider from "./config/dataProvider";


@@ -31,15 +32,15 @@




const i18nProvider = polyglotI18nProvider(


  (locale) => {


    if (locale === "zh") {


      return import("./i18n/zh").then((messages) => messages.default);


    if (locale === "en") {


      return import("./i18n/en").then((messages) => messages.default);


    }


    // fallback


    return englishMessages;


    return zhMessages;


  },


  // default


  // 'en',


  resolveBrowserLocale("en", { fullLocale: true }),


  resolveBrowserLocale("zh", { fullLocale: true }),


  [


    { locale: "en", name: "English" },


    { locale: "zh", name: "简体中文" },




 rsf-admin/src/page/basicInfo/loc/LocCreate.jsx


@@ -33,6 +33,7 @@




const LocCreate = (props) => {


    const { open, setOpen } = props;


    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_loc_type')) || [];




    const translate = useTranslate();


    const notify = useNotify();


@@ -119,7 +120,7 @@


                                    />


                                </Grid>


                                <Grid item xs={6} display="flex" gap={1}>


                                    <ReferenceInput


                                    {/* <ReferenceInput


                                        source="type"


                                        reference="dictData"


                                        filter={{ dictTypeCode: 'sys_loc_type' }}


@@ -131,7 +132,16 @@


                                            parse={v => v}


                                            validate={[required()]}


                                        />


                                    </ReferenceInput>


                                    </ReferenceInput> */}


                                    <AutocompleteInput


                                        choices={dicts}


                                        source="type"


                                        optionText="label"


                                        label="table.field.loc.type"


                                        optionValue="value"


                                        parse={v => v}


                                        validate={[required()]}


                                    />


                                </Grid>


                                {/* <Grid item xs={6} display="flex" gap={1}>


                                    <TextInput




 rsf-admin/src/page/basicInfo/loc/LocEdit.jsx


@@ -42,7 +42,7 @@




const LocEdit = () => {


    const translate = useTranslate();


    const dicts = JSON.parse(localStorage.getItem('sys_dicts')).filter(dict => { return (dict.dictTypeCode == 'sys_loc_type') });


    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_loc_type')) || [];


    return (


        <Edit


            redirect="list"




 rsf-admin/src/page/basicInfo/loc/LocList.jsx


@@ -149,7 +149,7 @@


                    <NumberField source="areaId$" label="table.field.loc.areaId" />


                    <TextField source="code" label="table.field.loc.code" />


                    <TextField source="type$" label="table.field.loc.type" />


                    <TextField source="name" label="table.field.loc.name" />


                    {/* <TextField source="name" label="table.field.loc.name" /> */}


                    <NumberField source="flagLogic" label="table.field.loc.flagLogic" />


                    <TextField source="fucAtrrs" label="table.field.loc.fucAtrrs" />


                    <TextField source="barcode" label="table.field.loc.barcode" />




 rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx


@@ -94,14 +94,14 @@


                                    />




                                </Grid>


                                <Grid item xs={6} display="flex" gap={1}>


                                {/* <Grid item xs={6} display="flex" gap={1}>


                                    <TextInput


                                        label="table.field.warehouse.code"


                                        source="code"


                                        validate={[required()]}


                                        parse={v => v}


                                    />


                                </Grid>


                                </Grid> */}


                                <Grid item xs={6} display="flex" gap={1}>


                                    <TextInput


                                        label="table.field.warehouse.name"




 rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx


@@ -80,15 +80,15 @@


                                autoFocus


                            />


                        </Stack>


                        <Stack direction='row' gap={2}>


                        {/* <Stack direction='row' gap={2}>


                            <TextInput


                                label="table.field.warehouse.code"


                                source="code"


                                validate={[required()]}


                                parse={v => v}


                            />


                        </Stack>


                        


                        </Stack> */}




                        <Stack direction='row' gap={2}>


                            <TextInput


                                label="table.field.warehouse.address"


@@ -110,7 +110,7 @@


                            />


                        </Stack>


                        <Stack direction='row' gap={2}>


                            




                        </Stack>


                        <Stack direction='row' gap={2}>


                            <NumberInput




 rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx


@@ -60,8 +60,6 @@




const filters = [


    <SearchInput source="condition" alwaysOn />,


    <DateInput label='common.time.after' source="timeStart" alwaysOn />,


    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,




    <TextInput source="name" label="table.field.warehouse.name" />,


    <TextInput source="code" label="table.field.warehouse.code" />,


@@ -100,7 +98,7 @@


                        theme.transitions.create(['all'], {


                            duration: theme.transitions.duration.enteringScreen,


                        }),


                    marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,


                    marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,


                }}


                title={"menu.warehouse"}


                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}


@@ -127,7 +125,7 @@


                    <NumberField source="id" />


                    <TextField source="factory" label="table.field.warehouse.factory" />


                    <TextField source="name" label="table.field.warehouse.name" />


                    <TextField source="code" label="table.field.warehouse.code" />


                    {/* <TextField source="code" label="table.field.warehouse.code" /> */}


                    <TextField source="address" label="table.field.warehouse.address" />


                    <TextField source="longitude" label="table.field.warehouse.longitude" />


                    <TextField source="latgitude" label="table.field.warehouse.latgitude" />




 rsf-admin/src/page/container/ContainerCreate.jsx


@@ -36,7 +36,7 @@




    const translate = useTranslate();


    const notify = useNotify();




    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_ware_areas_type')) || [];


    const handleClose = (event, reason) => {


        if (reason !== "backdropClick") {


            setOpen(false);


@@ -84,7 +84,7 @@


                        </DialogTitle>


                        <DialogContent sx={{ mt: 2 }}>


                            <Grid container rowSpacing={2} columnSpacing={2}>


                                <Grid item xs={6} display="flex" gap={1}>


                                {/* <Grid item xs={6} display="flex" gap={1}>


                                    <TextInput


                                        label="table.field.container.code"


                                        source="code"


@@ -92,7 +92,7 @@


                                        autoFocus


                                        validate={required()}


                                    />


                                </Grid>


                                </Grid> */}


                                <Grid item xs={6} display="flex" gap={1}>


                                    <TextInput


                                        label="table.field.container.name"


@@ -101,10 +101,14 @@


                                    />


                                </Grid>


                                <Grid item xs={6} display="flex" gap={1}>


                                    <NumberInput


                                    <AutocompleteInput


                                        choices={dicts}


                                        optionText="label"


                                        label="table.field.container.typeId"


                                        source="typeId"


                                    />


                                        source="type"


                                        optionValue="value"


                                        parse={v => v}


                                        validate={[required()]} />


                                </Grid>


                                <Grid item xs={6} display="flex" gap={1}>


                                    <NumberInput


@@ -116,7 +120,7 @@


                                <Grid item xs={6} display="flex" gap={1}>


                                    <NumberInput


                                        label="table.field.container.lenght"


                                        source="lenght"


                                        source="length"


                                    />


                                </Grid>


                                <Grid item xs={6} display="flex" gap={1}>


@@ -156,10 +160,16 @@


                                    />


                                </Grid>


                                <Grid item xs={6} display="flex" gap={1}>


                                    <NumberInput


                                        label="table.field.container.panrentId"


                                    <ReferenceInput


                                        source="panrentId"


                                    />


                                        reference="container"


                                    >


                                        <AutocompleteInput


                                            label="table.field.container.panrentId"


                                            optionText="name"


                                            filterToQuery={(val) => ({ name: val })}


                                        />


                                    </ReferenceInput>


                                </Grid>


                                <Grid item xs={6} display="flex" gap={1}>


                                    <DateInput


@@ -173,7 +183,7 @@


                                        source="flagRycle"


                                        choices={[


                                            { id: 1, name: '是' },


                                            { id:  0, name: '否' },


                                            { id: 0, name: '否' },


                                        ]}


                                    />


                                </Grid>


@@ -183,7 +193,7 @@


                                        source="flagLogic"


                                        choices={[


                                            { id: 1, name: '是' },


                                            { id:  0, name: '否' },


                                            { id: 0, name: '否' },


                                        ]}


                                    />


                                </Grid>




 rsf-admin/src/page/container/ContainerEdit.jsx


@@ -42,6 +42,7 @@




const ContainerEdit = () => {


    const translate = useTranslate();


    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_ware_areas_type')) || [];




    return (


        <Edit


@@ -63,7 +64,7 @@


                        <Typography variant="h6" gutterBottom>


                            {translate('common.edit.title.main')}


                        </Typography>


                        <Stack direction='row' gap={2}>


                        {/* <Stack direction='row' gap={2}>


                            <TextInput


                                label="table.field.container.code"


                                source="code"


@@ -71,7 +72,7 @@


                                autoFocus


                                validate={required()}


                            />


                        </Stack>


                        </Stack> */}


                        <Stack direction='row' gap={2}>


                            <TextInput


                                label="table.field.container.name"


@@ -80,10 +81,14 @@


                            />


                        </Stack>


                        <Stack direction='row' gap={2}>


                            <NumberInput


                            <AutocompleteInput


                                choices={dicts}


                                optionText="label"


                                label="table.field.container.typeId"


                                source="typeId"


                            />


                                source="type"


                                optionValue="value"


                                parse={v => v}


                                validate={[required()]} />


                        </Stack>


                        <Stack direction='row' gap={2}>


                            <NumberInput


@@ -95,7 +100,7 @@


                        <Stack direction='row' gap={2}>


                            <NumberInput


                                label="table.field.container.lenght"


                                source="lenght"


                                source="length"


                            />


                        </Stack>


                        <Stack direction='row' gap={2}>


@@ -135,11 +140,19 @@


                            />


                        </Stack>


                        <Stack direction='row' gap={2}>


                            <NumberInput


                                label="table.field.container.panrentId"


                            <ReferenceInput


                                source="panrentId"


                            />


                                reference="container"


                            >


                                <AutocompleteInput


                                    label="table.field.container.panrentId"


                                    optionText="name"


                                    filterToQuery={(val) => ({ name: val })}


                                />


                            </ReferenceInput>




                        </Stack>




                        <Stack direction='row' gap={2}>


                            <DateInput


                                label="table.field.container.vaildTime"


@@ -152,7 +165,7 @@


                                source="flagRycle"


                                choices={[


                                    { id: 1, name: '是' },


                                    { id:  0, name: '否' },


                                    { id: 0, name: '否' },


                                ]}


                                validate={required()}


                            />


@@ -163,7 +176,7 @@


                                source="flagLogic"


                                choices={[


                                    { id: 1, name: '是' },


                                    { id:  0, name: '否' },


                                    { id: 0, name: '否' },


                                ]}


                                validate={required()}


                            />




 rsf-admin/src/page/container/ContainerList.jsx


@@ -79,13 +79,13 @@


    <SelectInput source="flagRycle" label="table.field.container.flagRycle"


        choices={[


            { id: 1, name: '是' },


            { id:  0, name: '否' },


            { id: 0, name: '否' },


        ]}


    />,


    <SelectInput source="flagLogic" label="table.field.container.flagLogic"


        choices={[


            { id: 1, name: '是' },


            { id:  0, name: '否' },


            { id: 0, name: '否' },


        ]}


    />,




@@ -116,7 +116,7 @@


                        theme.transitions.create(['all'], {


                            duration: theme.transitions.duration.enteringScreen,


                        }),


                    marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,


                    marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,


                }}


                title={"menu.container"}


                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}


@@ -143,9 +143,9 @@


                    <NumberField source="id" />


                    <TextField source="code" label="table.field.container.code" />


                    <TextField source="name" label="table.field.container.name" />


                    <NumberField source="typeId" label="table.field.container.typeId" />


                    <NumberField source="type" label="table.field.container.typeId" />


                    <NumberField source="used" label="table.field.container.used" />


                    <NumberField source="lenght" label="table.field.container.lenght" />


                    <NumberField source="length" label="table.field.container.lenght" />


                    <NumberField source="width" label="table.field.container.width" />


                    <NumberField source="height" label="table.field.container.height" />


                    <NumberField source="rstLen" label="table.field.container.rstLen" />




 rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx


@@ -91,7 +91,7 @@


            </DialogTitle>


            <DialogContent sx={{ mt: 2 }}>


              <Grid container rowSpacing={2} columnSpacing={2}>


                <Grid item xs={6} display="flex" gap={1}>


                {/* <Grid item xs={6} display="flex" gap={1}>


                  <TextInput


                    label="table.field.warehouseAreas.uuid"


                    source="uuid"


@@ -99,7 +99,7 @@


                    validate={[required()]}


                    autoFocus


                  />


                </Grid>


                </Grid> */}


                <Grid item xs={6} display="flex" gap={1}>


                  <TextInput


                    label="table.field.warehouseAreas.name"


@@ -117,20 +117,22 @@


                  />


                </Grid>


                <Grid item xs={6} display="flex" gap={1}>


                  <ReferenceInput source="shipperId" reference="shipper">


                  <ReferenceInput source="shipperId" reference="companys">


                    <AutocompleteInput


                      label="table.field.warehouseAreas.shipperId"


                      optionText="name"


                      validate={[required()]}


                      filterToQuery={(val) => ({ name: val })}


                    />


                  </ReferenceInput>


                </Grid>


                <Grid item xs={6} display="flex" gap={1}>


                  <NumberInput


                    label="table.field.warehouseAreas.supplierId"


                    source="supplierId"


                  />


                  <ReferenceInput source="supplierId" reference="companys">


                    <AutocompleteInput


                      label="table.field.warehouseAreas.supplierId"


                      optionText="name"


                      filterToQuery={(val) => ({ name: val })}


                    />


                  </ReferenceInput>


                </Grid>


                <Grid item xs={6} display="flex" gap={1}>


                  <SelectInput




 rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx


@@ -63,7 +63,7 @@


                        <Typography variant="h6" gutterBottom>


                            {translate('common.edit.title.main')}


                        </Typography>


                        <Stack direction='row' gap={2}>


                        {/* <Stack direction='row' gap={2}>


                            <TextInput


                                label="table.field.warehouseAreas.uuid"


                                source="uuid"


@@ -71,7 +71,7 @@


                                validate={[required()]}


                                autoFocus


                            />


                        </Stack>


                        </Stack> */}


                        <Stack direction='row' gap={2}>


                            <TextInput


                                label="table.field.warehouseAreas.name"


@@ -91,22 +91,27 @@


                        <Stack direction='row' gap={2}>


                            <ReferenceInput


                                source="shipperId"


                                reference="shipper"


                                reference="companys"


                                perPage={REFERENCE_INPUT_PAGESIZE}


                            >


                                <AutocompleteInput


                                    label="table.field.warehouseAreas.shipperId"


                                    optionText="name"


                                    validate={[required()]}


                                    filterToQuery={(val) => ({ name: val })}


                                />


                            </ReferenceInput>


                        </Stack>


                        <Stack direction='row' gap={2}>


                            <NumberInput


                                label="table.field.warehouseAreas.supplierId"


                            <ReferenceInput


                                source="supplierId"


                            />


                                reference="companys"


                            >


                                <AutocompleteInput


                                    label="table.field.warehouseAreas.supplierId"


                                    optionText="name"


                                    filterToQuery={(val) => ({ name: val })}


                                />


                            </ReferenceInput>


                        </Stack>


                        <Stack direction='row' gap={2}>


                            <SelectInput


@@ -115,7 +120,7 @@


                                validate={[required()]}


                                choices={[


                                    { id: 0, name: '否' },


                                    { id:  1, name: '是' },


                                    { id: 1, name: '是' },


                                ]}


                            />


                        </Stack>


@@ -126,7 +131,7 @@


                                validate={[required()]}


                                choices={[


                                    { id: 0, name: ' 否' },


                                    { id:  1, name: ' 是' },


                                    { id: 1, name: ' 是' },


                                ]}


                            />


                        </Stack>


@@ -137,7 +142,7 @@


                                validate={[required()]}


                                choices={[


                                    { id: 0, name: '否' },


                                    { id:  1, name: '是' },


                                    { id: 1, name: '是' },


                                ]}


                            />


                        </Stack>




 rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx


@@ -139,12 +139,13 @@


                    omit={['id', 'createTime', 'createBy', 'memo']}


                >


                    <NumberField source="id" />


                    <TextField source="uuid" label="table.field.warehouseAreas.uuid" />


                    {/* <TextField source="uuid" label="table.field.warehouseAreas.uuid" /> */}


                    <TextField source="name" label="table.field.warehouseAreas.name" />


                    <TextField source="code" label="table.field.warehouseAreas.code" />


                    <ReferenceField source="shipperId" label="table.field.warehouseAreas.shipperId" reference="shipper" link={false} sortable={false}>


                    {/* <ReferenceField source="shipperId" label="table.field.warehouseAreas.shipperId" reference="shipper" link={false} sortable={false}>


                        <TextField source="name" />


                    </ReferenceField>


                    </ReferenceField> */}


                    <TextField source="shipperId$" label="table.field.warehouseAreas.shipperId" />


                    <NumberField source="supplierId" label="table.field.warehouseAreas.supplierId" />


                    <TextField source="flagMinus$" label="table.field.warehouseAreas.flagMinus" sortable={false} />


                    <TextField source="flagLabelMange$" label="table.field.warehouseAreas.flagLabelMange" sortable={false} />