diff --git a/src/pages/Proof/Create_FromApp/ProofForm.js b/src/pages/Proof/Create_FromApp/ProofForm.js index 3dd7336..9516bf3 100644 --- a/src/pages/Proof/Create_FromApp/ProofForm.js +++ b/src/pages/Proof/Create_FromApp/ProofForm.js @@ -30,6 +30,9 @@ const FormPanel = ({ formData }) => { const [columnPrice, setColumnPrice] = React.useState(ComboData.proofPrice[0]); const [attachments, setAttachments] = React.useState([]); + const [checkCode, setCheckCode] = React.useState(""); + const [expectedCode, setExpectedCode] = React.useState(""); + const [wait, setWait] = React.useState(false); const [isWarningPopUp, setIsWarningPopUp] = React.useState(false); @@ -51,6 +54,7 @@ const FormPanel = ({ formData }) => { } setProofPaymentDeadlineMin(formData.proofPaymentDeadline); setReviseDeadlineMin(formData.reviseDeadline); + setExpectedCode(formData.groupNo.substr(1,formData.groupNo.length)+"-"+formData.issueNo+"-"+formData.issueVolume); } }, [formData]); @@ -104,6 +108,7 @@ const FormPanel = ({ formData }) => { } setAttachments(attachmentList); } + setCheckCode(responseData.data.check_code); setWait(false); }, onError: function () { @@ -284,6 +289,8 @@ const FormPanel = ({ formData }) => { recordList={attachments} setRecordList={setAttachments} showPageColumn={formik.values.groupType == "Private Bill"} + _checkCode={checkCode} + _expectedCode={expectedCode} /> diff --git a/src/pages/Proof/Create_FromApp/UploadFileTable.js b/src/pages/Proof/Create_FromApp/UploadFileTable.js index 8e1a114..e9b90df 100644 --- a/src/pages/Proof/Create_FromApp/UploadFileTable.js +++ b/src/pages/Proof/Create_FromApp/UploadFileTable.js @@ -16,15 +16,25 @@ import { } from '@mui/material'; // ==============================|| EVENT TABLE ||============================== // -export default function UploadFileTable({ recordList, setRecordList, showPageColumn }) { +export default function UploadFileTable({ recordList, setRecordList, showPageColumn, _checkCode, _expectedCode }) { const [rows, setRows] = React.useState(recordList); const [rowModesModel, setRowModesModel] = React.useState({}); const [showPage, setShowPage] = React.useState(false); + const [checkCode, setCheckCode] = React.useState(""); + const [expectedCode, setExpectedCode] = React.useState(""); // const theme = useTheme(); // const navigate = useNavigate() + useEffect(() => { + setCheckCode(_checkCode) + }, [_checkCode]); + + useEffect(() => { + setExpectedCode(_expectedCode) + }, [_expectedCode]); + useEffect(() => { setRows(recordList); // console.log(disableDelete); @@ -149,6 +159,16 @@ export default function UploadFileTable({ recordList, setRecordList, showPageCol return ; }, }, + { + id: 'check_code', + field: 'check_code', + headerName: 'File Code', + flex: 1, + hide: true, + renderCell: () => { + return expectedCode == checkCode?{checkCode}:
Warning, File Code not match.
File Code: {checkCode}
Expected Code: {expectedCode}
; + }, + }, { id: 'size', field: 'size', @@ -176,6 +196,7 @@ export default function UploadFileTable({ recordList, setRecordList, showPageCol disableColumnMenu disableColumnSelector hideFooter + getRowHeight={() => 'auto'} /> );