diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index a38d932..eb4ee8b 100644 --- a/src/layout/MainLayout/Header/index.js +++ b/src/layout/MainLayout/Header/index.js @@ -97,7 +97,7 @@ function Header(props) { GFMIS Generate XML
  • - Create DN + Create Demand Note
  • Demand Note diff --git a/src/pages/DemandNote/Create/DataGrid.js b/src/pages/DemandNote/Create/DataGrid.js index 9dad92c..0a4bc9f 100644 --- a/src/pages/DemandNote/Create/DataGrid.js +++ b/src/pages/DemandNote/Create/DataGrid.js @@ -50,7 +50,7 @@ export default function SearchPublicNoticeTable({ recordList }) { headerName: 'Status', flex: 1, renderCell: (params) => { - return PublicNoteStatusUtils.getStatusByTextEng(params.row.status); + return PublicNoteStatusUtils.getStatusByTextEng(params.row.status, params.row.creditor); } }, { diff --git a/src/pages/DemandNote/Create/SearchForm.js b/src/pages/DemandNote/Create/SearchForm.js index 54c317f..6b46abd 100644 --- a/src/pages/DemandNote/Create/SearchForm.js +++ b/src/pages/DemandNote/Create/SearchForm.js @@ -14,15 +14,23 @@ import * as DateUtils from "utils/DateUtils"; import * as UrlUtils from "utils/ApiPathConst"; import * as HttpUtils from "utils/HttpUtils"; import { useNavigate } from "react-router-dom"; +import { notifyDownloadSuccess } from 'utils/CommonFunction'; + + // ==============================|| DASHBOARD - DEFAULT ||============================== // -const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => { +const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _publishCount }) => { const [isFailPopUp, setIsFailPopUp] = React.useState(false); const [failText, setFailText] = React.useState(""); + const [isSuccessPopUp, setIsSuccessPopUp] = React.useState(false); + const [resultCount, setResultCount] = React.useState(0); + const [issueSelected, setIssueSelected] = React.useState({}); + const [paymentCount, setPaymentCount] = React.useState(0); + const [publishCount, setPublishCount] = React.useState(0); const [issueCombo, setIssueCombo] = React.useState([]); const navigate = useNavigate() @@ -48,7 +56,14 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => { } }, [issueComboData]); - + React.useEffect(() => { + setPaymentCount(_paymentCount); + }, [_paymentCount]); + + React.useEffect(() => { + setPublishCount(_publishCount); + }, [_publishCount]); + React.useEffect(() => { onPreView(); }, [issueSelected]); @@ -69,14 +84,33 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => { } else { HttpUtils.post({ url: UrlUtils.DEMAND_NOTE_CREATE + "/" + issueSelected.id, - onSuccess: function () { - navigate('/paymentPage/demandNote'); + onSuccess: function (responseData) { + setResultCount(responseData.count); + setIsSuccessPopUp(true); } }); } }; + const fileDownload = () => { + HttpUtils.fileDownload({ + url: UrlUtils.DEMAND_NOTE_EXPORT, + params: { + "issueId": issueSelected.id + }, + onSuccess: function () { + notifyDownloadSuccess(); + } + }); + } + + const onNavigate = () => { + setIsSuccessPopUp(false); + if(resultCount > 0) + navigate('/paymentPage/demandNote'); + }; + const onPreView = () => { if (!issueSelected?.id) { return; @@ -104,7 +138,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => { {/*row 2*/} - + { Preview */} - + + + + Pending Payment: {paymentCount} + + + + Pending Publish: {publishCount} +
    @@ -165,6 +207,35 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData }) => {
    +
    + setIsSuccessPopUp(false)} > + Create Result + + + + Created DN record: {resultCount} + + {resultCount == 0 ? <> : + + + + } + + + + + + + +
    ); }; diff --git a/src/pages/DemandNote/Create/index.js b/src/pages/DemandNote/Create/index.js index 1c6cafe..b8740ac 100644 --- a/src/pages/DemandNote/Create/index.js +++ b/src/pages/DemandNote/Create/index.js @@ -35,6 +35,9 @@ const Index = () => { const [searchCriteria, setSearchCriteria] = React.useState({}); const [onReady, setOnReady] = React.useState(false); + const [paymentCount, setPaymentCount] = React.useState(0); + const [publishCount, setPublishCount] = React.useState(0); + React.useEffect(()=>{ getIssueCombo(); },[]); @@ -51,7 +54,9 @@ const Index = () => { HttpUtils.get({ url: UrlUtils.DEMAND_NOTE_PREVIEW+"/"+searchCriteria.issueId, onSuccess: function(responseData){ - setRecord(responseData); + setRecord(responseData.records); + setPaymentCount(responseData.paymentCount); + setPublishCount(responseData.publishCount); } }); } @@ -79,7 +84,7 @@ const Index = () => {
    - Create DN + Create Demand Note
    @@ -88,6 +93,8 @@ const Index = () => {     {/*row 2*/} diff --git a/src/pages/DemandNote/Search/index.js b/src/pages/DemandNote/Search/index.js index b0ab178..cbe9141 100644 --- a/src/pages/DemandNote/Search/index.js +++ b/src/pages/DemandNote/Search/index.js @@ -18,6 +18,7 @@ const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/Loa const SearchForm = Loadable(React.lazy(() => import('./SearchForm'))); const EventTable = Loadable(React.lazy(() => import('./DataGrid'))); import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' +import { notifyDownloadSuccess } from 'utils/CommonFunction'; const BackgroundHead = { backgroundImage: `url(${titleBackgroundImg})`, @@ -77,6 +78,7 @@ const UserSearchPage_Individual = () => { url: UrlUtils.DEMAND_NOTE_EXPORT, params: searchCriteria, onSuccess: function () { + notifyDownloadSuccess(); } }); } diff --git a/src/pages/Payment/index.js b/src/pages/Payment/index.js index 40d4807..1fdc562 100644 --- a/src/pages/Payment/index.js +++ b/src/pages/Payment/index.js @@ -29,6 +29,8 @@ import { // import FpsIcon from "assets/images/icons/fps.svg"; import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' +import {ThemeProvider} from "@emotion/react"; +import {PNSPS_BUTTON_THEME} from "../../themes/buttonConst"; const BackgroundHead = { backgroundImage: `url(${titleBackgroundImg})`, width: '100%', @@ -424,10 +426,10 @@ const Index = () => {     + + {/*row 2*/} diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js index 4fa0e19..c28940a 100644 --- a/src/pages/Proof/Payment/Pay.js +++ b/src/pages/Proof/Payment/Pay.js @@ -32,6 +32,8 @@ import { // useEffect, useState } from "react"; +import {PNSPS_BUTTON_THEME, PNSPS_LONG_BUTTON_THEME} from "../../../themes/buttonConst"; +import {ThemeProvider} from "@emotion/react"; // ==============================|| DASHBOARD - DEFAULT ||============================== // const Index = () => { @@ -90,11 +92,11 @@ const Index = () => {
    - + 公共啟事：校對完成及付款 - + 我們已收到申請編號: {record?.appNo} 的稿件校對確定及可付印的指示。

    請於 {DateUtils.dateStr_Cht(record?.returnBeforeDate)} 下午 2:00 前 完成繳費，我們將於收到繳費確認後處理刊出事宜。 @@ -102,36 +104,57 @@ const Index = () => { 如你在憲報期數 {record?.issueYear} 年 {record?.issueVolume} 卷, 第 {record?.issueNo} 期內有多於一個公共啟事的申請，你可選擇完成所有此期所有稿件校對確定後，於繳費期限前在「我的公共啟事」內合併付款。     - + 請按以下完成繳費： - + + + + + + 或 - + + + （返回「我的公共啟事」） +
    - setIsPopUp(false)} > - - 確認付款 + setIsPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '30vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '50vh' } + } + }} + > + + 確認付款 + 總額(HK$): {FormatUtils.currencyFormat(fee)} diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js index 5ddffdc..e0e65bd 100644 --- a/src/pages/Proof/Reply_Public/ApplicationDetails.js +++ b/src/pages/Proof/Reply_Public/ApplicationDetails.js @@ -119,7 +119,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + @@ -147,7 +147,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + @@ -178,29 +178,36 @@ const ApplicationDetailCard = ({ formData, }) => { - + - + - + 請下載下列印刷稿檔案，並仔細校對： + + + - + - + @@ -209,17 +216,16 @@ const ApplicationDetailCard = ({ formData, }) => {  {DateUtils.datetimeStr_Cht(data.returnBeforeDate)} 前 - 應繳費用: - - {FormatUtils.currencyFormat(data.fee)} + + {FormatUtils.currencyFormat(data.fee)} - { - formik.values.groupType == "Private Bill" + formik.values.groupType === "Private Bill" ? ( {data.noOfPages} 頁 x $6,552 ) : diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index d99e197..f9ede05 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/src/pages/Proof/Reply_Public/ProofForm.js @@ -22,6 +22,8 @@ import { useNavigate } from "react-router-dom"; import * as DateUtils from "utils/DateUtils" import Loadable from 'components/Loadable'; import { notifyActionSuccess } from 'utils/CommonFunction'; +import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; +import {ThemeProvider} from "@emotion/react"; const UploadFileTable = Loadable(React.lazy(() => import('./UploadFileTable'))); // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -135,7 +137,7 @@ const FormPanel = ({ formData }) => { return ( - @@ -147,8 +149,8 @@ const FormPanel = ({ formData }) => { { formik.values.replyDate ? - - + + 校對回覆日期: {DateUtils.datetimeStr_Cht(formik.values.replyDate)} @@ -158,7 +160,7 @@ const FormPanel = ({ formData }) => { formik.values.action ? null : - + { : ( isOverTime() ? - + 回覆逾時，請重新申請。 : - + { type="file" accept=".pdf" style={{ display: 'none' }} - disabled={attachments.length >= (formik.values.groupType == "Private Bill" ? 2 : 1)} + disabled={attachments.length >= (formik.values.groupType === "Private Bill" ? 2 : 1)} onChange={(event) => { readFile(event) }} /> - + } - + 簽署： @@ -261,7 +265,7 @@ const FormPanel = ({ formData }) => { WebkitTextFillColor: "#000000", background: "#f8f8f8", }, - width: '50%' + width: '70%' } } /> @@ -271,17 +275,15 @@ const FormPanel = ({ formData }) => { + + diff --git a/src/pages/Proof/Reply_Public/UploadFileTable.js b/src/pages/Proof/Reply_Public/UploadFileTable.js index 9090721..ca2b6e1 100644 --- a/src/pages/Proof/Reply_Public/UploadFileTable.js +++ b/src/pages/Proof/Reply_Public/UploadFileTable.js @@ -10,15 +10,18 @@ import {useEffect} from "react"; // import {useNavigate} from "react-router-dom"; // import { useTheme } from '@mui/material/styles'; import { - Box, - Stack + Stack, useMediaQuery } from '@mui/material'; +import {useTheme} from "@emotion/react"; // ==============================|| EVENT TABLE ||============================== // export default function UploadFileTable({recordList, setRecordList,}) { const [rows, setRows] = React.useState(recordList); const [rowModesModel,setRowModesModel] = React.useState({}); + const theme = useTheme(); + const isMdOrLg = useMediaQuery(theme.breakpoints.up('md')); + // const theme = useTheme(); // const navigate = useNavigate() @@ -74,7 +77,8 @@ export default function UploadFileTable({recordList, setRecordList,}) { id: 'name', field: 'name', headerName: '檔案名稱', - flex: 1, + width: isMdOrLg ? 'auto' : 160, + flex: isMdOrLg ? 1 : undefined, }, { id: 'size', @@ -84,13 +88,14 @@ export default function UploadFileTable({recordList, setRecordList,}) { // console.log(params) return Math.ceil(params.value/1024)+" KB"; }, - flex: 1, + width: isMdOrLg ? 'auto' : 160, + flex: isMdOrLg ? 1 : undefined, }, ]; return ( - - +
    ); } diff --git a/src/pages/Proof/Reply_Public/index.js b/src/pages/Proof/Reply_Public/index.js index f1b3578..43f6e22 100644 --- a/src/pages/Proof/Reply_Public/index.js +++ b/src/pages/Proof/Reply_Public/index.js @@ -3,7 +3,6 @@ import { Grid, Typography, Stack, - Box, Button } from '@mui/material'; import * as UrlUtils from "utils/ApiPathConst"; @@ -20,6 +19,7 @@ const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/Loa const ApplicationDetails = Loadable(React.lazy(() => import('./ApplicationDetails'))); const ProofForm = Loadable(React.lazy(() => import('./ProofForm'))); import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' +import MainCard from "../../../components/MainCard"; const BackgroundHead = { backgroundImage: `url(${titleBackgroundImg})`, width: '100%', @@ -39,22 +39,6 @@ const Index = () => { const [record, setRecord] = React.useState(); const [onReady, setOnReady] = React.useState(false); - const _sx = { - padding: "4 2 4 2", - boxShadow: 1, - border: 1, - borderColor: '#DDD', - '& .MuiDataGrid-cell': { - borderTop: 1, - borderBottom: 1, - borderColor: "#EEE" - }, - '& .MuiDataGrid-footerContainer': { - border: 1, - borderColor: "#EEE" - } - } - React.useEffect(() => { loadForm(); }, []); @@ -98,7 +82,7 @@ const Index = () => { : ( - +
    @@ -106,38 +90,44 @@ const Index = () => {
    - - {/*row 1*/} - - -
    - - - - - - - - - - -
    -     + + + + + {/*row 2*/} + + + + +     diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js index 2e44798..572db9f 100644 --- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js @@ -39,6 +39,7 @@ import EditNoteIcon from '@mui/icons-material/EditNote'; import DownloadIcon from '@mui/icons-material/Download'; import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; import {ThemeProvider} from "@emotion/react"; +import * as React from "react"; // ==============================|| DASHBOARD - DEFAULT ||============================== // const ApplicationDetailCard = ( { applicationDetailData, @@ -142,26 +143,23 @@ const ApplicationDetailCard = ( spacing={2} mb={2} > + { currentApplicationDetailData.status == "confirmed" ? : null } -