From ccdd568261cdd4c4d5733db7ea016c937068227f Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Mon, 20 Nov 2023 11:53:07 +0800 Subject: [PATCH] update group tilile --- src/pages/Proof/Create_FromApp/ProofForm.js | 2 +- src/pages/Proof/Create_FromApp/index.js | 2 +- .../PublicNotice/Details_GLD/ApplicationDetailCard.js | 2 +- src/utils/ComboData.js | 11 ++++++----- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/pages/Proof/Create_FromApp/ProofForm.js b/src/pages/Proof/Create_FromApp/ProofForm.js index e638b46..3dee476 100644 --- a/src/pages/Proof/Create_FromApp/ProofForm.js +++ b/src/pages/Proof/Create_FromApp/ProofForm.js @@ -38,7 +38,7 @@ const FormPanel = ({ formData }) => { React.useEffect(() => { if (formData) { setData(formData); - if (formData.groupType == "A") { + if (formData.groupType == "Private Bill") { setColumnPrice(ComboData.proofPrice[1]) formData['length'] = 18; } diff --git a/src/pages/Proof/Create_FromApp/index.js b/src/pages/Proof/Create_FromApp/index.js index 4e83ccd..007395d 100644 --- a/src/pages/Proof/Create_FromApp/index.js +++ b/src/pages/Proof/Create_FromApp/index.js @@ -57,7 +57,7 @@ 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); + responseData.data["groupType"] = responseData.data.groupTitle; setRecord(responseData.data); } }); diff --git a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js index f02814d..608f344 100644 --- a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js @@ -196,7 +196,7 @@ const ApplicationDetailCard = ( alignItems: 'end', }}> - Not accepted + Not accept : currentApplicationDetailData.status == "paid" ? diff --git a/src/utils/ComboData.js b/src/utils/ComboData.js index 826f240..e2616df 100644 --- a/src/utils/ComboData.js +++ b/src/utils/ComboData.js @@ -52,11 +52,12 @@ export const publicNoticeStatic_GLD = [ export const groupTitle = [ - { key: 1, labelCht: 'A - 私人帳單', label: 'A - Private Bill', title: 'Private Bill', type: 'A'}, - { key: 2, labelCht: 'B - 公司條例', label: 'B - Companies Ordinance', title: 'Companies Ordinance', type: 'B' }, - { key: 3, labelCht: 'C - 高等法院', label: 'C - High Court', title: 'High Court', type: 'C' }, - { key: 4, labelCht: 'D - 通知', label: 'D - Notices', title: 'Notices', type: 'D' }, - { key: 5, labelCht: 'E - 其他', label: 'E - Miscellaneous (Companies)', title: 'Miscellaneous  (Companies)', type: 'E' }, + { key: 1, labelCht: 'A1 - 私人帳單', label: 'A1 - Private Bill', title: 'Private Bill', type: 'A'}, + { key: 2, labelCht: 'A2 - 公司條例', label: 'A2 - Companies Ordinance', title: 'Companies Ordinance', type: 'A'}, + { key: 3, labelCht: 'B - 公司條例', label: 'B - Companies Ordinance', title: 'Companies Ordinance', type: 'B' }, + { key: 4, labelCht: 'C - 高等法院', label: 'C - High Court', title: 'High Court', type: 'C' }, + { key: 5, labelCht: 'D - 通知', label: 'D - Notices', title: 'Notices', type: 'D' }, + { key: 6, labelCht: 'E - 其他', label: 'E - Miscellaneous (Companies)', title: 'Miscellaneous  (Companies)', type: 'E' }, ]; export const proofPrice = [