#

luxiaotao1123

2024-09-14 2ac6ad1062319d1bfca94550097ace88d6df4a13

 zy-acs-flow/src/page/user/UserList.jsx

@@ -52,13 +52,26 @@
    '& .RaDatagrid-row': {
        cursor: 'auto'
    },
    '& .column-name': {
    '& .column-username': {
        maxWidth: '10em',
        overflow: 'hidden',
        textOverflow: 'ellipsis',
        whiteSpace: 'nowrap',
    },
    '& .column-nickname': {
        maxWidth: '10em',
        overflow: 'hidden',
        textOverflow: 'ellipsis',
        whiteSpace: 'nowrap',
    },
    '& .column-deptId': {
        maxWidth: '10em',
        overflow: 'hidden',
        textOverflow: 'ellipsis',
        whiteSpace: 'nowrap',
    },
    '& .opt': {
        width: 200
    },
    '& .column-deptId': {
        maxWidth: 80
    },
    '& .column-statusBool': {
        maxWidth: 60
@@ -71,7 +84,6 @@
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    <TextInput source="username" label="table.field.user.username" />,
    <TextInput source="password" label="table.field.user.password" />,
    <TextInput source="nickname" label="table.field.user.nickname" />,
    <TextInput source="code" label="table.field.user.code" />,
    <SelectInput source="sex" label="table.field.user.sex"
@@ -83,19 +95,11 @@
    />,
    <TextInput source="phone" label="table.field.user.phone" />,
    <TextInput source="email" label="table.field.user.email" />,
    <SelectInput source="emailVerified" label="table.field.user.emailVerified"
        choices={[
            { id: 0, name: '否' },
            { id: 1, name: '是' },
        ]}
    />,
    <ReferenceInput source="deptId" reference="dept">
        <AutocompleteInput label="table.field.user.deptId" optionText="name" />
    </ReferenceInput>,
    // <ReferenceInput source="deptId" label="table.field.user.deptId" reference="dept">
    //     <AutocompleteInput label="table.field.user.deptId" optionText="name" filterToQuery={(val) => ({ name: val })} />
    // </ReferenceInput>,
    <TextInput source="realName" label="table.field.user.realName" />,
    <TextInput source="idCard" label="table.field.user.idCard" />,
    <TextInput source="birthday" label="table.field.user.birthday" />,
    <TextInput source="introduction" label="table.field.user.introduction" />,

    <TextInput label="common.field.memo" source="memo" />,
    <SelectInput
@@ -146,11 +150,11 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <UserPanel />}
                    expandSingle={true}
                    omit={['id', 'email', 'idCard', 'birthday', 'updateTime', 'createTime', 'memo']}
                    omit={['id', 'email', 'idCard', 'birthday', 'realName', 'updateTime', 'createTime', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="username" label="table.field.user.username" />
                    <ReferenceField source="deptId" label="table.field.user.deptId" reference="dept" link={false}>
                    <ReferenceField source="deptId" label="table.field.user.deptId" reference="dept" link={false} sortable={false}>
                        <TextField source="name" />
                    </ReferenceField>
                    <TextField source="nickname" label="table.field.user.nickname" />
@@ -161,7 +165,7 @@
                    <TextField source="realName" label="table.field.user.realName" />
                    <TextField source="idCard" label="table.field.user.idCard" />
                    <TextField source="birthday" label="table.field.user.birthday" />
                    <RolesField source="roles" label="table.field.user.role" />
                    <RolesField source="roles" label="table.field.user.role" sortable={false} />
                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />