diff --git a/package-lock.json b/package-lock.json
index bd90205..da0d5cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5788,6 +5788,11 @@
"whatwg-url": "^8.0.0"
}
},
+ "date-fns": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.0.6.tgz",
+ "integrity": "sha512-W+G99rycpKMMF2/YD064b2lE7jJGUe+EjOES7Q8BIGY8sbNdbgcs9XFTZwvzc9Jx1f3k7LB7gZaZa7f8Agzljg=="
+ },
"dayjs": {
"version": "1.11.10",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
diff --git a/package.json b/package.json
index da7ce49..9851de8 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
"@types/react-input-mask": "^3.0.2",
"apexcharts": "^3.35.5",
"axios": "^1.4.0",
+ "date-fns": "^3.0.6",
"dayjs": "^1.11.9",
"formik": "^2.2.9",
"framer-motion": "^7.3.6",
@@ -40,6 +41,7 @@
"react-element-to-jsx-string": "^15.0.0",
"react-hook-form": "^7.45.4",
"react-input-mask": "^3.0.0-alpha.2",
+ "react-intl": "^6.4.7",
"react-number-format": "^4.9.4",
"react-perfect-scrollbar": "^1.5.8",
"react-redux": "^8.0.4",
@@ -50,7 +52,6 @@
"react-to-print": "^2.14.13",
"react-toastify": "^9.1.3",
"react-window": "^1.8.7",
- "react-intl": "^6.4.7",
"redux": "^4.2.0",
"simplebar": "^5.3.8",
"simplebar-react": "^2.4.1",
diff --git a/src/pages/PublicNotice/Search_GLD/DataGrid.js b/src/pages/PublicNotice/Search_GLD/DataGrid.js
index d0bd26d..1ac3127 100644
--- a/src/pages/PublicNotice/Search_GLD/DataGrid.js
+++ b/src/pages/PublicNotice/Search_GLD/DataGrid.js
@@ -38,7 +38,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
id: 'status',
field: 'status',
headerName: 'Status',
- width: 175,
+ width: 300,
renderCell: (params) => {
return [StatusUtils.getStatusEng(params)]
},
@@ -116,7 +116,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
columns={columns}
initialState={{
pagination: {
- paginationModel: { page: 0, pageSize: 5 },
+ paginationModel: { page: 0, pageSize: 10 },
},
}}
getRowHeight={() => 'auto'}
diff --git a/src/pages/PublicNotice/Search_GLD/SearchForm.js b/src/pages/PublicNotice/Search_GLD/SearchForm.js
index ce0fef6..219f4fe 100644
--- a/src/pages/PublicNotice/Search_GLD/SearchForm.js
+++ b/src/pages/PublicNotice/Search_GLD/SearchForm.js
@@ -13,6 +13,7 @@ import * as DateUtils from "utils/DateUtils";
import * as FormatUtils from "utils/FormatUtils";
import {ThemeProvider} from "@emotion/react";
import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
+import dayjs from "dayjs";
// ==============================|| DASHBOARD - DEFAULT ||============================== //
@@ -140,6 +141,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
{
/>
{/* */}
-
+
{activeStep === totalSteps() - 1 ? (
- 你的機構/公司資料
+ 你的機構/公司資料
{/*
Already have an account?
*/}
@@ -1429,7 +1429,7 @@ const BusCustomFormWizard = (props) => {
- 你的機構/公司資料
+ 你的機構/公司資料
{/*
Already have an account?
*/}
diff --git a/src/themes/typography.js b/src/themes/typography.js
index 6ff5dc0..d4915bc 100644
--- a/src/themes/typography.js
+++ b/src/themes/typography.js
@@ -97,7 +97,7 @@ const Typography = (fontFamily) => ({
lineHeight: 1
},
step1: {
- fontSize: '1.4rem',
+ fontSize: '1.1rem',
fontWeight: 600,
lineHeight: 1
},