alex
/
PNSPS-frontend-MaterialUI
1
0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

fix case 1-5

CR013B1
Alex Cheung 3 天前
父节点
f8fa390d85
当前提交
d2eafa69b8
共有 9 个文件被更改，包括 128 次插入 和 109 次删除
合并视图
Diff 选项
显示统计 下载 Patch 文件 下载 Diff 文件
  1. +21
    -6
      src/layout/MainLayout/Header/index.js
  2. +96
    -103
      src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
  3. +1
    -0
      src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js
  4. +1
    -0
      src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js
  5. +1
    -0
      src/pages/authentication/auth-forms/AuthLogin.js
  6. +1
    -0
      src/pages/authentication/auth-forms/AuthLoginCustom.js
  7. +1
    -0
      src/pages/iAmSmart/AuthCallback/index.js
  8. +1
    -0
      src/pages/iAmSmart/DirectLoginCallback/index.js
  9. +5
    -0
      src/utils/Utils.js

+ 21
- 6
src/layout/MainLayout/Header/index.js 查看文件

@@ -50,6 +50,7 @@ import {
isINDLoggedIn, isINDLoggedIn,
isPasswordExpiry, isPasswordExpiry,
haveOrgPaymentRecord, haveOrgPaymentRecord,
haveOrgDnRecord,
isORGLoggedIn, isORGLoggedIn,
checkSysEnv checkSysEnv
// getUserId // getUserId
@@ -401,17 +402,31 @@ function Header(props) {
: :
isORGLoggedIn() ? isORGLoggedIn() ?
haveOrgPaymentRecord() ? haveOrgPaymentRecord() ?
<Link className="manageOrgUser" to='/paymentPage/search'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="onlinePaymentHistory" />
</Typography></Link>
<>
<Link className="manageOrgUser" to='/paymentPage/search'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="onlinePaymentHistory" />
</Typography></Link>
{haveOrgDnRecord()?
<Link className="manageOrgUser" to='/paymentPage/demandNote'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="paymentInfoRecord" />
</Typography></Link>:null
}
</>
: :
<Link className="manageOrgUser" to='/paymentPage/demandNote'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}> <Link className="manageOrgUser" to='/paymentPage/demandNote'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="paymentInfoRecord" /> <FormattedMessage id="paymentInfoRecord" />
</Typography></Link> </Typography></Link>
: :
<Link className="manageOrgUser" to='/paymentPage/search'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="onlinePaymentHistory" />
</Typography></Link>
<>
<Link className="manageOrgUser" to='/paymentPage/search'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="onlinePaymentHistory" />
</Typography></Link>
{haveOrgDnRecord()?
<Link className="manageOrgUser" to='/paymentPage/demandNote'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
<FormattedMessage id="paymentInfoRecord" />
</Typography></Link>:null
}
</>
} }
</li> </li>
<li> <li>


+ 96
- 103
src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js 查看文件

@@ -19,7 +19,7 @@ import ForwardIcon from '@mui/icons-material/Forward';
import { import {
isORGLoggedIn, isORGLoggedIn,
isDummyLoggedIn, isDummyLoggedIn,
isCreditorLoggedIn,
// isCreditorLoggedIn,
checkIsOnlyOnlinePaymentByIssueDate checkIsOnlyOnlinePaymentByIssueDate
} from "utils/Utils"; } from "utils/Utils";


@@ -353,106 +353,101 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>

{!isCreditorLoggedIn() ?
<Grid item xs={12} alignItems={"center"} sx={{ p: 2 }}>
<table style={tabelStyle}>
<tbody>
<tr style={tabelStyle}>
<th style={tabelStyle} width="400" align="left"><FormattedMessage id="paymentMeans" /></th>
<th style={tabelStyle} width="300" align="left"><FormattedMessage id="confirmingDealine" /></th>
<th style={tabelStyle} width="300" align="left"><FormattedMessage id="PaymentCoonpletDealine" /></th>
</tr>
<tr>
<td style={tabelStyle}>
<FormattedMessage id="payOnline" />
<br /><a href="#payOnlineDetails" color='#fff' onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payOnline" }))
setWarningText(
<><FormattedMessage id="paymentMethodMeans" />:
<ul>
<li><FormattedMessage id="fps" /></li>
<li><FormattedMessage id="card" /></li>
<li><FormattedMessage id="pps" /></li>
</ul>
</>
);
setIsWarningPopUp(true);
}}><u><FormattedMessage id="viewDetail" /></u></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"2:00 p.m.":"下午2時"}</td>
<td style={tabelStyle}>
<FormattedMessage id="payOnlineRemark" values={{
date: DateUtils.dateFormat(closeDate, dft)
}} />
</td>
</tr>
{!isOnlyOnlinePayment?
<>
<tr>
<td style={tabelStyle}><FormattedMessage id="payDn" />
<br /><a href="#payDnDetails" onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" }))
setWarningText(
<><FormattedMessage id="paymentMethodMeans" />:
<ul>
<li><FormattedMessage id="atm" /></li>
<li><FormattedMessage id="pps" /></li>
<li><FormattedMessage id="eBank" /></li>
<li><FormattedMessage id="phoneBank" /></li>
<li><FormattedMessage id="eCheque" /></li>
<li><FormattedMessage id="fps" /></li>
<li><FormattedMessage id="hkpo" /></li>
<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);
}}><u><FormattedMessage id="viewDetail" /></u></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(closingDateOff, dft)} {locale==='en'?"5:00 p.m.":"下午5時"}</td>
<td style={tabelStyle}>
<FormattedMessage id="payDnRemark" values={{
date: DateUtils.dateFormat(closeDate, dft)
}} />
</td>
</tr>
<tr>
<td style={tabelStyle}><FormattedMessage id="payNPGO" />
<br /><a href="#payNPGODetails" onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" }))
setWarningText(
<><FormattedMessage id="paymentMethodMeans" />:
<ul>
<li><FormattedMessage id="cheque" /></li>
<li><FormattedMessage id="drafts" /></li>
<li><FormattedMessage id="cashierOrders" /></li>
<li><FormattedMessage id="cash" /></li>
</ul>
</>
);
setIsWarningPopUp(true);
}}><u><FormattedMessage id="viewDetail" /></u></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"12:00 p.m.":"下午12時"}</td>
<td style={tabelStyle}>
<FormattedMessage id="payNPGORemark" values={{
date: DateUtils.dateFormat(closeDate, dft)
}} />
</td>
</tr>
</>:null
}
</tbody>
</table>

