diff --git a/src/pages/PublicNotice/ListPanel/BaseGrid.js b/src/pages/PublicNotice/ListPanel/BaseGrid.js
index 85001ff..ce74361 100644
--- a/src/pages/PublicNotice/ListPanel/BaseGrid.js
+++ b/src/pages/PublicNotice/ListPanel/BaseGrid.js
@@ -8,11 +8,17 @@ import {
} from '@mui/material';
import * as DateUtils from "utils/DateUtils"
import * as StatusUtils from "./PublicNoteStatusUtils";
+import {useNavigate} from "react-router-dom";
+
// ==============================|| EVENT TABLE ||============================== //
export default function BaseGrid({rows}) {
const [rowModesModel] = React.useState({});
+ const navigate = useNavigate()
+ const handleDetailClick = (params) => () => {
+ navigate('/publicNotice/'+ params.id);
+ };
const columns = [
{
id: 'appNo',
@@ -75,8 +81,8 @@ export default function BaseGrid({rows}) {
headerName: '',
width: 80,
cellClassName: 'actions',
- renderCell: () => {
- return ;
+ renderCell: (params) => {
+ return ;
},
}
];
diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
index 1c6b97f..be446a7 100644
--- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
+++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
@@ -11,12 +11,17 @@ import {
} from '@mui/material';
import * as DateUtils from "utils/DateUtils"
import * as StatusUtils from "./PublicNoteStatusUtils";
+import {useNavigate} from "react-router-dom";
// ==============================|| EVENT TABLE ||============================== //
export default function SubmittedTab({ rows }) {
const [selectedRowItems, setSelectedRowItems] = React.useState([]);
const [isPopUp, setIsPopUp] = React.useState(false);
+ const navigate = useNavigate()
+ const handleDetailClick = (params) => () => {
+ navigate('/publicNotice/'+ params.id);
+ };
const columns = [
{
@@ -82,8 +87,8 @@ export default function SubmittedTab({ rows }) {
headerName: '',
width: 100,
cellClassName: 'actions',
- renderCell: () => {
- return ;
+ renderCell: (params) => {
+ return ;
},
}
];
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
index 3cb57ea..789f050 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
@@ -9,11 +9,17 @@ import {
import { useEffect } from "react";
import * as DateUtils from "utils/DateUtils";
import * as StatusUtils from "./PublicNoteStatusUtils";
+import {useNavigate} from "react-router-dom";
// ==============================|| EVENT TABLE ||============================== //
export default function SearchPublicNoticeTable({ recordList }) {
const [rows, setRows] = React.useState(recordList);
const [rowModesModel] = React.useState({});
+ const navigate = useNavigate()
+
+ const handleDetailClick = (params) => () => {
+ navigate('/publicNotice/'+ params.id);
+ };
useEffect(() => {
setRows(recordList);
@@ -82,8 +88,8 @@ export default function SearchPublicNoticeTable({ recordList }) {
headerName: '',
width: 100,
cellClassName: 'actions',
- renderCell: () => {
- return ;
+ renderCell: (params) => {
+ return ;
},
}
];
diff --git a/src/pages/PublicNoticeDetail/ApplicationDetailCard.js b/src/pages/PublicNoticeDetail/ApplicationDetailCard.js
index 2c005b3..4d1960e 100644
--- a/src/pages/PublicNoticeDetail/ApplicationDetailCard.js
+++ b/src/pages/PublicNoticeDetail/ApplicationDetailCard.js
@@ -23,9 +23,10 @@ const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingCompo
// import {useParams} from "react-router-dom";
import * as HttpUtils from "utils/HttpUtils"
import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils";
+import * as DateUtils from "utils/DateUtils";
-import BorderColorOutlinedIcon from '@mui/icons-material/BorderColorOutlined';
-import DoneIcon from '@mui/icons-material/Done';
+// import BorderColorOutlinedIcon from '@mui/icons-material/BorderColorOutlined';
+// import DoneIcon from '@mui/icons-material/Done';
import CloseIcon from '@mui/icons-material/Close';
import EditNoteIcon from '@mui/icons-material/EditNote';
import DownloadIcon from '@mui/icons-material/Download';
@@ -42,6 +43,8 @@ const ApplicationDetailCard = (
const [companyName, setCompanyName] = useState({});
const [fileDetail, setfileDetail] = useState({});
const [onReady,setOnReady] = useState(false);
+ const [issueNum,setIssueNum] = useState("");
+ const [issueDate,setIssueDate] = useState("");
const {register,
// getValues
} = useForm()
@@ -49,10 +52,14 @@ const ApplicationDetailCard = (
useEffect(() => {
//if user data from parent are not null
// console.log(applicationDetailData)
- if (Object.keys(applicationDetailData).length > 0) {
+ if (Object.keys(applicationDetailData).length > 0 &&applicationDetailData.data!==null) {
setCurrentApplicationDetailData(applicationDetailData.data);
setCompanyName(applicationDetailData.companyName);
setfileDetail(applicationDetailData.fileDetail);
+ setIssueNum(applicationDetailData.gazetteIssueDetail.volume+"/"+applicationDetailData.gazetteIssueDetail.year
+ +" No. "+applicationDetailData.gazetteIssueDetail.issueNo);
+ setIssueDate(DateUtils.dateFormat(applicationDetailData.gazetteIssueDetail.issueDate, "D MMM YYYY (ddd)"));
+
}
}, [applicationDetailData]);
@@ -96,8 +103,8 @@ const ApplicationDetailCard = (
border={false}
content={false}
>
-
-
+
+
-
-
-
-
-
- {currentApplicationDetailData.status =="submitted"?
- <>
-
-
- :
- <>
-
-
-
- }
- Application Details
+ 公共啟事申請資料