Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

lbq

22 小时以前 912b4dab5f847ab1108b18df1b5e06e85c71881e

 rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx

@@ -47,6 +47,7 @@
import WarehouseAreaField from "./WarehouseAreaField";
import CrossZoneAreaField from "./CrossZoneAreaField";
import ContainerTypesField from "./ContainerTypesField";
import ChipArrayField from '@/page/components/ChipArrayField';

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
@@ -160,9 +161,18 @@
                        render={record => record.inAble === 1 ? '是' : '否'}
                    />
                    <WrapperField cellClassName="crossZoneArea" label="table.field.basStation.crossZoneArea">
                        <CrossZoneAreaField
                        {/* <CrossZoneAreaField
                            open={areaFieldDialog}
                            setOpen={setAreaFieldDialog}
                        /> */}

                        <ChipArrayField
                            source="areaIds"
                            apiEndpoint="/warehouseAreas/many/{ids}"
                            labelField="name"
                            dialogTitle={translate('table.field.basStation.crossZoneArea')}
                            initialDisplayCount={1}
                            placeholderText="{count} 个区域"
                        />
                    </WrapperField>
                    <FunctionField
@@ -171,9 +181,13 @@
                        render={record => record.inAble === 1 ? '是' : '否'}
                    />
                    <WrapperField cellClassName="containerType" label="table.field.basStation.containerType">
                        <ContainerTypesField
                            open={areaFieldDialog2}
                            setOpen={setAreaFieldDialog2}
                        <ChipArrayField
                            source="containerTypes$"
                            apiEndpoint="/dictData/many/{ids}"
                            labelField="label"
                            dialogTitle={translate('table.field.basStation.containerType')}
                            initialDisplayCount={1}
                            placeholderText="{count} 个区域"
                        />
                    </WrapperField>
                    <FunctionField