diff --git a/src/pages/OrganizationDetailPage/index.js b/src/pages/OrganizationDetailPage/index.js index 43a339e..aec4344 100644 --- a/src/pages/OrganizationDetailPage/index.js +++ b/src/pages/OrganizationDetailPage/index.js @@ -11,7 +11,7 @@ import Loadable from 'components/Loadable'; import { lazy } from 'react'; const InfoCard = Loadable(lazy(() => import('./OrganizationCard'))); const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingComponent'))); -import KeyboardBackspaceOutlinedIcon from '@mui/icons-material/KeyboardBackspaceOutlined'; +import ForwardIcon from '@mui/icons-material/Forward'; import { useNavigate } from 'react-router-dom'; import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' @@ -73,7 +73,7 @@ const OrganizationDetailPage = () => { isLoading ? : - +
@@ -83,8 +83,7 @@ const OrganizationDetailPage = () => { {/*col 1*/} diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js index afb3d3c..defd2f2 100644 --- a/src/pages/Proof/Payment/Pay.js +++ b/src/pages/Proof/Payment/Pay.js @@ -95,7 +95,7 @@ const Index = () => { variant="contained" size="large" sx={{ m: 4}} - >即時網上繳費 + >即時網上繳費 或 @@ -107,7 +107,7 @@ const Index = () => { onClick={()=>{ navigate("/publicNotice"); }} - >稍後繳費 - 返回「我的公共啟事」 + >稍後繳費 - 返回「我的公共啟事」 diff --git a/src/pages/Proof/Reply_GLD/index.js b/src/pages/Proof/Reply_GLD/index.js index c5e60ca..864fabc 100644 --- a/src/pages/Proof/Reply_GLD/index.js +++ b/src/pages/Proof/Reply_GLD/index.js @@ -13,7 +13,7 @@ import * as DateUtils from "utils/DateUtils"; import * as FormatUtils from "utils/FormatUtils" import { useParams } from "react-router-dom"; import { useNavigate } from "react-router-dom"; -import KeyboardBackspaceOutlinedIcon from '@mui/icons-material/KeyboardBackspaceOutlined'; +import ForwardIcon from '@mui/icons-material/Forward'; import Loadable from 'components/Loadable'; const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); @@ -54,7 +54,7 @@ const Index = () => { HttpUtils.get({ url: UrlUtils.GET_PROOF + "/" + params.id, onSuccess: (responseData) => { - if(!responseData.data?.id){ + if (!responseData.data?.id) { navigate("/proof/search"); } responseData.data["phoneNumber"] = JSON.parse(responseData.data.contactTelNo).phoneNumber; @@ -90,7 +90,7 @@ const Index = () => { // const [backButtonPos, setBackButtonPos] = React.useState() // const backButtonRef = React.useRef() // React.useLayoutEffect(()=>{ - // console.log(applicationDetailsRef.current?.getBoundingClientRect()) + // console.log(applicationDetailsRef.current?.getBoundingClientRect()) // if (backButtonRef.current) backButtonRef.current.style.marginLeft = `${backButtonPos}` // },[backButtonPos]) @@ -103,51 +103,50 @@ const Index = () => { : ( - - -
- - Proof Record - -
+ + +
+ + Proof Record + +
+
+ + + + {/*row 1*/} + + +
+ + + + + + + + + + +
- - - - {/*row 1*/} - - -
- - - - - - - - - - -
-
-
- {/*row 2*/} -
+
+ {/*row 2*/} +
+ - ) diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js index b68a804..ed7a89d 100644 --- a/src/pages/Proof/Reply_Public/ApplicationDetails.js +++ b/src/pages/Proof/Reply_Public/ApplicationDetails.js @@ -64,7 +64,7 @@ const ApplicationDetailCard = ({ formData, }) => { border={false} content={false} > - + 公共啟事:校對資料
@@ -76,7 +76,7 @@ const ApplicationDetailCard = ({ formData, }) => { - 申請編號: + 申請編號: @@ -88,7 +88,7 @@ const ApplicationDetailCard = ({ formData, }) => { - 申請狀態: + 申請狀態: @@ -105,7 +105,7 @@ const ApplicationDetailCard = ({ formData, }) => { - 申請人: + 申請人: @@ -123,7 +123,7 @@ const ApplicationDetailCard = ({ formData, }) => { - 憲報期數: + 憲報期數: @@ -138,7 +138,7 @@ const ApplicationDetailCard = ({ formData, }) => { - 聯絡人: + 聯絡人: @@ -151,7 +151,7 @@ const ApplicationDetailCard = ({ formData, }) => { - 刊出日期: + 刊出日期: @@ -166,7 +166,7 @@ const ApplicationDetailCard = ({ formData, }) => { - 我的備注: + 我的備注: @@ -184,7 +184,7 @@ const ApplicationDetailCard = ({ formData, }) => { - 請下載下列印刷稿檔案,並仔細校對: + 請下載下列印刷稿檔案,並仔細校對: { - 繳費及返稿最後限期: + 繳費及返稿最後限期: - {DateUtils.dateStr_Cht(data.returnBeforeDate)} 下午 2:00前 + {DateUtils.dateStr_Cht(data.returnBeforeDate)} 下午 2:00前 - 應繳費用: + 應繳費用: - {FormatUtils.currencyFormat(data.fee)} + {FormatUtils.currencyFormat(data.fee)} { formik.values.groupType == "A" ? - ( {data.noOfPages} 頁 x $6,552 ) + ( {data.noOfPages} 頁 x $6,552 ) : - ( {data.length} cm x {data.colCount == 2 ? "$364 二格位" : "$182 一格位"} ) + ( {data.length} cm x {data.colCount == 2 ? "$364 二格位" : "$182 一格位"} ) } diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index 6469586..4aba0c5 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/src/pages/Proof/Reply_Public/ProofForm.js @@ -78,7 +78,7 @@ const FormPanel = ({ formData }) => { onSuccess: function () { if (actionValue) { notifyActionSuccess("提交成功!") - navigate("/proof/pay/"+params.id); + navigate("/proof/pay/" + params.id); } else { notifyActionSuccess("提交成功!") navigate("/proof/search"); @@ -138,7 +138,7 @@ const FormPanel = ({ formData }) => { border={false} content={false}> - + 公共啟事:校對回覆 @@ -148,10 +148,10 @@ const FormPanel = ({ formData }) => { formik.values.replyDate ? - 校對回覆日期: {DateUtils.datetimeStr_Cht(formik.values.replyDate)} + 校對回覆日期: {DateUtils.datetimeStr_Cht(formik.values.replyDate)} - 校對回覆: {formik.values.action ? (可以付印(稿件正確)): (未能付印(需要修改))} + 校對回覆: {formik.values.action ? (可以付印(稿件正確)) : (未能付印(需要修改))} { formik.values.action ? @@ -178,7 +178,7 @@ const FormPanel = ({ formData }) => { isOverTime() ? - 回覆逾時,請重新申請。 + 回覆逾時,請重新申請。 : @@ -206,7 +206,7 @@ const FormPanel = ({ formData }) => { : <> - 請上載稿件修改的檔案: + 請上載稿件修改的檔案: @@ -227,7 +227,9 @@ const FormPanel = ({ formData }) => { variant="contained" size="large" disabled={attachments.length >= (formik.values.groupType == "A" ? 2 : 1)} - >上載 + > + 上載 + @@ -241,7 +243,7 @@ const FormPanel = ({ formData }) => { - 簽署: + 簽署: { textTransform: 'capitalize', alignItems: 'end' }}> - 提交回覆 + 提交回覆 diff --git a/src/pages/Proof/Reply_Public/index.js b/src/pages/Proof/Reply_Public/index.js index 84bf8fb..c12f298 100644 --- a/src/pages/Proof/Reply_Public/index.js +++ b/src/pages/Proof/Reply_Public/index.js @@ -3,7 +3,8 @@ import { Grid, Typography, Stack, - Box + Box, + Button } from '@mui/material'; import * as UrlUtils from "utils/ApiPathConst"; import * as React from "react"; @@ -12,6 +13,7 @@ import * as DateUtils from "utils/DateUtils"; import * as FormatUtils from "utils/FormatUtils"; import { useParams } from "react-router-dom"; import { useNavigate } from "react-router-dom"; +import ForwardIcon from '@mui/icons-material/Forward'; import Loadable from 'components/Loadable'; const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); @@ -37,6 +39,22 @@ 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(); }, []); @@ -52,7 +70,7 @@ const Index = () => { HttpUtils.get({ url: UrlUtils.GET_PROOF + "/" + params.id, onSuccess: (responseData) => { - if(!responseData.data?.id){ + if (!responseData.data?.id) { navigate("/proof/search"); } responseData.data["phoneNumber"] = JSON.parse(responseData.data.contactTelNo).phoneNumber; @@ -80,44 +98,49 @@ const Index = () => { : ( - - -
- - 校對記錄 - -
+ + +
+ + 校對記錄 + +
+
+ + + + {/*row 1*/} + + +
+ + + + + + + + + + +
- {/*row 1*/} - - -
- - - - - - - - - - -
-
-
- {/*row 2*/} -
+
+ {/*row 2*/} +
+ - ) diff --git a/src/pages/Proof/Search_Public/DataGrid.js b/src/pages/Proof/Search_Public/DataGrid.js index 2721be6..4074f7e 100644 --- a/src/pages/Proof/Search_Public/DataGrid.js +++ b/src/pages/Proof/Search_Public/DataGrid.js @@ -13,6 +13,22 @@ export default function SearchPublicNoticeTable({ recordList }) { const [rows, setRows] = React.useState(recordList); const navigate = useNavigate() + 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(() => { setRows(recordList); }, [recordList]); @@ -119,10 +135,11 @@ export default function SearchPublicNoticeTable({ recordList }) { } return ( -
+
"auto"} onRowDoubleClick={handleRowDoubleClick} />
diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js index 31ff31c..422cfca 100644 --- a/src/pages/Proof/Search_Public/SearchForm.js +++ b/src/pages/Proof/Search_Public/SearchForm.js @@ -3,7 +3,8 @@ import { Button, CardContent, Grid, TextField, - Autocomplete + Autocomplete, + Typography } from '@mui/material'; import MainCard from "components/MainCard"; import { useForm } from "react-hook-form"; @@ -14,8 +15,8 @@ import * as FormatUtils from "utils/FormatUtils"; // ==============================|| DASHBOARD - DEFAULT ||============================== // -const SearchPublicNoticeForm = ({ applySearch, searchCriteria,issueComboData - }) => { +const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData +}) => { const [type, setType] = React.useState([]); const [status, setStatus] = React.useState(ComboData.proofStatus[0]); @@ -26,6 +27,21 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria,issueComboData const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom); const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo); + 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" + } + } const { reset, register, handleSubmit } = useForm() const onSubmit = (data) => { @@ -64,24 +80,26 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria,issueComboData reset(); } - function getIssueLabel(data){ - if(data=={}) return ""; - return data.year - +" Vol. "+FormatUtils.zeroPad(data.volume,3) - +", No. "+FormatUtils.zeroPad(data.issueNo,2) - +", "+DateUtils.dateFormat(data.issueDate, "D MMM YYYY (ddd)"); + function getIssueLabel(data) { + if (data == {}) return ""; + return data.year + + " Vol. " + FormatUtils.zeroPad(data.volume, 3) + + ", No. " + FormatUtils.zeroPad(data.issueNo, 2) + + ", " + DateUtils.dateFormat(data.issueDate, "D MMM YYYY (ddd)"); } return ( + content={false} + sx={_sx} + > {/*row 1*/} - 搜尋 + 搜尋 @@ -121,7 +139,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria,issueComboData options={issueCombo} value={issueSelected} inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""} - getOptionLabel={(option)=>getIssueLabel(option)} + getOptionLabel={(option) => getIssueLabel(option)} onChange={(event, newValue) => { setIssueSelected(newValue); }} @@ -143,8 +161,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria,issueComboData id="gazettGroup" options={ComboData.groupTitle} value={groupSelected} - inputValue={(groupSelected?.labelCht)?groupSelected?.labelCht:""} - getOptionLabel={(option)=>option.labelCht} + inputValue={(groupSelected?.labelCht) ? groupSelected?.labelCht : ""} + getOptionLabel={(option) => option.labelCht} onChange={(event, newValue) => { setGroupSelected(newValue); }} @@ -212,13 +230,13 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria,issueComboData options} options={ComboData.proofStatus} value={status} - getOptionLabel={(option)=>option.labelCht} - inputValue={status?.labelCht?status?.labelCht:""} + getOptionLabel={(option) => option.labelCht} + inputValue={status?.labelCht ? status?.labelCht : ""} onChange={(event, newValue) => { if (newValue !== null) { setStatus(newValue); @@ -250,7 +268,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria,issueComboData textTransform: 'capitalize', alignItems: 'end' }}> - 重置 + 重置 @@ -263,7 +281,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria,issueComboData textTransform: 'capitalize', alignItems: 'end' }}> - 提交 + 提交 diff --git a/src/pages/PublicNotice/Details_GLD/index.js b/src/pages/PublicNotice/Details_GLD/index.js index 237a8ed..63cd2cc 100644 --- a/src/pages/PublicNotice/Details_GLD/index.js +++ b/src/pages/PublicNotice/Details_GLD/index.js @@ -37,7 +37,7 @@ import { const StatusChangeDialog = Loadable(lazy(() => import('./StatusChangeDialog'))); import * as DateUtils from "utils/DateUtils"; import { notifyActionSuccess, notifySaveSuccess } from "utils/CommonFunction"; -import KeyboardBackspaceOutlinedIcon from '@mui/icons-material/KeyboardBackspaceOutlined'; +import ForwardIcon from '@mui/icons-material/Forward'; import { useNavigate } from "react-router-dom"; // ==============================|| Body - DEFAULT ||============================== // @@ -84,7 +84,7 @@ const PublicNoticeDetail_GLD = () => { backgroundPosition: 'right' } - const title = groupNo != null ? ("Application / " + appNo + ", " + gazetteIssue + ", " + issueNum + " , " + groupNo) : ("Application / " + appNo + ", " + gazetteIssue + ", " + issueNum) + const title = groupNo != null ? (appNo + ", " + gazetteIssue + ", " + issueNum + " , " + groupNo) : (appNo + ", " + gazetteIssue + ", " + issueNum) useEffect(() => { loadApplicationDetail(); @@ -322,16 +322,18 @@ const PublicNoticeDetail_GLD = () => {
- + {title} + - + {/* {title} - + */} diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js index 538c9b0..ce59f66 100644 --- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js @@ -128,7 +128,7 @@ const ApplicationDetailCard = ( alignItems: 'end' }}> - 支付 + 支付 : null } @@ -143,12 +143,12 @@ const ApplicationDetailCard = ( backgroundColor: '#ffa733' }}> - 取消 + 取消 - + 公共啟事申請資料 @@ -160,7 +160,7 @@ const ApplicationDetailCard = ( - 申請編號: + 申請編號: @@ -188,7 +188,7 @@ const ApplicationDetailCard = ( - 申請狀態: + 申請狀態: @@ -199,7 +199,7 @@ const ApplicationDetailCard = ( - + {currentApplicationDetailData.reason} @@ -214,7 +214,7 @@ const ApplicationDetailCard = ( - 申請人: + 申請人: @@ -259,7 +259,7 @@ const ApplicationDetailCard = ( - 憲報期數: + 憲報期數: @@ -291,7 +291,7 @@ const ApplicationDetailCard = ( - 聯絡人: + 聯絡人: @@ -319,7 +319,7 @@ const ApplicationDetailCard = ( - 發布日期: + 發布日期: @@ -352,7 +352,7 @@ const ApplicationDetailCard = ( - 聯絡電話: + 聯絡電話: @@ -399,11 +399,11 @@ const ApplicationDetailCard = ( - 價錢: + 價錢: - {FormatUtils.currencyFormat(fee)} + {FormatUtils.currencyFormat(fee)} @@ -416,7 +416,7 @@ const ApplicationDetailCard = ( - 傳真號碼: + 傳真號碼: @@ -465,7 +465,7 @@ const ApplicationDetailCard = ( - 稿件檔案: + 稿件檔案: @@ -474,6 +474,7 @@ const ApplicationDetailCard = ( {fileDetail.filename} @@ -502,10 +503,10 @@ const ApplicationDetailCard = ( - 備註: + 備註: - {currentApplicationDetailData.remarks} + {currentApplicationDetailData.remarks} @@ -514,15 +515,15 @@ const ApplicationDetailCard = (
setIsPopUp(false)} > - 確認付款 + 確認付款 - 總計金額: {FormatUtils.currencyFormat(fee)} + 總計金額: {FormatUtils.currencyFormat(fee)} - - + +
diff --git a/src/pages/PublicNotice/Details_Public/StatusChangeDialog.js b/src/pages/PublicNotice/Details_Public/StatusChangeDialog.js index 63194e4..7965947 100644 --- a/src/pages/PublicNotice/Details_Public/StatusChangeDialog.js +++ b/src/pages/PublicNotice/Details_Public/StatusChangeDialog.js @@ -73,9 +73,9 @@ const StatusChangeDialog = (props) => { - + - 確定{status}公共啟事? + 確定{status}公共啟事? @@ -86,12 +86,12 @@ const StatusChangeDialog = (props) => { diff --git a/src/pages/PublicNotice/Details_Public/index.js b/src/pages/PublicNotice/Details_Public/index.js index 2fa76a5..2fa67a7 100644 --- a/src/pages/PublicNotice/Details_Public/index.js +++ b/src/pages/PublicNotice/Details_Public/index.js @@ -28,7 +28,8 @@ import { } from "utils/ApiPathConst"; import { useNavigate } from "react-router-dom"; const StatusChangeDialog = Loadable(lazy(() => import('./StatusChangeDialog'))); -import KeyboardBackspaceOutlinedIcon from '@mui/icons-material/KeyboardBackspaceOutlined'; +import ForwardIcon from '@mui/icons-material/Forward'; +import { notifyActionSuccess } from "utils/CommonFunction"; // ==============================|| Body - DEFAULT ||============================== // @@ -36,6 +37,8 @@ const DashboardDefault = () => { const params = useParams(); const [applicationDetailData, setApplicationDetailData] = useState({}); const [appNo, setAapNo] = useState(""); + const [gazetteIssue, setGazetteIssue] = useState(""); + const [issueNum, setIssueNum] = useState(""); // const [refApplicationDetailData, setRefApplicationDetailData] = React.useState({}); const navigate = useNavigate() @@ -44,6 +47,24 @@ const DashboardDefault = () => { const [getStatus, setStatus] = useState(""); const [statusWindowAccepted, setStatusWindowAccepted] = useState(false); + const title = appNo + ", " + gazetteIssue + ", " + issueNum + + 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" + } + } + const BackgroundHead = { backgroundImage: `url(${titleBackgroundImg})`, width: '100%', @@ -65,7 +86,10 @@ const DashboardDefault = () => { .then((response) => { if (response.status === 200) { setApplicationDetailData(response.data); + const gazetteIssueDetail = response.data.gazetteIssueDetail; setAapNo(response.data.data.appNo); + setGazetteIssue(gazetteIssueDetail.year + " Vol " + gazetteIssueDetail.volume); + setIssueNum(" No. " + gazetteIssueDetail.issueNo); } }) .catch(error => { @@ -107,6 +131,7 @@ const DashboardDefault = () => { axios.get(`${SET_PUBLIC_NOTICE_STATUS_CANCELLED}/${params.id}`) .then((response) => { if (response.status === 204) { + notifyActionSuccess("取消成功!") setOpen(false); handleClose(); loadApplicationDetail() @@ -129,24 +154,20 @@ const DashboardDefault = () => {
- - - 我的公共啟事 / {appNo} - - - - + + + {title} + {/* */} {/* */} - + () => { navigate('/publicNotice/'+ params.id); }; + const columns = [ { id: 'appNo', @@ -76,7 +77,7 @@ export default function BaseGrid({rows}) { { field: 'actions', headerName: '', - width: 80, + width: 160, cellClassName: 'actions', renderCell: (params) => { return ; @@ -99,6 +100,7 @@ export default function BaseGrid({rows}) { }, }} onRowDoubleClick={handleRowDoubleClick} + getRowHeight={() => 'auto'} /> ); diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js index 40d8247..bcb18cf 100644 --- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js +++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js @@ -117,9 +117,9 @@ export default function SubmittedTab({ rows }) { totalAmount += datas[i].fee; } - content.push(<> + content.push( 總計金額: {totalAmount}

- ); +
); //setAmount(totalAmount); return content; } @@ -131,7 +131,7 @@ export default function SubmittedTab({ rows }) { function doPayment() { setIsPopUp(false); let totalAmount = 0; - let appIdList =[]; + let appIdList = []; const datas = rows?.filter((row) => selectedRowItems.includes(row.id) ); @@ -139,7 +139,7 @@ export default function SubmittedTab({ rows }) { totalAmount += datas[i].fee; appIdList.push(datas[i].id); } - navigate('/paymentPage', { state: { amount: totalAmount, appIdList: appIdList} }); + navigate('/paymentPage', { state: { amount: totalAmount, appIdList: appIdList } }); } return ( @@ -159,8 +159,10 @@ export default function SubmittedTab({ rows }) { setSelectedRowItems(newSelection); }} onRowDoubleClick={handleRowDoubleClick} + getRowHeight={() => 'auto'} /> - +
+
@@ -173,8 +175,8 @@ export default function SubmittedTab({ rows }) { - - + +
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js index 45e1c74..d51819e 100644 --- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js +++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js @@ -3,7 +3,8 @@ import { Button, CardContent, Grid, TextField, - Autocomplete + Autocomplete, + Typography } from '@mui/material'; import MainCard from "components/MainCard"; import { useForm } from "react-hook-form"; @@ -16,7 +17,7 @@ import * as DateUtils from "utils/DateUtils"; const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { const [type, setType] = React.useState([]); - const [status, setStatus] = React.useState([{ key: 0, label: 'All', labelCht: "全部", type: 'all' }]); + const [status, setStatus] = React.useState([{ key: 0, label: 'All', labelCht: "全部", type: 'all' }]); const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom); const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo); @@ -43,7 +44,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { function resetForm() { setType([]); - setStatus({ key: 0, label: 'All', labelCht: "全部", type: 'all' }); + setStatus({ key: 0, label: 'All', labelCht: "全部", type: 'all' }); reset(); } @@ -56,7 +57,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { {/*row 1*/} - 搜尋 + 搜尋 @@ -83,8 +84,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { type="date" label="提交日期(從)" defaultValue={searchCriteria.dateFrom} - InputProps={{inputProps: { max: maxDate} }} - onChange={(newValue)=>{ + InputProps={{ inputProps: { max: maxDate } }} + onChange={(newValue) => { setMinDate(DateUtils.dateStr(newValue)); }} InputLabelProps={{ @@ -104,8 +105,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { type="date" label="提交日期(到)" defaultValue={searchCriteria.dateTo} - InputProps={{inputProps: { min: minDate} }} - onChange={(newValue)=>{ + InputProps={{ inputProps: { min: minDate } }} + onChange={(newValue) => { setMaxDate(DateUtils.dateStr(newValue)); }} /> @@ -131,13 +132,13 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { id="status" // filterOptions={(options)=>options} options={ - localStorage.getItem('userData').creditor? - ComboData.publicNoticeStatic_Creditor: - ComboData.publicNoticeStatic + localStorage.getItem('userData').creditor ? + ComboData.publicNoticeStatic_Creditor : + ComboData.publicNoticeStatic } - values={status} + value={status} // inputValue={status?.labelCht} - getOptionLabel={(option)=>option.labelCht} + getOptionLabel={(option) => option.labelCht} onChange={(event, newValue) => { console.log(newValue) const findAllIndex = newValue.findIndex((ele) => { @@ -150,7 +151,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { } else { const selectedLabels = newValue.map(option => option.type); const selectedLabelsString = `${selectedLabels.join(',')}`; - setStatus(newValue); + setStatus(newValue); console.log(newValue) setSelectedLabelsString(selectedLabelsString); } @@ -160,11 +161,14 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { renderInput={(params) => ( )} - // InputLabelProps={{ - // shrink: true - // }} + // InputLabelProps={{ + // shrink: true + // }} />
{/**/} @@ -191,7 +195,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { textTransform: 'capitalize', alignItems: 'end' }}> - 重置 + 重置 @@ -204,7 +208,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { textTransform: 'capitalize', alignItems: 'end' }}> - 搜尋 + 搜尋
diff --git a/src/pages/PublicNotice/ListPanel/index.js b/src/pages/PublicNotice/ListPanel/index.js index 023cddc..8162d4d 100644 --- a/src/pages/PublicNotice/ListPanel/index.js +++ b/src/pages/PublicNotice/ListPanel/index.js @@ -35,11 +35,27 @@ const PublicNotice = () => { const [selectedTab, setSelectedTab] = useState("1"); const navigate = useNavigate(); + 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" + } + } + const BackgroundHead = { backgroundImage: `url(${titleBackgroundImg})`, width: '100%', height: '100%', - backgroundSize:'contain', + backgroundSize: 'contain', backgroundRepeat: 'no-repeat', backgroundColor: '#0C489E', backgroundPosition: 'right' @@ -81,7 +97,7 @@ const PublicNotice = () => { isLoading ? : - +
@@ -89,10 +105,10 @@ const PublicNotice = () => {
- + - + @@ -100,7 +116,7 @@ const PublicNotice = () => { { JSON.parse(localStorage.getItem('userData')).creditor ? ( - + @@ -137,7 +153,7 @@ const PublicNotice = () => { ) : ( - + diff --git a/src/pages/User/DetailPage/index.js b/src/pages/User/DetailPage/index.js index 46e570e..4a3383d 100644 --- a/src/pages/User/DetailPage/index.js +++ b/src/pages/User/DetailPage/index.js @@ -24,7 +24,7 @@ import { notifyDeleteSuccess, notifySaveSuccess, } from "../../../utils/CommonFunction"; -import KeyboardBackspaceOutlinedIcon from '@mui/icons-material/KeyboardBackspaceOutlined'; +import ForwardIcon from '@mui/icons-material/Forward'; import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' const BackgroundHead = { @@ -214,8 +214,7 @@ const UserMaintainPage = () => { {/*col 1*/} diff --git a/src/pages/User/DetailsPage_Individual/index.js b/src/pages/User/DetailsPage_Individual/index.js index 55259d1..24c1c5e 100644 --- a/src/pages/User/DetailsPage_Individual/index.js +++ b/src/pages/User/DetailsPage_Individual/index.js @@ -8,7 +8,7 @@ import * as HttpUtils from "../../../utils/HttpUtils"; import { useParams } from "react-router-dom"; import * as UrlUtils from "../../../utils/ApiPathConst"; import * as DateUtils from '../../../utils/DateUtils'; -import KeyboardBackspaceOutlinedIcon from '@mui/icons-material/KeyboardBackspaceOutlined'; +import ForwardIcon from '@mui/icons-material/Forward'; import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' const BackgroundHead = { @@ -112,8 +112,7 @@ const UserMaintainPage_Individual = () => { {/*col 1*/} diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js index eb9e10b..f12b1d3 100644 --- a/src/pages/User/DetailsPage_Organization/index.js +++ b/src/pages/User/DetailsPage_Organization/index.js @@ -14,7 +14,7 @@ import Loadable from 'components/Loadable'; import { lazy } from 'react'; const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingComponent'))); const UserInformationCard = Loadable(lazy(() => import('./UserInformationCard_Organization'))); -import KeyboardBackspaceOutlinedIcon from '@mui/icons-material/KeyboardBackspaceOutlined'; +import ForwardIcon from '@mui/icons-material/Forward'; import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' import { useNavigate } from 'react-router-dom'; @@ -139,8 +139,7 @@ const UserMaintainPage_Organization = () => { {/*col 1*/} diff --git a/src/pages/dashboard/GLD/index.js b/src/pages/dashboard/GLD/index.js index 1de162e..f720e4c 100644 --- a/src/pages/dashboard/GLD/index.js +++ b/src/pages/dashboard/GLD/index.js @@ -21,7 +21,7 @@ const DashboardDefault = () => { backgroundPosition: 'right' } return ( - +
diff --git a/src/pages/pnspsUserGroupDetailPage/index.js b/src/pages/pnspsUserGroupDetailPage/index.js index caf9ec9..8c1f361 100644 --- a/src/pages/pnspsUserGroupDetailPage/index.js +++ b/src/pages/pnspsUserGroupDetailPage/index.js @@ -25,7 +25,7 @@ const GroupAuthCard = Loadable(lazy(() => import('./GroupAuthCard'))); const UserGroupInfoCard = Loadable(lazy(() => import('./UserGroupInfoCard'))); const UserAddCard = Loadable(lazy(() => import('./UserAddCard'))); import { useNavigate } from "react-router"; -import KeyboardBackspaceOutlinedIcon from '@mui/icons-material/KeyboardBackspaceOutlined'; +import ForwardIcon from '@mui/icons-material/Forward'; import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' const BackgroundHead = { @@ -179,8 +179,7 @@ const UserMaintainPage = () => { {/*col 1*/}