-
- Verified:
-
+
+
+
+ {FieldUtils.getTextField({
+ label: "Username:",
+ valueName: "username",
+ disabled: true,
+ form: formik
+ })}
+
+
+ {FieldUtils.getTextField({
+ label: "Name:",
+ valueName: "contactPerson",
+ disabled: (!editMode),
+ form: formik
+ })}
+
- {
- currentUserData.verifiedBy || editMode ?
-
- {FieldUtils.initField({
- valueName: "verifiedStatus",
- disabled: true,
- form: formik,
- })}
-
- :
- <>
-
- {FieldUtils.initField({
- valueName: "verifiedStatus",
- disabled: true,
- form: formik,
- })}
-
-
-
-
-
- }
+
+ {FieldUtils.getTextField({
+ label: "Created Date:",
+ valueName: "createDate",
+ disabled: true,
+ form: formik
+ })}
+
+
+ {FieldUtils.getTextField({
+ label: "Email:",
+ valueName: "emailBus",
+ disabled: (!editMode),
+ form: formik
+ })}
-
- {FieldUtils.getTextField({
- label: "Last Login:",
- valueName: "lastLoginDate",
- disabled: true,
- form: formik
- })}
+
+ {FieldUtils.getPhoneField({
+ label: "Contact Tel:",
+ valueName: {
+ code: "tel_countryCode",
+ num: "phoneNumber"
+ },
+ disabled: (!editMode),
+ form: formik
+ })}
+
-
+
+ {FieldUtils.getTextField({
+ label: "Last Updated:",
+ valueName: "modifieDate",
+ disabled: true,
+ form: formik
+ })}
+
-
-
-
- Status:
-
- {
- editMode ?
-
- {FieldUtils.initField({
- valueName: "status",
- disabled: true,
- form: formik,
- })}
-
- :
- <>
-
-
+
+ {FieldUtils.getComboField({
+ label: "Organization:",
+ valueName: "orgId",
+ disabled: (!editMode),
+ dataList: orgData,
+ filterOptions: (options, state) => {
+ if (!state || !state.inputValue) return options;
+ let searchStr = state.inputValue.toLowerCase().toLowerCase().trim();
+ const displayOptions = options.filter((option) => {
+ let brNo = option.brNo.toLowerCase().trim();
+ let enCompanyName = option.enCompanyName ? option.enCompanyName.toLowerCase().trim() : "";
+ let chCompanyName = option.chCompanyName ? option.chCompanyName.toLowerCase().trim() : "";
+ return brNo.includes(searchStr) || enCompanyName.includes(searchStr) || chCompanyName.includes(searchStr);
+ },
+ );
+ return displayOptions;
+ },
+ getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ? item["brNo"] + "-" + item["enCompanyName"] : "") : "",
+ isOptionEqualToValue: (option, newValue, setValue, setInputValue) => {
+ if (option.id == newValue) {
+ setValue(option);
+ setInputValue(option["brNo"] + "-" + option["enCompanyName"]);
+ return true;
+ }
+ return option == newValue;
+ },
+ onInputChange: (event, newValue, setInputValue) => {
+ if (newValue != null) {
+ setInputValue(newValue);
+ }
+ },
+ onChange: (event, newValue) => {
+ if (newValue == null) {
+ formik.setFieldValue("orgId", "");
+ return;
+ }
+ formik.setFieldValue("orgId", newValue.id);
+ },
+ form: formik
+ })}
+
+
+
+
+
+ Verified:
+
+
+ {
+ currentUserData.verifiedBy || editMode ?
+
{FieldUtils.initField({
- valueName: "status",
+ valueName: "verifiedStatus",
disabled: true,
form: formik,
})}
-
- {formik.values.locked ?
-
-
+ :
+ <>
+
+ {FieldUtils.initField({
+ valueName: "verifiedStatus",
+ disabled: true,
+ form: formik,
+ })}
- :
-
+
- }
+
+ }
-
- }
+
+
+
+ {FieldUtils.getTextField({
+ label: "Last Login:",
+ valueName: "lastLoginDate",
+ disabled: true,
+ form: formik
+ })}
+
+
+
+
+
+ Status:
+
+ {
+ editMode ?
+
+ {FieldUtils.initField({
+ valueName: "status",
+ disabled: true,
+ form: formik,
+ })}
+
+ :
+ <>
+
+
+ {FieldUtils.initField({
+ valueName: "status",
+ disabled: true,
+ form: formik,
+ })}
+
+
+ {formik.values.locked ?
+
+
+
+ :
+
+
+
+ }
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+ Organization
+
+
+
+
+
+
+
-
-
-
- Organization
-
+
+ {FieldUtils.getTextField({
+ label: "Org.Name (English):",
+ valueName: "enCompanyName",
+ disabled: (!editMode),
+ form: formik
+ })}
-
-
+
+ {FieldUtils.getTextField({
+ label: "Org.Name (Chinese):",
+ valueName: "chCompanyName",
+ disabled: (!editMode),
+ form: formik
+ })}
+
+
+
+ {FieldUtils.getTextField({
+ label: "BR No.:",
+ valueName: "brNo",
+ disabled: (!editMode),
+ form: formik
+ })}
+
+
+
+ {FieldUtils.getComboField({
+ label: "Country:",
+ valueName: "country",
+ dataList: ComboData.country,
+ disabled: (!editMode),
+ form: formik
+ })}
-
-
- {FieldUtils.getTextField({
- label: "Org.Name (English):",
- valueName: "enCompanyName",
- disabled: (!editMode),
- form: formik
- })}
-
- {FieldUtils.getTextField({
- label: "Org.Name (Chinese):",
- valueName: "chCompanyName",
- disabled: (!editMode),
- form: formik
- })}
-
- {FieldUtils.getTextField({
- label: "BR No.:",
- valueName: "brNo",
- disabled: (!editMode),
- form: formik
- })}
-
- {FieldUtils.getComboField({
- label: "Country:",
- valueName: "country",
- dataList: ComboData.country,
- disabled: (!editMode),
- form: formik
- })}
-
- {FieldUtils.getPhoneField({
- label: "Fax No.:",
- valueName: {
- code: "fax_countryCode",
- num: "faxNumber"
- },
- disabled: (!editMode),
- form: formik
- })}
-
- {FieldUtils.getDateField({
- label: "BR Expiry Date.:",
- valueName: "brExpiryDate",
- disabled: (!editMode),
- form: formik
- })}
-
- {FieldUtils.getAddressField({
- label: "Address:",
- valueName: ["addressLine1", "addressLine2", "addressLine3"],
- disabled: (!editMode),
- form: formik
- })}
-
- {FieldUtils.getComboField({
- label: "District:",
- valueName: "district",
- dataList: ComboData.district,
- disabled: (!editMode),
- form: formik
- })}
+
+ {FieldUtils.getPhoneField({
+ label: "Fax No.:",
+ valueName: {
+ code: "fax_countryCode",
+ num: "faxNumber"
+ },
+ disabled: (!editMode),
+ form: formik
+ })}
+
+
+ {FieldUtils.getDateField({
+ label: "BR Expiry Date.:",
+ valueName: "brExpiryDate",
+ disabled: (!editMode),
+ form: formik
+ })}
+
+
+ {FieldUtils.getAddressField({
+ label: "Address:",
+ valueName: ["addressLine1", "addressLine2", "addressLine3"],
+ disabled: (!editMode),
+ form: formik
+ })}
+
+
+ {FieldUtils.getComboField({
+ label: "District:",
+ valueName: "district",
+ dataList: ComboData.district,
+ disabled: (!editMode),
+ form: formik
+ })}
+
-
+
@@ -533,8 +556,8 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
{confirmText}
-
-
+
+
diff --git a/src/pages/pnspsUserDetailPage_Organization/index.js b/src/pages/pnspsUserDetailPage_Organization/index.js
index 3cb6e13..a03c6b6 100644
--- a/src/pages/pnspsUserDetailPage_Organization/index.js
+++ b/src/pages/pnspsUserDetailPage_Organization/index.js
@@ -85,7 +85,7 @@ const UserMaintainPage_Organization = () => {
:
- Organization User
+ Organization User Details
{/*col 1*/}
diff --git a/src/utils/FieldUtils.js b/src/utils/FieldUtils.js
index fb43853..295ac70 100644
--- a/src/utils/FieldUtils.js
+++ b/src/utils/FieldUtils.js
@@ -5,103 +5,98 @@ import {
import Combo from "./Combo";
-export const notNullFieldLabel=(label)=>{
- return (<>{label}*)
+export const notNullFieldLabel = (label) => {
+ return (<>{label}*)
}
export const getDateField = ({ label, valueName, form, disabled }) => {
- return
-
-
- {label}
-
-
- {initField({
- type: "date",
- valueName: valueName,
- form: form,
- disabled: disabled
- })}
-
+ return
+
+ {label}
+
+
+ {initField({
+ type: "date",
+ valueName: valueName,
+ form: form,
+ disabled: disabled
+ })}
;
}
export const getTextField = ({ label, valueName, form, disabled }) => {
return
-
- {label}
-
-
- {initField({
- type: "text",
- valueName: valueName,
- form: form,
- disabled: disabled
- })}
-
- ;
+
+ {label}
+
+
+ {initField({
+ type: "text",
+ valueName: valueName,
+ form: form,
+ disabled: disabled
+ })}
+
+ ;
}
export const getTextArea = ({ label, valueName, form, disabled, ...props }) => {
return
-
- {label}
-
-
- {initField({
- type: "text",
- valueName: valueName,
- form: form,
- disabled: disabled,
- multiline: true,
- row: 10,
- minRows: 4,
- maxRows: 4,
- props
- })}
-
- ;
+
+ {label}
+
+
+ {initField({
+ type: "text",
+ valueName: valueName,
+ form: form,
+ disabled: disabled,
+ multiline: true,
+ row: 10,
+ minRows: 4,
+ maxRows: 4,
+ props
+ })}
+
+ ;
}
export const getPhoneField = ({ label, valueName, form, disabled }) => {
return
-
- {label}
-
-
-
- {initField({
- type: "tel",
- valueName: valueName.code,
- form: form,
- disabled: disabled,
- width:'25%'
- })}
- {initField({
- type: "tel",
- valueName: valueName.num,
- form: form,
- disabled: disabled
- })}
-
-
- ;
+
+ {label}
+
+
+
+ {initField({
+ type: "tel",
+ valueName: valueName.code,
+ form: form,
+ disabled: disabled,
+ width: '25%'
+ })}
+ {initField({
+ type: "tel",
+ valueName: valueName.num,
+ form: form,
+ disabled: disabled
+ })}
+
+
+ ;
}
export const getAddressField = ({ label, valueName, form, disabled }) => {
- return
-
-
+ return
+
{label}
-
+
{initField({
type: "text",
@@ -127,18 +122,15 @@ export const getAddressField = ({ label, valueName, form, disabled }) => {
})}
-
- ;
+ ;
}
export const getComboField = ({ label, dataList, valueName, form, disabled, getOptionLabel, onInputChange, onChange, filterOptions, ...props }) => {
- return
-
-
+ return
+
{label}
-
+
- {/* option?(displayField?option[displayField]:option):""}
- onChange={(e, val) => {
- console.log(val);
- let v = val;
- if(valueKey){
- v = val[valueKey];
- }
- form.setFieldValue(key, v);
- }}
- renderInput={params => (
-
- )}
- /> */}
+
-
- ;
+ ;
}
-export const initField = ({ type, valueName, form, disabled, multiline, placeholder, inputProps,width, ...props }) => {
+export const initField = ({ type, valueName, form, disabled, multiline, placeholder, inputProps, width, ...props }) => {
let err = Boolean(form.errors[valueName]);
return