Bläddra i källkod

add application remark auth

CR003
Alex Cheung 10 månader sedan
förälder
incheckning
77efaee1da
3 ändrade filer med 48 tillägg och 39 borttagningar
  1. +8
    -4
      src/layout/MainLayout/Header/index.js
  2. +38
    -34
      src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
  3. +2
    -1
      src/routes/GLDUserRoutes.js

+ 8
- 4
src/layout/MainLayout/Header/index.js Visa fil

@@ -324,10 +324,14 @@ function Header(props) {
:
<></>
}

<li>
<Link className="auditLogSetting" to='/setting/auditLog'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>Audit Log</Typography></Link>
</li>
{
isGranted("MAINTAIN_USER") ?
<li>
<Link className="auditLogSetting" to='/setting/auditLog'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>Audit Log</Typography></Link>
</li>
:
<></>
}
</ul>
</li>
<Box sx={{ display: { xs: 'none', sm: 'none', md: 'block' } }}>


+ 38
- 34
src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js Visa fil

@@ -686,43 +686,47 @@ const ApplicationDetailCard = (
<FormLabel><Typography variant="h5">Remarks:</Typography></FormLabel>
</Grid>

<Grid item xs={12} md={10} lg={10}>
<Grid container direction="row" >
<Grid item xs={12} md={9} lg={9} >
<FormControl variant="outlined" fullWidth disabled >
<OutlinedInput
fullWidth
size="small"
{...register("gldRemarks",
{
value: currentApplicationDetailData.gldRemarks,
})}
id='appNo'
sx={{
"& .MuiInputBase-input.Mui-disabled": {
WebkitTextFillColor: "#000000",
background: "#f8f8f8",
},
}}
/>
</FormControl>
</Grid>
<Grid item xs={12} ml={1} md={2} lg={2}>
<Button
// size="large"
variant="contained"
onClick={() => setRemarksPopUp(true)}
sx={{
textTransform: 'capitalize',
alignItems: 'end',
<Grid item xs={12} md={10} lg={10}>
<Grid container direction="row" >
<Grid item xs={12} md={9} lg={9} >
<FormControl variant="outlined" fullWidth disabled >
<OutlinedInput
fullWidth
size="small"
{...register("gldRemarks",
{
value: currentApplicationDetailData.gldRemarks,
})}
id='appNo'
sx={{
"& .MuiInputBase-input.Mui-disabled": {
WebkitTextFillColor: "#000000",
background: "#f8f8f8",
},
}}
/>
</FormControl>
</Grid>
{isGrantedAny(["MAINTAIN_APPLICATION","MAINTAIN_PAYMENT"]) ?
<Grid item xs={12} ml={1} md={2} lg={2}>
<Button
// size="large"
variant="contained"
onClick={() => setRemarksPopUp(true)}
sx={{
textTransform: 'capitalize',
alignItems: 'end',

}}>
<EditNoteIcon />
<Typography ml={1} variant="h5"> Edit</Typography>
</Button>
}}>
<EditNoteIcon />
<Typography ml={1} variant="h5"> Edit</Typography>
</Button>
</Grid>
:null
}
</Grid>
</Grid>
</Grid>

</Grid>
</Grid>


+ 2
- 1
src/routes/GLDUserRoutes.js Visa fil

@@ -187,10 +187,11 @@ const GLDUserRoutes = {
element: <DrImport />
}:{},

isGranted("MAINTAIN_USER")?
{
path: '/setting/auditLog',
element: <AuditLogPage />
},
}:{},

{
path: '/user/changePassword',


Laddar…
Avbryt
Spara