| @@ -5,8 +5,9 @@ import { | |||||
| } from "@mui/x-data-grid"; | } from "@mui/x-data-grid"; | ||||
| import { | import { | ||||
| Typography, Button | |||||
| Typography, Button, Grid | |||||
| }from '@mui/material'; | }from '@mui/material'; | ||||
| import MainCard from "../../components/MainCard"; | import MainCard from "../../components/MainCard"; | ||||
| import * as React from "react"; | import * as React from "react"; | ||||
| @@ -139,12 +140,15 @@ const ManageOrgUserPage = () => { | |||||
| return ( | return ( | ||||
| <MainCard elevation={0} border={false} content={false} > | <MainCard elevation={0} border={false} content={false} > | ||||
| <Typography variant="h5" sx={{mt: 3, ml: 3, mb: 1}}> | |||||
| 公司/機構用戶記錄 | |||||
| </Typography> | |||||
| <br/> | |||||
| <Grid container rowSpacing={4.5} columnSpacing={2.75}> | |||||
| <Grid item lg={12} sx={{mb: -2.25}}>Setting</Grid> | |||||
| <Grid item lg={12}> | |||||
| <Typography variant="h5" sx={{mt: 3, ml: 3, mb: 1}}> | |||||
| 公司/機構用戶記錄 | |||||
| </Typography> | |||||
| </Grid> | |||||
| <Grid item lg={12}> | |||||
| <DataGrid | <DataGrid | ||||
| rows={rows} | rows={rows} | ||||
| columns={columns} | columns={columns} | ||||
| @@ -158,6 +162,8 @@ const ManageOrgUserPage = () => { | |||||
| pageSizeOptions={[5, 10]} | pageSizeOptions={[5, 10]} | ||||
| autoHeight = {true} | autoHeight = {true} | ||||
| /> | /> | ||||
| </Grid> | |||||
| </Grid> | |||||
| </MainCard> | </MainCard> | ||||
| ); | ); | ||||
| }; | }; | ||||
| @@ -29,11 +29,11 @@ const UserInformationCard_Individual = ({formData,userFile, loadDataFun}) => { | |||||
| enName: yup.string().max(255).required('請輸入英文姓名'), | enName: yup.string().max(255).required('請輸入英文姓名'), | ||||
| chName: yup.string().max(255).required('請輸入中文姓名'), | chName: yup.string().max(255).required('請輸入中文姓名'), | ||||
| addressLine1: yup.string().max(255).required('請輸入第一行地址'), | addressLine1: yup.string().max(255).required('請輸入第一行地址'), | ||||
| addressLine2: yup.string().max(255), | |||||
| addressLine3: yup.string().max(255), | |||||
| addressLine2: yup.string().max(255).nullable(), | |||||
| addressLine3: yup.string().max(255).nullable(), | |||||
| emailAddress: yup.string().email('請輸入電郵格式').max(255).required('請輸入電郵'), | emailAddress: yup.string().email('請輸入電郵格式').max(255).required('請輸入電郵'), | ||||
| identification: yup.string().min(7,"請輸入證件號碼").required('請輸入證件號碼'), | identification: yup.string().min(7,"請輸入證件號碼").required('請輸入證件號碼'), | ||||
| checkDigit:yup.string().max(1).required('請輸入括號內的數字或字母'), | |||||
| checkDigit:yup.string().max(1).required('請輸入括號內的數字或字母').nullable(), | |||||
| idDocType: yup.string().max(255).required('請輸入證件類別'), | idDocType: yup.string().max(255).required('請輸入證件類別'), | ||||
| tel_countryCode: yup.string().min(3,'請輸入3位數字').required('請輸入國際區號'), | tel_countryCode: yup.string().min(3,'請輸入3位數字').required('請輸入國際區號'), | ||||
| fax_countryCode: yup.string().min(3,'請輸入3位數字'), | fax_countryCode: yup.string().min(3,'請輸入3位數字'), | ||||
| @@ -64,8 +64,8 @@ export default function UserTable_Individual({recordList}) { | |||||
| flex: 1, | flex: 1, | ||||
| }, | }, | ||||
| { | { | ||||
| id: 'contactTel', | |||||
| field: 'contactTel', | |||||
| id: 'mobileNumber', | |||||
| field: 'mobileNumber', | |||||
| headerName: 'Tel.', | headerName: 'Tel.', | ||||
| flex: 1, | flex: 1, | ||||
| valueGetter:(params)=>{ | valueGetter:(params)=>{ | ||||