diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
index 3209ded..d83449b 100644
--- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
+++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
@@ -72,7 +72,6 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
setIsWarningPopUp(true);
return;
}
- // console.log(values);
HttpUtils.postWithFiles({
url: UrlUtils.POST_PUBLIC_NOTICE_APPLY,
params: {
@@ -177,7 +176,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
id="issueId"
name="issueId"
defaultValue={issueId}
- onChange={(event)=>{
+ onChange={(event) => {
setIssueId(event.target.value);
}}
>
@@ -188,6 +187,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
+
{
size="large"
>{attachment ? "上傳檔案" : "重新上傳"}
-
+
{FieldUtils.getTextArea({
label: "備註:",
diff --git a/src/pages/PublicNotice/ApplyForm/index.js b/src/pages/PublicNotice/ApplyForm/index.js
index 24636d3..af41ca4 100644
--- a/src/pages/PublicNotice/ApplyForm/index.js
+++ b/src/pages/PublicNotice/ApplyForm/index.js
@@ -37,6 +37,7 @@ const ApplyForm = () => {
response["fax_countryCode"] = response?.contactFaxNo?.countryCode;
response["faxNumber"] = response?.contactFaxNo?.faxNumber;
response["issueId"] = response?.gazetteIssueList[0].id;
+ response["remarks"] = "";
var selection = [];
for (var i = 0; i < response?.gazetteIssueList?.length; i++) {
@@ -45,7 +46,6 @@ const ApplyForm = () => {
selection.push(} label={label} />);
}
setSelection(selection);
- console.log(response.issueId)
setUserData(response);
}
});
diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
index ce59f66..c255446 100644
--- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
@@ -506,7 +506,7 @@ const ApplicationDetailCard = (
備註:
- {currentApplicationDetailData.remarks}
+ {currentApplicationDetailData.remarks}
diff --git a/src/utils/FieldUtils.js b/src/utils/FieldUtils.js
index 945cd50..a8440b3 100644
--- a/src/utils/FieldUtils.js
+++ b/src/utils/FieldUtils.js
@@ -67,15 +67,7 @@ export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...p
}
export const getPhoneField = ({ label, valueName, form, disabled }) => {
- form.handleChange = (event) => {
- const value = event.target.value;
- const name = event.target.name;
- if (value.match(/[^0-9]/)) {
- return event.preventDefault();
- }
- if (valueName.code === name) form.setFieldValue(valueName.code, value)
- if (valueName.num === name) form.setFieldValue(valueName.num, value)
- }
+
return
@@ -88,13 +80,31 @@ export const getPhoneField = ({ label, valueName, form, disabled }) => {
valueName: valueName.code,
form: form,
disabled: disabled,
- width: '35%'
+ width: '35%',
+ handleChange: (event) => {
+ const value = event.target.value;
+ const name = event.target.name;
+ if (value.match(/[^0-9]/)) {
+ return event.preventDefault();
+ }
+ if (valueName.code === name) form.setFieldValue(valueName.code, value)
+ if (valueName.num === name) form.setFieldValue(valueName.num, value)
+ }
})}
{initField({
type: "tel",
valueName: valueName.num,
form: form,
- disabled: disabled
+ disabled: disabled,
+ handleChange: (event) => {
+ const value = event.target.value;
+ const name = event.target.name;
+ if (value.match(/[^0-9]/)) {
+ return event.preventDefault();
+ }
+ if (valueName.code === name) form.setFieldValue(valueName.code, value)
+ if (valueName.num === name) form.setFieldValue(valueName.num, value)
+ }
})}
@@ -160,7 +170,7 @@ export const getComboField = ({ label, dataList, valueName, form, disabled, getO
;
}
-export const initField = ({ type, valueName, form, disabled, multiline, placeholder, inputProps, width, ...props }) => {
+export const initField = ({ type, valueName, form, disabled, multiline, handleChange, placeholder, inputProps, width, ...props }) => {
let err = Boolean(form.errors[valueName]);
return