From 964ebb449f6c4030507f06346c929e589dcfb878 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Fri, 8 Sep 2023 14:43:53 +0800
Subject: [PATCH] fix bug

---
 src/pages/ManageOrgUserPage/index.js          | 20 ++++++++++++-------
 .../UserInformationCard_Individual.js         |  6 +++---
 .../UserTable_Individual.js                   |  4 ++--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/pages/ManageOrgUserPage/index.js b/src/pages/ManageOrgUserPage/index.js
index 1af130b..826d1b5 100644
--- a/src/pages/ManageOrgUserPage/index.js
+++ b/src/pages/ManageOrgUserPage/index.js
@@ -5,8 +5,9 @@ import {
 } from "@mui/x-data-grid";
 
 import {
-     Typography, Button
+     Typography, Button, Grid
 }from '@mui/material';
+
 import MainCard from "../../components/MainCard";
 
 import * as React from "react";
@@ -139,12 +140,15 @@ const ManageOrgUserPage = () => {
 
     return (
         <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
                 rows={rows}
                 columns={columns}
@@ -158,6 +162,8 @@ const ManageOrgUserPage = () => {
                 pageSizeOptions={[5, 10]}
                 autoHeight = {true}
             />
+            </Grid>
+            </Grid>
         </MainCard>
     );
 };
diff --git a/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js b/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js
index 1f638c9..a5dd151 100644
--- a/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js
+++ b/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js
@@ -29,11 +29,11 @@ const UserInformationCard_Individual = ({formData,userFile, loadDataFun}) => {
             enName: yup.string().max(255).required('請輸入英文姓名'),
             chName: 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('請輸入電郵'),
             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('請輸入證件類別'),
             tel_countryCode: yup.string().min(3,'請輸入3位數字').required('請輸入國際區號'),
             fax_countryCode: yup.string().min(3,'請輸入3位數字'),
diff --git a/src/pages/pnspsUserSearchPage_Individual/UserTable_Individual.js b/src/pages/pnspsUserSearchPage_Individual/UserTable_Individual.js
index a619925..f2488fb 100644
--- a/src/pages/pnspsUserSearchPage_Individual/UserTable_Individual.js
+++ b/src/pages/pnspsUserSearchPage_Individual/UserTable_Individual.js
@@ -64,8 +64,8 @@ export default function UserTable_Individual({recordList}) {
             flex: 1,
         },
         {
-            id: 'contactTel',
-            field: 'contactTel',
+            id: 'mobileNumber',
+            field: 'mobileNumber',
             headerName: 'Tel.',
             flex: 1,
             valueGetter:(params)=>{