diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js
index defd2f2..03da615 100644
--- a/src/pages/Proof/Payment/Pay.js
+++ b/src/pages/Proof/Payment/Pay.js
@@ -77,15 +77,15 @@ const Index = () => {
- 公共啟事:交對完成及付款
+ 公共啟事:校對完成及付款
- 我們已收到申請編號: {record?.appNo} 的稿件交對確定及可付印的指示。
+ 我們已收到申請編號: {record?.appNo} 的稿件校對確定及可付印的指示。
請於 {DateUtils.dateStr_Cht(record?.returnBeforeDate)} 下午 2:00 前 完成繳費,我們將於收到繳費確認後處理刊出事宜。
- 如你在憲報期數 {record?.issueYear} 年 {record?.issueVolume} 卷, 第 {record?.issueNo} 期內有多於一個公共啟事的申請,你可選擇完成所有此期所有稿件交對確定後,於繳費期限前在「我的公共啟事」內合併付款。
+ 如你在憲報期數 {record?.issueYear} 年 {record?.issueVolume} 卷, 第 {record?.issueNo} 期內有多於一個公共啟事的申請,你可選擇完成所有此期所有稿件校對確定後,於繳費期限前在「我的公共啟事」內合併付款。
diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
index d83449b..e7ab1b8 100644
--- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
+++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
@@ -14,7 +14,7 @@ import * as HttpUtils from "utils/HttpUtils";
import * as UrlUtils from "utils/ApiPathConst";
import * as FieldUtils from "utils/FieldUtils";
import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
-
+import ForwardIcon from '@mui/icons-material/Forward';
import { useNavigate } from "react-router-dom";
import { notifyActionSuccess } from 'utils/CommonFunction';
@@ -119,7 +119,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
return (
-
+
@@ -127,6 +127,11 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
+
+
+
{/*
申請公共啟事
*/}
diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
index c255446..7bd2750 100644
--- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
@@ -96,7 +96,7 @@ const ApplicationDetailCard = (
function doPayment() {
setIsPopUp(false);
- navigate('/paymentPage', { state: { amount: fee, appIdList: [currentApplicationDetailData.id]} });
+ navigate('/paymentPage', { state: { amount: fee, appIdList: [currentApplicationDetailData.id] } });
}
return (
@@ -121,7 +121,7 @@ const ApplicationDetailCard = (
-
+
{StatusUtils.getStatusByText(currentApplicationDetailData.status)}
-
-
-
-
- {currentApplicationDetailData.reason}
-
-
-
-
+ {
+ currentApplicationDetailData.reason ?
+
+
+
+
+ 原因:
+
+
+
+
+ {currentApplicationDetailData.reason}
+
+
+
+
+
+
+ : ""
+ }
@@ -513,22 +524,22 @@ const ApplicationDetailCard = (
-
-
+
+
-
+
);
};
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
index 4235186..d6aac1f 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
@@ -73,7 +73,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
id: 'status',
field: 'status',
headerName: '狀態',
- width: 100,
+ width: 160,
renderCell: (params) => {
return [StatusUtils.getStatus(params)]
},
@@ -82,7 +82,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
field: 'actions',
type: 'actions',
headerName: '',
- width: 100,
+ width: 150,
cellClassName: 'actions',
renderCell: (params) => {
return ;
@@ -95,8 +95,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
}
return (
-
-
+
'auto'}
/>
);
diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js
index 143e700..00b061a 100644
--- a/src/pages/authentication/auth-forms/CustomFormWizard.js
+++ b/src/pages/authentication/auth-forms/CustomFormWizard.js
@@ -1685,7 +1685,7 @@ const CustomFormWizard = (props) => {
帳戶申請已成功提交。
- 驗證電郵將發送到你的電郵地址,請要指示完成驗證及登入系統。
+ 驗證電郵將發送到你的電郵地址,請依指示完成驗證及登入系統。
: