diff --git a/src/components/cards/AuthFooter.js b/src/components/cards/AuthFooter.js index 9bcf2bd..304e729 100644 --- a/src/components/cards/AuthFooter.js +++ b/src/components/cards/AuthFooter.js @@ -7,7 +7,7 @@ const AuthFooter = () => { const matchDownSM = useMediaQuery((theme) => theme.breakpoints.down('sm')); return ( - + { return ( - - + +
申請公共啟事 @@ -121,110 +121,107 @@ const PublicNoticeApplyForm = ({loadedData, selections}) => { {/* 申請公共啟事 */} -
- - - - {FieldUtils.getTextField({ - label:"聯絡人:", - valueName:"contactPerson", - form: formik - })} - - - {FieldUtils.getPhoneField({ - label:"聯繫電話:", - valueName:{ - code: "tel_countryCode", - num:"phoneNumber" - }, - form: formik - })} - - - {FieldUtils.getPhoneField({ - label:"聯繫傳真:", - valueName:{ - code: "fax_countryCode", - num:"faxNumber" - }, - form: formik - })} - - - - - - 目標期數: - - - - { - selections - } - - - - - - - - - - 犒件檔案 ({"檔案大小應<10MB"}): - - - {attachment.name} - - - { - readFile(event) - }} - /> - - - - - - - {FieldUtils.getTextArea({ - label:"備註:", - valueName:"remarks", - form: formik - })} - - - -
- -
-
- + + + + + + {FieldUtils.getTextField({ + label:"聯絡人:", + valueName:"contactPerson", + form: formik + })} + + + {FieldUtils.getPhoneField({ + label:"聯繫電話:", + valueName:{ + code: "tel_countryCode", + num:"phoneNumber" + }, + form: formik + })} + + + {FieldUtils.getPhoneField({ + label:"聯繫傳真:", + valueName:{ + code: "fax_countryCode", + num:"faxNumber" + }, + form: formik + })} + + + + + 目標期數: + + + + { + selections + } + + + + + + + + 犒件檔案 ({"檔案大小應<10MB"}): + + + { + readFile(event) + }} + /> + + + + {attachment.name} + + + + + {FieldUtils.getTextArea({ + label:"備註:", + valueName:"remarks", + form: formik + })} + + +
+ +
+
+
+ +
-
setIsWarningPopUp(false)} > 注意 diff --git a/src/utils/FieldUtils.js b/src/utils/FieldUtils.js index c683e03..fb43853 100644 --- a/src/utils/FieldUtils.js +++ b/src/utils/FieldUtils.js @@ -1,6 +1,6 @@ import { - Grid, TextField + Grid, TextField, Stack } from '@mui/material'; import Combo from "./Combo"; @@ -29,73 +29,68 @@ export const getDateField = ({ label, valueName, form, disabled }) => { } export const getTextField = ({ label, valueName, form, disabled }) => { - return - - - {label} - - - {initField({ - type: "text", - valueName: valueName, - form: form, - disabled: disabled - })} - - - ; + return + + {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 - })} - - - ; + return + + {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 - })} - - - {initField({ - type: "tel", - valueName: valueName.num, - form: form, - disabled: 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 + })} + + + ; } @@ -183,7 +178,7 @@ export const getComboField = ({ label, dataList, valueName, form, disabled, getO ; } -export const initField = ({ type, valueName, form, disabled, multiline, placeholder, inputProps, ...props }) => { +export const initField = ({ type, valueName, form, disabled, multiline, placeholder, inputProps,width, ...props }) => { let err = Boolean(form.errors[valueName]); return