#

luxiaotao1123

2024-09-09 a9c3bd7c2281850752731428dbb2cfc466b9aa51

#

 zy-acs-flow/src/i18n/en.js

@@ -139,7 +139,7 @@
                phone: "phone",
                email: "email",
                emailVerified: "email verified",
                deptId: "deptId",
                deptId: "department",
                realName: "real name",
                idCard: "idCard",
                birthday: "birthday",

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

@@ -93,13 +93,13 @@
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.user.password"
                                        source="password"
                                        parse={v => v}
                                    />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.user.nickname"
@@ -107,13 +107,13 @@
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.user.avatar"
                                        source="avatar"
                                        parse={v => v}
                                    />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.user.code"
@@ -146,7 +146,7 @@
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <SelectInput
                                        label="table.field.user.emailVerified"
                                        source="emailVerified"
@@ -155,7 +155,7 @@
                                            { id: 1, name: '是' },
                                        ]}
                                    />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="deptId"

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

@@ -71,36 +71,32 @@
                                autoFocus
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            {/* <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.user.password"
                                source="password"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                        </Stack> */}
                            <TextInput
                                label="table.field.user.nickname"
                                source="nickname"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                        {/* <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.user.avatar"
                                source="avatar"
                                parse={v => v}
                            />
                        </Stack>
                        </Stack> */}
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.user.code"
                                source="code"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <SelectInput
                                label="table.field.user.sex"
                                source="sex"
@@ -117,15 +113,13 @@
                                source="phone"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.user.email"
                                source="email"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                        {/* <Stack direction='row' gap={2}>
                            <SelectInput
                                label="table.field.user.emailVerified"
                                source="emailVerified"
@@ -134,7 +128,7 @@
                                    { id: 1, name: '是' },
                                ]}
                            />
                        </Stack>
                        </Stack> */}
                        <Stack direction='row' gap={2}>
                            <ReferenceInput
                                source="deptId"
@@ -152,8 +146,6 @@
                                source="realName"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.user.idCard"
                                source="idCard"
@@ -166,8 +158,6 @@
                                source="birthday"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.user.introduction"
                                source="introduction"

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

@@ -138,25 +138,21 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <UserPanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'memo']}
                    omit={['id', 'birthday', 'updateTime', 'createTime', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="username" label="table.field.user.username" />
                    <TextField source="password" label="table.field.user.password" />
                    <TextField source="nickname" label="table.field.user.nickname" />
                    <TextField source="avatar" label="table.field.user.avatar" />
                    <TextField source="code" label="table.field.user.code" />
                    <TextField source="sex$" label="table.field.user.sex" sortable={false} />
                    <TextField source="phone" label="table.field.user.phone" />
                    <TextField source="email" label="table.field.user.email" />
                    <TextField source="emailVerified$" label="table.field.user.emailVerified" sortable={false} />
                    <ReferenceField source="deptId" label="table.field.user.deptId" reference="dept" link={false}>
                        <TextField source="name" />
                    </ReferenceField>
                    <TextField source="realName" label="table.field.user.realName" />
                    <TextField source="idCard" label="table.field.user.idCard" />
                    <TextField source="birthday" label="table.field.user.birthday" />
                    <TextField source="introduction" label="table.field.user.introduction" />

                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <DateField source="createTime" label="common.field.createTime" showTime />

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

@@ -48,12 +48,6 @@
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.user.password" 
                                property={record.password}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.user.nickname" 
                                property={record.nickname}
                            />