Merge branch 'front' into devlop

skyouc

2025-03-19 5ddf26e390c8ba6e35dfbf93502c9a46f1bc356c

Merge branch 'front' into devlop

 rsf-admin/src/App.jsx

@@ -28,7 +28,7 @@
  DATA_PROVIDER_SPRING,
} from "./config/setting";
import ResourceContent from "./page/ResourceContent";
import { getSystemInfo, getSystemDicts } from "@/api/auth";
import { getSystemInfo, getSystemDicts, tenants } from "@/api/auth";

const i18nProvider = polyglotI18nProvider(
  (locale) => {
@@ -62,6 +62,9 @@
    getSystemInfo().then((data) => {
      localStorage.setItem("system", JSON.stringify(data));
    })
    getSystemDicts().then(data => {
      localStorage.setItem('sys_dicts', JSON.stringify(data));
    })
  }, []);

  return (

 rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx

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

    const translate = useTranslate();
    const notify = useNotify();
    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_companys_type')) || [];

    const handleClose = (event, reason) => {
        if (reason !== "backdropClick") {
@@ -84,14 +85,14 @@
                        </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.companys.code"
                                        source="code"
                                        parse={v => v}
                                        autoFocus
                                    />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.companys.name"
@@ -114,12 +115,14 @@
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                    <AutocompleteInput
                                        choices={dicts}
                                        optionText="label"
                                        label="table.field.companys.type"
                                        source="type"
                                        optionValue="value"
                                        parse={v => v}
                                        validate={required()}
                                    />
                                        validate={[required()]} />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput

 rsf-admin/src/page/basicInfo/companys/CompanysEdit.jsx

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

const CompanysEdit = () => {
    const translate = useTranslate();
    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_companys_type')) || [];

    return (
        <Edit
@@ -63,14 +64,14 @@
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.main')}
                        </Typography>
                        <Stack direction='row' gap={2}>
                        {/* <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.companys.code"
                                source="code"
                                parse={v => v}
                                autoFocus
                            />
                        </Stack>
                        </Stack> */}
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.companys.name"
@@ -93,12 +94,14 @@
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                            <AutocompleteInput
                                choices={dicts}
                                optionText="label"
                                label="table.field.companys.type"
                                source="type"
                                optionValue="value"
                                parse={v => v}
                                validate={required()}
                            />
                                validate={[required()]} />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput

 rsf-admin/src/page/basicInfo/companys/CompanysList.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="code" label="table.field.companys.code" />,
    <TextInput source="name" label="table.field.companys.name" />,
@@ -103,7 +101,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.companys"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
@@ -128,7 +126,7 @@
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.companys.code" />
                    {/* <TextField source="code" label="table.field.companys.code" /> */}
                    <TextField source="name" label="table.field.companys.name" />
                    <TextField source="nameEn" label="table.field.companys.nameEn" />
                    <TextField source="breifCode" label="table.field.companys.breifCode" />

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

@@ -67,13 +67,14 @@
        'status': null
    });

    const { selectedIds } = useListContext();
    const { selectedIds, onUnselectItems } = useListContext();

    const handleClose = (event, reason) => {
        if (reason !== "backdropClick") {
            setOpen(false);
            reset()
            refresh();
            onUnselectItems()
        }
    };

@@ -150,7 +151,7 @@
                                    label={translate("table.field.loc.type")}
                                    name="type"
                                    value={formData.type}
                                    onChange={(e) => handleChange(+e.target.value, 'type')}
                                    onChange={(e) => handleChange(e.target.value, 'type')}
                                    size="small"
                                    dictTypeCode="sys_loc_type"
                                />

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

@@ -65,13 +65,14 @@
        'status': null
    });

    const { selectedIds } = useListContext();
    const { selectedIds, onUnselectItems } = useListContext();

    const handleClose = (event, reason) => {
        if (reason !== "backdropClick") {
            setOpen(false);
            reset()
            refresh();
            onUnselectItems()
        }
    };


 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 dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_container_type')) || [];
    const handleClose = (event, reason) => {
        if (reason !== "backdropClick") {
            setOpen(false);

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

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

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

    return (
        <Edit

 rsf-admin/src/page/container/ContainerList.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="code" label="table.field.container.code" />,
    <TextInput source="name" label="table.field.container.name" />,
@@ -141,7 +139,7 @@
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.container.code" />
                    {/* <TextField source="code" label="table.field.container.code" /> */}
                    <TextField source="name" label="table.field.container.name" />
                    <NumberField source="type" label="table.field.container.typeId" />
                    <NumberField source="used" label="table.field.container.used" />

 rsf-admin/src/page/contract/ContractList.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="code" label="table.field.contract.code" />,
    <TextInput source="name" label="table.field.contract.name" />,
@@ -94,7 +92,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.contract"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}

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

@@ -117,7 +117,7 @@
                  />
                </Grid>
                <Grid item xs={6} display="flex" gap={1}>
                  <ReferenceInput source="shipperId" reference="companys">
                  <ReferenceInput source="shipperId" reference="companys" filter={{ type: 'shipper' }}>
                    <AutocompleteInput
                      label="table.field.warehouseAreas.shipperId"
                      optionText="name"
@@ -126,7 +126,7 @@
                  </ReferenceInput>
                </Grid>
                <Grid item xs={6} display="flex" gap={1}>
                  <ReferenceInput source="supplierId" reference="companys">
                  <ReferenceInput source="supplierId" reference="companys" filter={{ type: 'supplier' }}>
                    <AutocompleteInput
                      label="table.field.warehouseAreas.supplierId"
                      optionText="name"

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

@@ -93,6 +93,7 @@
                                source="shipperId"
                                reference="companys"
                                perPage={REFERENCE_INPUT_PAGESIZE}
                                filter={{ type: 'shipper' }}
                            >
                                <AutocompleteInput
                                    label="table.field.warehouseAreas.shipperId"
@@ -105,6 +106,7 @@
                            <ReferenceInput
                                source="supplierId"
                                reference="companys"
                                filter={{ type: 'supplier' }}
                            >
                                <AutocompleteInput
                                    label="table.field.warehouseAreas.supplierId"