</Grid> : null
}

<Grid item xs={12} alignItems={"center"} sx={{ p: 2 }}>
<table style={tabelStyle}>
<tbody>
<tr style={tabelStyle}>
<th style={tabelStyle} width="400" align="left"><FormattedMessage id="paymentMeans" /></th>
<th style={tabelStyle} width="300" align="left"><FormattedMessage id="confirmingDealine" /></th>
<th style={tabelStyle} width="300" align="left"><FormattedMessage id="PaymentCoonpletDealine" /></th>
</tr>
<tr>
<td style={tabelStyle}>
<FormattedMessage id="payOnline" />
<br /><a href="#payOnlineDetails" color='#fff' onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payOnline" }))
setWarningText(
<><FormattedMessage id="paymentMethodMeans" />:
<ul>
<li><FormattedMessage id="fps" /></li>
<li><FormattedMessage id="card" /></li>
<li><FormattedMessage id="pps" /></li>
</ul>
</>
);
setIsWarningPopUp(true);
}}><u><FormattedMessage id="viewDetail" /></u></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"2:00 p.m.":"下午2時"}</td>
<td style={tabelStyle}>
<FormattedMessage id="payOnlineRemark" values={{
date: DateUtils.dateFormat(closeDate, dft)
}} />
</td>
</tr>
{!isOnlyOnlinePayment?
<>
<tr>
<td style={tabelStyle}><FormattedMessage id="payDn" />
<br /><a href="#payDnDetails" onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" }))
setWarningText(
<><FormattedMessage id="paymentMethodMeans" />:
<ul>
<li><FormattedMessage id="atm" /></li>
<li><FormattedMessage id="pps" /></li>
<li><FormattedMessage id="eBank" /></li>
<li><FormattedMessage id="phoneBank" /></li>
<li><FormattedMessage id="eCheque" /></li>
<li><FormattedMessage id="fps" /></li>
<li><FormattedMessage id="hkpo" /></li>
<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);
}}><u><FormattedMessage id="viewDetail" /></u></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(closingDateOff, dft)} {locale==='en'?"5:00 p.m.":"下午5時"}</td>
<td style={tabelStyle}>
<FormattedMessage id="payDnRemark" values={{
date: DateUtils.dateFormat(closeDate, dft)
}} />
</td>
</tr>
<tr>
<td style={tabelStyle}><FormattedMessage id="payNPGO" />
<br /><a href="#payNPGODetails" onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" }))
setWarningText(
<><FormattedMessage id="paymentMethodMeans" />:
<ul>
<li><FormattedMessage id="cheque" /></li>
<li><FormattedMessage id="drafts" /></li>
<li><FormattedMessage id="cashierOrders" /></li>
<li><FormattedMessage id="cash" /></li>
</ul>
</>
);
setIsWarningPopUp(true);
}}><u><FormattedMessage id="viewDetail" /></u></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"12:00 p.m.":"下午12時"}</td>
<td style={tabelStyle}>
<FormattedMessage id="payNPGORemark" values={{
date: DateUtils.dateFormat(closeDate, dft)
}} />
</td>
</tr>
</>:null
}
</tbody>
</table>
</Grid>
<Grid item xs={12} md={12} lg={12}> <Grid item xs={12} md={12} lg={12}>
<Grid container direction="row" justifyContent="flex-start" alignItems="center"> <Grid container direction="row" justifyContent="flex-start" alignItems="center">
<Grid item xs={12} md={3} lg={3} <Grid item xs={12} md={3} lg={3}
@@ -528,9 +523,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
</> </>
: :
null null

} }

{ {
isDummyLoggedIn() ? isDummyLoggedIn() ?
<Grid item xs={12} md={12} lg={12}> <Grid item xs={12} md={12} lg={12}>


+ 1
- 0
src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js 查看文件

@@ -61,6 +61,7 @@ const UserSearchForm_Individual = ({ applySearch, onGridReady, searchCriteria })
email:"", email:"",
phone:"", phone:"",
}); });
localStorage.setItem('searchCriteria',"")
} }


return ( return (


+ 1
- 0
src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js 查看文件

@@ -77,6 +77,7 @@ const UserSearchForm_Organization = ({applySearch, orgComboData, onGridReady, se
contactPerson:"", contactPerson:"",
brNoStr:"", brNoStr:"",
}); });
localStorage.setItem('searchCriteria',"")
} }


return ( return (


+ 1
- 0
src/pages/authentication/auth-forms/AuthLogin.js 查看文件

@@ -76,6 +76,7 @@ const AuthLogin = () => {
abilities: response.data.abilities, abilities: response.data.abilities,
passwordExpiryDate: response.data.passwordExpiryDate, passwordExpiryDate: response.data.passwordExpiryDate,
orgPaymentRecord: response.data.orgPaymentRecord, orgPaymentRecord: response.data.orgPaymentRecord,
orgDnRecord: response.data.orgDnRecord,
//avatar: require('src/assets/images/users/avatar-3.png').default, //avatar: require('src/assets/images/users/avatar-3.png').default,
} }
// const abilities = response.data.abilities // const abilities = response.data.abilities


+ 1
- 0
src/pages/authentication/auth-forms/AuthLoginCustom.js 查看文件

@@ -92,6 +92,7 @@ const AuthLoginCustom = () => {
locale: response.data.preferLocale, locale: response.data.preferLocale,
passwordExpiryDate: response.data.passwordExpiryDate, passwordExpiryDate: response.data.passwordExpiryDate,
orgPaymentRecord: response.data.orgPaymentRecord, orgPaymentRecord: response.data.orgPaymentRecord,
orgDnRecord: response.data.orgDnRecord,
//avatar: require('src/assets/images/users/avatar-3.png').default, //avatar: require('src/assets/images/users/avatar-3.png').default,
} }
const data = { ...userData, accessToken: response.data.accessToken, refreshToken: response.data.refreshToken } const data = { ...userData, accessToken: response.data.accessToken, refreshToken: response.data.refreshToken }


+ 1
- 0
src/pages/iAmSmart/AuthCallback/index.js 查看文件

@@ -47,6 +47,7 @@ const Index = () => {
creditor: responseData.creditor, creditor: responseData.creditor,
passwordExpiryDate: responseData.passwordExpiryDate, passwordExpiryDate: responseData.passwordExpiryDate,
orgPaymentRecord: responseData.orgPaymentRecord, orgPaymentRecord: responseData.orgPaymentRecord,
orgDnRecord: responseData.orgDnRecord,
//locale: responseData.preferLocale, //locale: responseData.preferLocale,
//avatar: require('src/assets/images/users/avatar-3.png').default, //avatar: require('src/assets/images/users/avatar-3.png').default,
} }


+ 1
- 0
src/pages/iAmSmart/DirectLoginCallback/index.js 查看文件

@@ -47,6 +47,7 @@ const Index = () => {
creditor: responseData.creditor, creditor: responseData.creditor,
passwordExpiryDate: responseData.passwordExpiryDate, passwordExpiryDate: responseData.passwordExpiryDate,
orgPaymentRecord: responseData.orgPaymentRecord, orgPaymentRecord: responseData.orgPaymentRecord,
orgDnRecord: responseData.orgDnRecord,
//avatar: require('src/assets/images/users/avatar-3.png').default, //avatar: require('src/assets/images/users/avatar-3.png').default,
} }
const data = { ...userData, accessToken: responseData.accessToken, refreshToken: responseData.refreshToken } const data = { ...userData, accessToken: responseData.accessToken, refreshToken: responseData.refreshToken }


+ 5
- 0
src/utils/Utils.js 查看文件

@@ -100,6 +100,11 @@ export const haveOrgPaymentRecord = () =>{
return JSON.parse(localStorage.getItem('userData')).orgPaymentRecord return JSON.parse(localStorage.getItem('userData')).orgPaymentRecord
} }
} }
export const haveOrgDnRecord = () =>{
if (localStorage.getItem('userData') != null){
return JSON.parse(localStorage.getItem('userData')).orgDnRecord
}
}
export const checkSysEnv = () =>{ export const checkSysEnv = () =>{
if (localStorage.getItem('sysEnv') != null){ if (localStorage.getItem('sysEnv') != null){
// console.log(localStorage.getItem('sysEnv')) // console.log(localStorage.getItem('sysEnv'))


撰写 预览
正在加载...
取消
保存