alex
/
PNSPS-frontend-MaterialUI
1
0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Toiminta
Selaa lähdekoodia

update setting

CR003
Alex Cheung 1 vuosi sitten
vanhempi
646421d897
commit
99a229cf0c
8 muutettua tiedostoa jossa 65 lisäystä ja 36 poistoa
Jaettu näkymä
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/pages/DemandNote/Details/ApplicationDetailCard.js
  2. +17
    -6
      src/pages/Proof/Reply_Public/ProofForm.js
  3. +1
    -1
      src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
  4. +5
    -5
      src/pages/Setting/SystemSetting/Table.js
  5. +31
    -16
      src/pages/Setting/SystemSetting/index.js
  6. +1
    -0
      src/translations/en.json
  7. +5
    -4
      src/translations/zh-CN.json
  8. +4
    -3
      src/translations/zh-HK.json

+ 1
- 1
src/pages/DemandNote/Details/ApplicationDetailCard.js Näytä tiedosto

@@ -143,7 +143,7 @@ const ApplicationDetailCard = ({ data }) => {
</Grid>
<Grid container direction="row" justifyContent="space-between"
alignItems="center">
<Grid item xs={12} md={6} lg={6} mt={1}>
<Grid item xs={12} md={6} lg={6} mt={1} mb={2}>
<Grid container alignItems={"center"}>
<Grid item xs={12} md={12} lg={12}>
<Grid container direction="row">


+ 17
- 6
src/pages/Proof/Reply_Public/ProofForm.js Näytä tiedosto

@@ -352,6 +352,9 @@ const FormPanel = ({ formData }) => {
<li><FormattedMessage id="store" /></li>
<li><FormattedMessage id="post" /></li>
</ul>
<Typography variant="h6">
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} />
</Typography>
</>
);
setIsWarningPopUp(true);
@@ -360,7 +363,7 @@ const FormPanel = ({ formData }) => {
<td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td>
<td style={tabelStyle}>
<FormattedMessage id="payDnRemark" values={{
date: DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" })) + " 12:00 p.m."
date: DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" })) + " 12:30 p.m."
}} />
</td>
</tr>
@@ -434,7 +437,12 @@ const FormPanel = ({ formData }) => {
}}><FormattedMessage id="viewDetail" /></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(formData.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}</td>
<td style={tabelStyle}>{DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}</td>
<td style={tabelStyle}>
<FormattedMessage id="payOnlineRemark" values={{
date: DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")
}} />
{/* {DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} */}
</td>
</tr>
<tr>
<td style={tabelStyle}>
@@ -465,6 +473,9 @@ const FormPanel = ({ formData }) => {
<li><FormattedMessage id="store" /></li>
<li><FormattedMessage id="post" /></li>
</ul>
<Typography variant="h6">
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} />
</Typography>
</>
);
setIsWarningPopUp(true);
@@ -474,7 +485,7 @@ const FormPanel = ({ formData }) => {
<td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td>
<td style={tabelStyle}>
<FormattedMessage id="payDnRemark" values={{
date: DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" })) + " 12:00 p.m."
date: DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" })) + " 12:30 p.m."
}} />
</td>
</tr>
@@ -518,11 +529,11 @@ const FormPanel = ({ formData }) => {

</table>
</Grid>
<Grid item xs={12}>
{/* <Grid item xs={12}>
<Typography variant="h6" height="100%" >
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} />
</Typography>
</Grid>
</Grid> */}

<Grid item xs={12}>
<Typography variant="h6" height="100%" >
@@ -668,7 +679,7 @@ const FormPanel = ({ formData }) => {
aria-label={intl.formatMessage({ id: 'ok' })}
onClick={() => setIsWarningPopUp(false)}
>
OK
<FormattedMessage id="ok" />
</Button>
</DialogActions>
</Dialog>


+ 1
- 1
src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js Näytä tiedosto

@@ -625,7 +625,7 @@ const ApplicationDetailCard = (
</Grid>
<Grid container direction="row" justifyContent="flex-start"
alignItems="center">
<Grid item xs={12} md={12} lg={12} mt={1} >
<Grid item xs={12} md={12} lg={12} mt={1} mb={2}>
<Grid container alignItems={"center"}>
<Grid item xs={12} md={12} lg={12}>
<Grid container direction="row">


+ 5
- 5
src/pages/Setting/SystemSetting/Table.js Näytä tiedosto

@@ -1,6 +1,6 @@
// material-ui
import {
Box,
// Box,
Typography
} from '@mui/material';
import MainCard from "components/MainCard";
@@ -60,8 +60,8 @@ const Table = ({onRowClick, searchCriteria}) => {
System Params
</Typography>

<div style={{ width: '100%' }}>
<Box sx={{ backgroundColor: "#fff", ml: 2 }} height='100%'>
<div style={{ width: { xs: '92vw', sm: '96.5vw', md: "auto" }, }}>
{/* <Box width= '100%' sx={{ backgroundColor: "#fff", ml: 2 }} height='100%'> */}
<FiDataGrid
columns={columns}
customPageSize={10}
@@ -72,8 +72,8 @@ const Table = ({onRowClick, searchCriteria}) => {
params:_searchCriteria
}), [_searchCriteria])}
/>
</Box>
</div>
{/* </Box> */}
</div>
</MainCard>
);
};


