From a05e1a50492c4a7fd5b5e3ff5e13b61aa8a449ef Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Thu, 7 Sep 2023 15:36:47 +0800
Subject: [PATCH] update org user UI

---
 .../UserInformationCard_Organization.js       | 42 +++++++------------
 .../UserSearchForm_Organization.js            |  6 +--
 .../UserTable_Organization.js                 | 12 ++----
 3 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
index 9a8066e..9940827 100644
--- a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
+++ b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
@@ -26,8 +26,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun, orgData}) => {
         enableReinitialize:true,
         initialValues:currentUserData,
         validationSchema:yup.object().shape({
-            enName: yup.string().max(255).required('請輸入英文姓名'),
-            chName: yup.string().max(255),
+            contactPerson: yup.string().max(255).required('請輸入姓名'),
             enCompanyName: yup.string().max(255),
             chCompanyName: yup.string().max(255),
             addressLine1: yup.string().max(255).required('請輸入第一行地址'),
@@ -45,8 +44,6 @@ const UserInformationCard_Organization = ({userData, loadDataFun, orgData}) => {
             HttpUtils.post({
                 url: UrlUtils.POST_IND_USER+"/"+userData.id,
                 params: {
-                    chName: values.chName,
-                    enName: values.enName,
                     contactTel: {
                         countryCode: values.tel_countryCode,
                         phoneNumber: values.phoneNumber
@@ -206,8 +203,8 @@ const UserInformationCard_Organization = ({userData, loadDataFun, orgData}) => {
                 })}
 
                 {FieldUtils.getTextField({
-                    label:"English Name:",
-                    valueName:"enName",
+                    label:"Name:",
+                    valueName:"contactPerson",
                     disabled:(!editMode),
                     form: formik
                 })}
@@ -221,11 +218,11 @@ const UserInformationCard_Organization = ({userData, loadDataFun, orgData}) => {
 
 
                 {FieldUtils.getTextField({
-                    label:"Chinese Name:",
-                    valueName:"chName",
-                    disabled:(!editMode),
-                    form: formik
-                })}
+                        label:"Email:",
+                        valueName:"emailBus",
+                        disabled:(!editMode),
+                        form: formik
+                    })}
 
                 {FieldUtils.getPhoneField({
                     label:"Contact Tel:",
@@ -286,12 +283,6 @@ const UserInformationCard_Organization = ({userData, loadDataFun, orgData}) => {
                     })}
 
 
-                    {FieldUtils.getTextField({
-                        label:"Email:",
-                        valueName:"emailBus",
-                        disabled:(!editMode),
-                        form: formik
-                    })}
 
 
                         <Grid item lg={4}>
@@ -346,6 +337,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun, orgData}) => {
                         form: formik
                     })}
                         
+                        <Grid item lg={8}></Grid>
 
                         <Grid item lg={4}>
                             <Grid container alignItems={"center"}>
@@ -372,6 +364,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun, orgData}) => {
                                                 form: formik,
                                             })}
                                         </Grid>
+                                        
                                         {formik.values.locked?
                                         <Grid lg={1}>
                                         <Button
@@ -452,9 +445,10 @@ const UserInformationCard_Organization = ({userData, loadDataFun, orgData}) => {
                         form: formik
                     })}
 
-                    {FieldUtils.getTextField({
-                        label:"Contact Person:",
-                        valueName:"contactPerson",
+                    {FieldUtils.getComboField({
+                        label:"Country:",
+                        valueName:"country",
+                        dataList: ComboData.country,
                         disabled:(!editMode),
                         form: formik
                     })}
@@ -489,13 +483,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun, orgData}) => {
                         disabled:(!editMode),
                         form: formik})}
 
-                    {FieldUtils.getComboField({
-                        label:"Country:",
-                        valueName:"country",
-                        dataList: ComboData.country,
-                        disabled:(!editMode),
-                        form: formik
-                    })}
+
 
 </Grid>
                     </Grid>
diff --git a/src/pages/pnspsUserSearchPage_Organization/UserSearchForm_Organization.js b/src/pages/pnspsUserSearchPage_Organization/UserSearchForm_Organization.js
index 833a37a..6f0f11f 100644
--- a/src/pages/pnspsUserSearchPage_Organization/UserSearchForm_Organization.js
+++ b/src/pages/pnspsUserSearchPage_Organization/UserSearchForm_Organization.js
@@ -90,9 +90,9 @@ const UserSearchForm_Organization = ({applySearch}) => {
                     <Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>
                         <TextField
                             fullWidth
-                            {...register("fullenName")}
-                            id="fullenName"
-                            label="Full Name"
+                            {...register("contactPerson")}
+                            id="contactPerson"
+                            label="Name"
                         />
                     </Grid>
 
diff --git a/src/pages/pnspsUserSearchPage_Organization/UserTable_Organization.js b/src/pages/pnspsUserSearchPage_Organization/UserTable_Organization.js
index 7c1d550..5270895 100644
--- a/src/pages/pnspsUserSearchPage_Organization/UserTable_Organization.js
+++ b/src/pages/pnspsUserSearchPage_Organization/UserTable_Organization.js
@@ -53,15 +53,9 @@ export default function UserTable_Organization({recordList}) {
             flex: 1,
         },
         {
-            id: 'enName',
-            field: 'enName',
-            headerName: 'Name (Eng)',
-            flex: 1,
-        },
-        {
-            id: 'chName',
-            field: 'chName',
-            headerName: 'Name (Ch)',
+            id: 'contactPerson',
+            field: 'contactPerson',
+            headerName: 'Name',
             flex: 1,
         },
         {