diff --git a/src/pages/Proof/Create_FromApp/ProofForm.js b/src/pages/Proof/Create_FromApp/ProofForm.js index 87c536c..476bfc9 100644 --- a/src/pages/Proof/Create_FromApp/ProofForm.js +++ b/src/pages/Proof/Create_FromApp/ProofForm.js @@ -28,9 +28,9 @@ const UploadFileTable = Loadable(React.lazy(() => import('./UploadFileTable'))); const proofFormInitialValues = { reviseDeadline: '', proofPaymentDeadline: '', - length: '', - noOfPages: '', - fee: '', + length: 0, + noOfPages: 0, + fee: 0, groupType: '' }; @@ -58,11 +58,18 @@ const FormPanel = ({ formData }) => { React.useEffect(() => { if (formData) { - setData(formData); + const normalizedFormData = { + ...formData, + length: formData.length ?? 0, + noOfPages: formData.noOfPages ?? 0, + fee: formData.fee ?? 0 + }; + if (formData.groupType == "Private Bill") { setColumnPrice(ComboData.proofPrice[1]) - formData['length'] = 18; + normalizedFormData['length'] = 18; } + setData(normalizedFormData); setProofPaymentDeadlineMin(formData.proofPaymentDeadline); setReviseDeadlineMin(formData.reviseDeadline); setExpectedCode(formData.groupNo.substr(1,formData.groupNo.length)+"-"+formData.issueNo+"-"+formData.issueYear.toString().substr(2, formData.issueYear.toString().length)); @@ -524,7 +531,7 @@ const FormPanel = ({ formData }) => { } }} > - Warning + Warning {warningText}