| @@ -58,7 +58,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { | |||||
| faxNumber: yup.string().min(8, displayErrorMsg('請輸入8位數字')).nullable(), | faxNumber: yup.string().min(8, displayErrorMsg('請輸入8位數字')).nullable(), | ||||
| brExpiryDate: yup.string().min(8).required(displayErrorMsg('請輸入商業登記證有效日期')), | brExpiryDate: yup.string().min(8).required(displayErrorMsg('請輸入商業登記證有效日期')), | ||||
| brNo: yup.string().required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(`請輸入有效商業登記證號碼`)), function (value) { | brNo: yup.string().required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(`請輸入有效商業登記證號碼`)), function (value) { | ||||
| var brNo_pattern = /[0-9]{8}-[0-9]{3}-(0[1-9]|1[012])-[0-9]{2}-[0-9A-Z]{1}/ | |||||
| var brNo_pattern = /[0-9]{8}/ | |||||
| if (value !== undefined) { | if (value !== undefined) { | ||||
| if (value.match(brNo_pattern)) { | if (value.match(brNo_pattern)) { | ||||
| return true | return true | ||||
| @@ -55,10 +55,10 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => { | |||||
| phoneNumber: yup.string().min(8, displayErrorMsg('請輸入有效聯絡電話')).required(displayErrorMsg('請輸入聯絡電話')), | phoneNumber: yup.string().min(8, displayErrorMsg('請輸入有效聯絡電話')).required(displayErrorMsg('請輸入聯絡電話')), | ||||
| faxNumber: yup.string().min(8).nullable(), | faxNumber: yup.string().min(8).nullable(), | ||||
| brExpiryDate: yup.string().min(8).required(displayErrorMsg('請輸入商業登記證有效日期')), | brExpiryDate: yup.string().min(8).required(displayErrorMsg('請輸入商業登記證有效日期')), | ||||
| brNo: yup.string().required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234-123-12-12-1)`)), function (value) { | |||||
| var brNo_pattern = /[0-9]{8}-[0-9]{3}-(0[1-9]|1[012])-[0-9]{2}-[0-9A-Z]{1}/ | |||||
| brNo: yup.string().max(8).required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234)`)), function (value) { | |||||
| var brNo_pattern = /[0-9]{8}/ | |||||
| if (value !== undefined) { | if (value !== undefined) { | ||||
| if (value.match(brNo_pattern)) { | |||||
| if (value.size==8 && value.match(brNo_pattern)) { | |||||
| return true | return true | ||||
| } else { | } else { | ||||
| return false | return false | ||||
| @@ -59,8 +59,8 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => | |||||
| phoneNumber: yup.string().min(8, displayErrorMsg('請輸入8位數字')).required(displayErrorMsg('請輸入聯絡電話')), | phoneNumber: yup.string().min(8, displayErrorMsg('請輸入8位數字')).required(displayErrorMsg('請輸入聯絡電話')), | ||||
| faxNumber: yup.string().min(8, displayErrorMsg('請輸入8位數字')).nullable(), | faxNumber: yup.string().min(8, displayErrorMsg('請輸入8位數字')).nullable(), | ||||
| brExpiryDate: yup.string().min(8, displayErrorMsg('請輸入商業登記證有效日期')), | brExpiryDate: yup.string().min(8, displayErrorMsg('請輸入商業登記證有效日期')), | ||||
| brNo: yup.string().required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234-123-12-12-1)`), function (value) { | |||||
| var brNo_pattern = /[0-9]{8}-[0-9]{3}-(0[1-9]|1[012])-[0-9]{2}-[0-9A-Z]{1}/ | |||||
| brNo: yup.string().max(8).required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234)`), function (value) { | |||||
| var brNo_pattern = /[0-9]{8}/ | |||||
| if (value !== undefined) { | if (value !== undefined) { | ||||
| if (value.match(brNo_pattern)) { | if (value.match(brNo_pattern)) { | ||||
| return true | return true | ||||
| @@ -526,8 +526,9 @@ const BusCustomFormWizard = (props) => { | |||||
| phone: yup.string().min(8, displayErrorMsg('請輸入最少8位數字')).required(displayErrorMsg('請輸入聯絡電話')), | phone: yup.string().min(8, displayErrorMsg('請輸入最少8位數字')).required(displayErrorMsg('請輸入聯絡電話')), | ||||
| fax: yup.string().min(8, displayErrorMsg('請輸入最少8位數字')), | fax: yup.string().min(8, displayErrorMsg('請輸入最少8位數字')), | ||||
| brExpiryDate: yup.date().min(new Date().toISOString().split("T")[0], displayErrorMsg('請輸入商業登記證有效日期')).max("2099-12-31", displayErrorMsg('請輸入商業登記證有效日期')).required(displayErrorMsg('請輸入商業登記證有效日期')), | brExpiryDate: yup.date().min(new Date().toISOString().split("T")[0], displayErrorMsg('請輸入商業登記證有效日期')).max("2099-12-31", displayErrorMsg('請輸入商業登記證有效日期')).required(displayErrorMsg('請輸入商業登記證有效日期')), | ||||
| brNo: yup.string().required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234-123-12-12-1)`), function (value) { | |||||
| var brNo_pattern = /[0-9]{8}-[0-9]{3}-(0[1-9]|1[012])-[0-9]{2}-[0-9A-Z]{1}/ | |||||
| brNo: yup.string().max(8).required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234)`), function (value) { | |||||
| // var brNo_pattern = /[0-9]{8}-[0-9]{3}-(0[1-9]|1[012])-[0-9]{2}-[0-9A-Z]{1}/ | |||||
| var brNo_pattern = /[0-9]{8}/ | |||||
| if (value !== undefined) { | if (value !== undefined) { | ||||
| if (value.match(brNo_pattern)) { | if (value.match(brNo_pattern)) { | ||||
| return true | return true | ||||
| @@ -834,7 +835,7 @@ const BusCustomFormWizard = (props) => { | |||||
| <Stack spacing={1}> | <Stack spacing={1}> | ||||
| <InputLabel htmlFor="brNo-signup" sx={{ whiteSpace: 'pre-wrap', wordWrap: 'break-word' }}> | <InputLabel htmlFor="brNo-signup" sx={{ whiteSpace: 'pre-wrap', wordWrap: 'break-word' }}> | ||||
| <Typography variant="pnspsFormHeader"> | <Typography variant="pnspsFormHeader"> | ||||
| 商業登記證號碼 (e.g. 12341234-123-12-12-1) | |||||
| 商業登記證號碼 (e.g. 12341234) | |||||
| <span style={{ color: '#f10000' }}>*</span> | <span style={{ color: '#f10000' }}>*</span> | ||||
| </Typography> | </Typography> | ||||
| </InputLabel> | </InputLabel> | ||||