diff --git a/src/pages/ProofCreate_FromApp/ProofForm.js b/src/pages/ProofCreate_FromApp/ProofForm.js index 442cf2d..f74c9b7 100644 --- a/src/pages/ProofCreate_FromApp/ProofForm.js +++ b/src/pages/ProofCreate_FromApp/ProofForm.js @@ -34,8 +34,13 @@ const FormPanel = ({ formData }) => { const navigate = useNavigate() React.useEffect(() => { - if (formData) + if (formData){ setData(formData); + if(formData.groupType == "A"){ + setColumnPrice(ComboData.proofPrice[1]) + formData['length'] = 18; + } + } }, [formData]); const formik = useFormik({ @@ -153,7 +158,11 @@ const FormPanel = ({ formData }) => { fullWidth size="small" type="text" - onChange={formik.handleChange} + onChange={(event)=>{ + const value = event.target.value; + formik.setFieldValue("length", value); + formik.setFieldValue("fee", columnPrice.value*value); + }} name="noOfPages" value={formik.values["noOfPages"]} variant="outlined" diff --git a/src/pages/ProofCreate_FromApp/index.js b/src/pages/ProofCreate_FromApp/index.js index af1a6d1..94deb29 100644 --- a/src/pages/ProofCreate_FromApp/index.js +++ b/src/pages/ProofCreate_FromApp/index.js @@ -46,6 +46,8 @@ const Index = () => { responseData.data["issueNoStr"] = responseData.data.issueVolume+"/"+responseData.data.issueYear+" No. "+responseData.data.issueNo responseData.data["issueDate"] = DateUtils.dateStr(responseData.data.issueDate); + + responseData.data["groupType"] = responseData.data.groupNo.charAt(0); setRecord(responseData.data); } }); diff --git a/src/pages/ProofSearch/DataGrid.js b/src/pages/ProofSearch/DataGrid.js index 5a6ff79..e71453e 100644 --- a/src/pages/ProofSearch/DataGrid.js +++ b/src/pages/ProofSearch/DataGrid.js @@ -17,7 +17,7 @@ export default function SearchPublicNoticeTable({ recordList }) { }, [recordList]); const handleEditClick = (params) => () => { - navigate('/application/'+ params.id); + navigate('/application/'+ params.row.appId); };