diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index 34672a5..9387a5e 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -69,7 +69,7 @@ const PublicNoticeApplyForm = ({loadedData, selections}) => { setIsWarningPopUp(true); return; } - console.log(values); + // console.log(values); HttpUtils.postWithFiles({ url: UrlUtils.POST_PUBLIC_NOTICE_APPLY, params: { @@ -89,6 +89,7 @@ const PublicNoticeApplyForm = ({loadedData, selections}) => { files: [attachment], onSuccess: function(){ navigate("/publicNotice"); + // location.reload(); } }); } @@ -134,15 +135,17 @@ const PublicNoticeApplyForm = ({loadedData, selections}) => { {FieldUtils.getTextField({ label:"聯絡人:", valueName:"contactPerson", - form: formik + form: formik, + disabled:true })} {FieldUtils.getPhoneField({ label:"聯繫電話:", + disabled:true, valueName:{ code: "tel_countryCode", - num:"phoneNumber" + num:"phoneNumber", }, form: formik })} @@ -150,9 +153,10 @@ const PublicNoticeApplyForm = ({loadedData, selections}) => { {FieldUtils.getPhoneField({ label:"聯繫傳真:", + disabled:true, valueName:{ code: "fax_countryCode", - num:"faxNumber" + num:"faxNumber", }, form: formik })} diff --git a/src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js b/src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js index 1fc3c93..518fa94 100644 --- a/src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js +++ b/src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js @@ -48,6 +48,12 @@ const ClientDetailCard = ( setCurrentApplicationDetailData(applicationDetailData.userData); if (!applicationDetailData.companyName1==null){ setCompanyName(applicationDetailData.companyName); + }else{ + const companyNameData ={ + enCompanyName:applicationDetailData.userData.enCompanyName, + chCompanyName:applicationDetailData.userData.chCompanyName + } + setCompanyName(companyNameData) } } }, [applicationDetailData]);