+ 31
- 16
src/pages/Setting/SystemSetting/index.js Näytä tiedosto

@@ -3,13 +3,14 @@ import {
Grid,
Typography,
Stack,
Box,
// Box,
} from '@mui/material';
import * as React from "react";

import { GET_SYS_PARAMS } from "utils/ApiPathConst";

import Loadable from 'components/Loadable';
import MainCard from "components/MainCard";
const Table = Loadable(React.lazy(() => import('./Table')));
const Form = Loadable(React.lazy(() => import('./Form')));

@@ -78,22 +79,36 @@ const SystemSetting = () => {

{/*col 1*/}
<Grid item xs={12} >
<Grid container direction="row" sx={{ p: 2 }} spacing={2} >
<Grid item xs={12} md={8} lg={8} >
<Box xs={12} sx={{ borderRadius: '10px', backgroundColor: '#fff' }} >
<Table
searchCriteria={searchCriteria}
onRowClick={onRowClick}
/>
</Box>
<Grid container direction="row" sx={{ p: 2 }} spacing={1} >
<Grid item xs={12} sm={8} md={8} lg={8} >
<Grid container>
<Grid item xs={12} md={12}>
<MainCard elevation={0}
border={false}
content={false}
>
<Table
searchCriteria={searchCriteria}
onRowClick={onRowClick}
/>
</MainCard>
</Grid>
</Grid>
</Grid>
<Grid item xs={12} md={4} lg={4}>
<Box xs={12} sx={{ borderRadius: '10px', backgroundColor: '#fff' }}>
<Form
selectedItem={selectedItem}
onSave={onSave}
/>
</Box>
<Grid item xs={12} sm={4} md={4} lg={4}>
<Grid container>
<Grid item xs={12} md={12}>
<MainCard elevation={0}
border={false}
content={false}
>
<Form
selectedItem={selectedItem}
onSave={onSave}
/>
</MainCard>
</Grid>
</Grid>
</Grid>
</Grid>
</Grid>


+ 1
- 0
src/translations/en.json Näytä tiedosto

@@ -458,6 +458,7 @@

"payDnRemark": "Payment proof (e.g. ATM receipt, internet banking record) to be sent to [email protected] by {date}",
"payNPGORemark" :"Payment to be completed at Collection Office by {date}",
"payOnlineRemark" :"Payment to be completed at GPNSPS by {date}",

"before": "Before",
"page": "Page",


+ 5
- 4
src/translations/zh-CN.json Näytä tiedosto

@@ -43,7 +43,7 @@
"PaymentCoonpletDealine": "付款截止日期",
"payOnline":"透过此系统网上支付",
"payDn":"透过发出一般缴款单付款",
"payNPGO":"在 NPGO 收款办公室付款",
"payNPGO":"在北角政府合署收款处付款",
"paymentMeans":"付款方式",
"paymentMethodMeans":"可用的付款方式",
"fps":"转数快 (FPS)",
@@ -69,9 +69,10 @@
"fpsQrcodeTitle4":"剩余时间:",
"fpsQrcodeTitle5":"秒",
"payDnRemark": "在{date}之前将付款证明（如自动柜员机收据、网路银行记录）寄至 [email protected] ",
"payDnRemark": "在{date}之前将付款证明（如自动柜员机收据、网上银行记录）电邮寄至 [email protected] ",
"payNPGORemark" :"在{date}之前在收款办公室完成付款",

"payOnlineRemark" :"在{date}之前在 GPNSPS 完成网上付款",
"MSG.registerIAmSmart": "你可点击「智方便」按钮，系统会自动输入个人资料，或自行输入个人资料，以即时启动 公共启事提交及缴费系统 帐户。<br/>如欲使用「智方便」提供个人资料，请先下载「智方便」流动应用程式并登记成为「智方便」用户。",
"MSG.registerPersonal": "需上载身份证明文件数码档案以进行网上申请。 <br/>如：香港身份证; 护照; 中国内地身份证; 专业执业证书等",
"MSG.registerOrg": "需上载以下任何一份证明文件以进行网上申请。 <br/>如：商业登记证；专业执业证书",
@@ -377,7 +378,7 @@
"myRemarks": "其他备注",
"careOfRemark": "如果您想在付款收据上显示客户的名称，您可以在此处输入（例如个人或公司名称）。",
"status": "状态",
"viewDetail": "查看详细",
"viewDetail": "查看详情",
"price": "金额 ($)",
"pay": "付款",
"toBePaid": "待付款",


+ 4
- 3
src/translations/zh-HK.json Näytä tiedosto

@@ -43,7 +43,7 @@
"PaymentCoonpletDealine": "付款截止日期",
"payOnline":"透過此系統網上支付",
"payDn":"透過發出一般繳款單付款",
"payNPGO":"在 NPGO 收款辦公室付款",
"payNPGO":"在北角政府合署收款處付款",
"paymentMeans":"付款方式",
"paymentMethodMeans":"可用的付款方式",
"fps":"轉數快 (FPS)",
@@ -69,8 +69,9 @@
"fpsQrcodeTitle4":"剩餘時間:",
"fpsQrcodeTitle5":"秒",

"payDnRemark": "在{date}之前將付款證明（如自動櫃員機收據、網路銀行記錄）寄至 [email protected] ",
"payDnRemark": "在{date}之前將付款證明（如自動櫃員機收據、網上銀行記錄）電郵寄至 [email protected] ",
"payNPGORemark" :"在{date}之前在收款辦公室完成付款",
"payOnlineRemark" :"在{date}之前在 GPNSPS 完成網上付款",

"MSG.registerIAmSmart": "你可點擊「智方便」按鈕，系統會自動輸入個人資料，或自行輸入個人資料，以即時啟動 公共啟事提交及繳費系統 帳戶。<br/>如欲使用「智方便」提供個人資料，請先下載「智方便」流動應用程式並登記成為「智方便」用戶。",
"MSG.registerPersonal": "需上載身份證明文件數碼檔案以進行網上申請。<br/>如：香港身份證; 護照; 中國內地身份證; 專業執業証書等",
@@ -382,7 +383,7 @@
"myRemarks": "其他備註",
"careOfRemark": "如果您想在付款收據上顯示客戶的名稱，您可以在此處輸入（例如個人或公司名稱）。",
"status": "狀態",
"viewDetail": "查看詳細",
"viewDetail": "查看詳情",
"price": "金額 ($)",
"pay": "付款",
"toBePaid": "待付款",


Kirjoita Esikatselu
Ladataan…
Peruuta
Tallenna