diff --git a/src/pages/ProofReply_GLD/ApplicationDetails.js b/src/pages/ProofReply_GLD/ApplicationDetails.js
index 2e10973..73c5830 100644
--- a/src/pages/ProofReply_GLD/ApplicationDetails.js
+++ b/src/pages/ProofReply_GLD/ApplicationDetails.js
@@ -13,7 +13,7 @@ import * as DateUtils from "utils/DateUtils"
import { useParams } from "react-router-dom";
import Loadable from 'components/Loadable';
const MainCard = Loadable(React.lazy(() => import('components/MainCard')));
-import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils";
+import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import FileList from "components/FileList"
// ==============================|| DASHBOARD - DEFAULT ||============================== //
const ApplicationDetailCard = ({ formData, }) => {
diff --git a/src/pages/ProofReply_GLD/index.js b/src/pages/ProofReply_GLD/index.js
index d2604d4..7c08a54 100644
--- a/src/pages/ProofReply_GLD/index.js
+++ b/src/pages/ProofReply_GLD/index.js
@@ -90,7 +90,7 @@ const Index = () => {
- 校對記錄
+ Proof Record
diff --git a/src/pages/ProofReply_Public/ApplicationDetails.js b/src/pages/ProofReply_Public/ApplicationDetails.js
index d1797c9..03cbdee 100644
--- a/src/pages/ProofReply_Public/ApplicationDetails.js
+++ b/src/pages/ProofReply_Public/ApplicationDetails.js
@@ -14,7 +14,7 @@ import * as DateUtils from "utils/DateUtils"
import { useParams } from "react-router-dom";
import Loadable from 'components/Loadable';
const MainCard = Loadable(React.lazy(() => import('components/MainCard')));
-import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils";
+import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import FileList from "components/FileList"
// ==============================|| DASHBOARD - DEFAULT ||============================== //
const ApplicationDetailCard = ({ formData, }) => {
diff --git a/src/pages/PublicNotice/ListPanel/BaseGrid.js b/src/pages/PublicNotice/ListPanel/BaseGrid.js
index 8a7c88c..1aba986 100644
--- a/src/pages/PublicNotice/ListPanel/BaseGrid.js
+++ b/src/pages/PublicNotice/ListPanel/BaseGrid.js
@@ -5,7 +5,7 @@ import {
Button
} from '@mui/material';
import * as DateUtils from "utils/DateUtils"
-import * as StatusUtils from "./PublicNoteStatusUtils";
+import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import {useNavigate} from "react-router-dom";
// ==============================|| EVENT TABLE ||============================== //
diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
index 3c3c9fc..7c2a02a 100644
--- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
+++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
@@ -8,7 +8,7 @@ import {
} from '@mui/material';
import {FiDataGrid} from "components/FiDataGrid";
import * as DateUtils from "utils/DateUtils"
-import * as StatusUtils from "./PublicNoteStatusUtils";
+import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import {useNavigate} from "react-router-dom";
// ==============================|| EVENT TABLE ||============================== //
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
index acce097..761618d 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
@@ -4,7 +4,7 @@ import {
Button
} from '@mui/material';
import * as DateUtils from "utils/DateUtils";
-import * as StatusUtils from "./PublicNoteStatusUtils";
+import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import {useNavigate} from "react-router-dom";
import {FiDataGrid} from "components/FiDataGrid";
// ==============================|| EVENT TABLE ||============================== //
diff --git a/src/pages/PublicNoticeDetail/ApplicationDetailCard.js b/src/pages/PublicNoticeDetail/ApplicationDetailCard.js
index fdb16e8..86d3775 100644
--- a/src/pages/PublicNoticeDetail/ApplicationDetailCard.js
+++ b/src/pages/PublicNoticeDetail/ApplicationDetailCard.js
@@ -22,7 +22,7 @@ import { lazy } from 'react';
const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent')));
// import {useParams} from "react-router-dom";
import * as HttpUtils from "utils/HttpUtils"
-import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils";
+import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import * as DateUtils from "utils/DateUtils";
// import BorderColorOutlinedIcon from '@mui/icons-material/BorderColorOutlined';
diff --git a/src/pages/PublicNoticeDetail/tabTableDetail/BaseGrid.js b/src/pages/PublicNoticeDetail/tabTableDetail/BaseGrid.js
index 1c33175..76042cd 100644
--- a/src/pages/PublicNoticeDetail/tabTableDetail/BaseGrid.js
+++ b/src/pages/PublicNoticeDetail/tabTableDetail/BaseGrid.js
@@ -7,7 +7,6 @@ import {
Button
} from '@mui/material';
import * as DateUtils from "utils/DateUtils"
-// import * as StatusUtils from "./PublicNoteStatusUtils";
// ==============================|| EVENT TABLE ||============================== //
export default function BaseGrid({rows}) {
diff --git a/src/pages/PublicNoticeDetail/tabTableDetail/ProofTab.js b/src/pages/PublicNoticeDetail/tabTableDetail/ProofTab.js
index 1da2df9..621f1ab 100644
--- a/src/pages/PublicNoticeDetail/tabTableDetail/ProofTab.js
+++ b/src/pages/PublicNoticeDetail/tabTableDetail/ProofTab.js
@@ -6,8 +6,6 @@ import {
import {
Button
} from '@mui/material';
-// import * as DateUtils from "utils/DateUtils"
-// import * as StatusUtils from "./PublicNoteStatusUtils";
// ==============================|| EVENT TABLE ||============================== //
export default function ProofTab({rows}) {
diff --git a/src/pages/PublicNoticeDetail/tabTableDetail/StatusHistoryTab.js b/src/pages/PublicNoticeDetail/tabTableDetail/StatusHistoryTab.js
index 0683082..1608fa1 100644
--- a/src/pages/PublicNoticeDetail/tabTableDetail/StatusHistoryTab.js
+++ b/src/pages/PublicNoticeDetail/tabTableDetail/StatusHistoryTab.js
@@ -3,12 +3,8 @@ import * as React from 'react';
import {
DataGrid,
} from "@mui/x-data-grid";
-// import dayjs from "dayjs";
-// import {
-// Button
-// } from '@mui/material';
-// import * as DateUtils from "utils/DateUtils"
-import * as StatusUtils from "../../PublicNotice/ListPanel/PublicNoteStatusUtils";
+
+import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
// ==============================|| EVENT TABLE ||============================== //
diff --git a/src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js b/src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js
index e1ebaec..9ee6f8e 100644
--- a/src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js
+++ b/src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js
@@ -20,7 +20,7 @@ import Loadable from 'components/Loadable';
import { lazy } from 'react';
const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent')));
import * as HttpUtils from "utils/HttpUtils"
-import * as StatusUtils from "../PublicNotice/ListPanel/PublicNoteStatusUtils";
+import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import DoneIcon from '@mui/icons-material/Done';
import CloseIcon from '@mui/icons-material/Close';
diff --git a/src/pages/PublicNoticeDetail_GLD/tabTableDetail/BaseGrid.js b/src/pages/PublicNoticeDetail_GLD/tabTableDetail/BaseGrid.js
index ec9dfa8..d28a428 100644
--- a/src/pages/PublicNoticeDetail_GLD/tabTableDetail/BaseGrid.js
+++ b/src/pages/PublicNoticeDetail_GLD/tabTableDetail/BaseGrid.js
@@ -5,7 +5,6 @@ import {
Button
} from '@mui/material';
import * as DateUtils from "utils/DateUtils"
-// import * as StatusUtils from "./PublicNoteStatusUtils";
// ==============================|| EVENT TABLE ||============================== //
export default function BaseGrid({rows}) {
diff --git a/src/pages/PublicNoticeDetail_GLD/tabTableDetail/StatusHistoryTab.js b/src/pages/PublicNoticeDetail_GLD/tabTableDetail/StatusHistoryTab.js
index 8a16fd2..43ed2cc 100644
--- a/src/pages/PublicNoticeDetail_GLD/tabTableDetail/StatusHistoryTab.js
+++ b/src/pages/PublicNoticeDetail_GLD/tabTableDetail/StatusHistoryTab.js
@@ -6,7 +6,7 @@ import {FiDataGrid} from "components/FiDataGrid";
// Button
// } from '@mui/material';
import * as DateUtils from "utils/DateUtils"
-import * as StatusUtils from "../../PublicNotice/ListPanel/PublicNoteStatusUtils";
+import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
// ==============================|| EVENT TABLE ||============================== //
diff --git a/src/pages/PublicNoticeSearch_GLD/DataGrid.js b/src/pages/PublicNoticeSearch_GLD/DataGrid.js
index 83450c8..f0c3d03 100644
--- a/src/pages/PublicNoticeSearch_GLD/DataGrid.js
+++ b/src/pages/PublicNoticeSearch_GLD/DataGrid.js
@@ -4,7 +4,7 @@ import {
Button
} from '@mui/material';
import * as DateUtils from "utils/DateUtils";
-import * as StatusUtils from "pages/PublicNotice/ListPanel/PublicNoteStatusUtils";
+import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import {useNavigate} from "react-router-dom";
import {FiDataGrid} from "components/FiDataGrid";
// ==============================|| EVENT TABLE ||============================== //
diff --git a/src/utils/statusUtils/Base.js b/src/utils/statusUtils/Base.js
new file mode 100644
index 0000000..d7791ca
--- /dev/null
+++ b/src/utils/statusUtils/Base.js
@@ -0,0 +1,6 @@
+
+export function getStatusTag({ color = "#000", textColor = "#FFF", text = "" }) {
+ return (
+
{text}
+ )
+}
\ No newline at end of file
diff --git a/src/pages/PublicNotice/ListPanel/PublicNoteStatusUtils.js b/src/utils/statusUtils/PublicNoteStatusUtils.js
similarity index 92%
rename from src/pages/PublicNotice/ListPanel/PublicNoteStatusUtils.js
rename to src/utils/statusUtils/PublicNoteStatusUtils.js
index b8c5f31..07e42ce 100644
--- a/src/pages/PublicNotice/ListPanel/PublicNoteStatusUtils.js
+++ b/src/utils/statusUtils/PublicNoteStatusUtils.js
@@ -1,5 +1,7 @@
+import {getStatusTag} from "utils/statusUtils/Base";
+
export function getStatus(params) {
return getStatusByText(params.row.status);
}
@@ -66,9 +68,3 @@ export function getStatusByTextEng(status) {
return getStatusTag({ text: status })
}
}
-
-export function getStatusTag({ color = "#000", textColor = "#FFF", text = "" }) {
- return (
- {text}
- )
-}
\ No newline at end of file