From e7466d7df589da981c375fa1286ff86594fef67f Mon Sep 17 00:00:00 2001 From: "cyril.tsui" Date: Tue, 24 Oct 2023 15:56:23 +0800 Subject: [PATCH] Fix en & ch name & must input fields (register - prepress doc p.1) --- .../auth-forms/BusCustomFormWizard.js | 37 +++++++++++++------ .../auth-forms/CustomFormWizard.js | 27 +++++++++----- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/pages/authentication/auth-forms/BusCustomFormWizard.js b/src/pages/authentication/auth-forms/BusCustomFormWizard.js index bdb4c56..6687149 100644 --- a/src/pages/authentication/auth-forms/BusCustomFormWizard.js +++ b/src/pages/authentication/auth-forms/BusCustomFormWizard.js @@ -136,8 +136,10 @@ const BusCustomFormWizard = (props) => { data.password !==""&& data.confirmPassword !==""&& data.password == data.confirmPassword&& - data.enCompanyName !==""&& + (data.enCompanyName !=="" || selectedAddress5 ==="內地")&& + data.chCompanyName !==""&& data.enName !==""&& + data.chName !==""&& data.address1 !==""&& data.email !==""&& data.emailConfirm !==""&& @@ -148,6 +150,7 @@ const BusCustomFormWizard = (props) => { fileList.length!==0&& data.captchaField&& data.brNo!==""&& + data.brExpiryDate!==""&& handlePassword(data.password)&& handleEmail(data.email)&& handlePhone(data.phone)&& @@ -433,6 +436,7 @@ const BusCustomFormWizard = (props) => { confirmPassword: yup.string().min(8,'請最少輸入8位密碼').required('請確認密碼').oneOf([yup.ref('password'), null], '請輸入相同密碼'), enName: yup.string().max(255).required('請輸入英文姓名'), enCompanyName: yup.string().max(255).required('請輸入英文名稱'), + chCompanyName: yup.string().max(255).required('請輸入中文名稱'), chName: yup.string().max(255).required('請輸入中文姓名'), address1: yup.string().max(255).required('請輸入第一行地址'), address2: yup.string().max(255).required('請輸入第二行地址'), @@ -443,7 +447,7 @@ const BusCustomFormWizard = (props) => { faxCountryCode: yup.string().min(2,'請輸入最少2位數字'), phone: yup.string().min(8,'請輸入最少8位數字').required('請輸入聯絡電話'), fax: yup.string().min(8,'請輸入最少8位數字'), - brExpiryDate: yup.string().min(8,'請輸入商業登記證有效日期'), + brExpiryDate: yup.string().min(8).required('請輸入商業登記證有效日期'), brNo: yup.string().min(8,'請輸入商業登記證號碼').required('請輸入商業登記證號碼'), captchaField: yup.string().required('請輸入驗證').oneOf([captcha], '請輸入有效驗證'), }) @@ -649,7 +653,7 @@ const BusCustomFormWizard = (props) => { 機構/公司英文名稱 - * + {selectedAddress5 === "內地" ? "" : *} { value={formik.values.enCompanyName} name="enCompanyName" onChange={formik.handleChange} - placeholder="與與商業登記證相同如有" + placeholder="與商業登記證相同" fullWidth - error={Boolean(formik.touched.enCompanyName && formik.errors.enCompanyName)} + error={Boolean(formik.touched.enCompanyName && formik.errors.enCompanyName && selectedAddress5 !== "內地")} onBlur={formik.handleBlur} + disabled={selectedAddress5 === "內地"} inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -669,7 +674,7 @@ const BusCustomFormWizard = (props) => { }, }} /> - {formik.touched.enCompanyName && formik.errors.enCompanyName && ( + {formik.touched.enCompanyName && formik.errors.enCompanyName && selectedAddress5 !== "內地" && ( {formik.errors.enCompanyName} @@ -678,7 +683,9 @@ const BusCustomFormWizard = (props) => { - 機構/公司中文名稱 + 機構/公司中文名稱 + * + { value={formik.values.chCompanyName.trim()} name="chCompanyName" onChange={formik.handleChange} - placeholder="與與商業登記證相同如有" + placeholder="與商業登記證相同" + onBlur={formik.handleBlur} inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -705,7 +713,9 @@ const BusCustomFormWizard = (props) => { - 商業登記證號碼 + 商業登記證號碼 + * + { name="brNo" onChange={formik.handleChange} onBlur={formik.handleBlur} - placeholder="與與商業登記證相同如有" + placeholder="與商業登記證相同" inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -733,7 +743,9 @@ const BusCustomFormWizard = (props) => { - 商業登記證有效日期 + 商業登記證有效日期 + * + { value={formik.values.brExpiryDate} name="brExpiryDate" onChange={formik.handleChange} - placeholder="與與商業登記證相同如有" + placeholder="與商業登記證相同" inputProps={{ min: new Date().toISOString().split("T")[0], onKeyDown: (e) => { @@ -836,6 +848,7 @@ const BusCustomFormWizard = (props) => { if(newValue=='香港'){ setCheckCountry(false) }else{ + if (newValue === "內地") formik.values.enCompanyName = "" setSelectedAddress4(""); setCheckCountry(true) } diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js index 452dda1..c60da33 100644 --- a/src/pages/authentication/auth-forms/CustomFormWizard.js +++ b/src/pages/authentication/auth-forms/CustomFormWizard.js @@ -132,7 +132,8 @@ const CustomFormWizard = (props) => { data.password == data.confirmPassword&& selectedIdDocType.type !==""&& data.idNo !==""&& - data.enName !==""&& + (data.enName !=="" || selectedAddress5 === "內地")&& + data.chName !==""&& data.address1 !==""&& data.email !==""&& data.emailConfirm !==""&& @@ -497,7 +498,7 @@ const CustomFormWizard = (props) => { const { values } = formik useEffect(() => { checkDataField(values) - }, [values]) + }, [values]) return ( @@ -731,7 +732,7 @@ const CustomFormWizard = (props) => { { 英文姓名 - * + {selectedAddress5 === "內地" ? "" : *} { onChange={formik.handleChange} placeholder="與你的身份證明文件相同" fullWidth - error={Boolean(formik.touched.enName && formik.errors.enName)} + error={Boolean(formik.touched.enName && formik.errors.enName && selectedAddress5 !== "內地")} onBlur={formik.handleBlur} + disabled={selectedAddress5 === "內地"} inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -840,7 +842,7 @@ const CustomFormWizard = (props) => { }, }} /> - {formik.touched.enName && formik.errors.enName && ( + {formik.touched.enName && formik.errors.enName && selectedAddress5 !== "內地" && ( {formik.errors.enName} @@ -849,7 +851,10 @@ const CustomFormWizard = (props) => { - 中文姓名 + + 中文姓名 + * + { name="chName" onChange={formik.handleChange} placeholder="與你的身份證明文件相同" + onBlur={formik.handleBlur} inputProps={{ maxLength: 6, onKeyDown: (e) => { @@ -952,6 +958,7 @@ const CustomFormWizard = (props) => { if(newValue=='香港'){ setCheckCountry(false) }else{ + if (newValue === "內地") formik.values.enName = "" setSelectedAddress4(""); setCheckCountry(true) } @@ -1193,7 +1200,7 @@ const CustomFormWizard = (props) => { - 身份證明文件 + 身份證明文件* 請上傳你的 有效身份證明文件 的數碼檔案，以驗證你的身份。 如: 香港身份證; 護照; 中國內地身份證; 專業執業証書等 @@ -1280,10 +1287,10 @@ const CustomFormWizard = (props) => { * - + - + {onCaptchaChange()}}>