Browse Source

Update UI

master
cyril.tsui 1 year ago
parent
commit
c6b2a7d99c
3 changed files with 13 additions and 5 deletions
  1. +2
    -1
      src/pages/PublicNotice/Details_GLD/index.js
  2. +4
    -4
      src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
  3. +7
    -0
      src/pages/pnspsUserGroupDetailPage/index.js

+ 2
- 1
src/pages/PublicNotice/Details_GLD/index.js View File

@@ -365,12 +365,13 @@ const PublicNoticeDetail_GLD = () => {
</Box> </Box>
</Grid> </Grid>
<Grid item xs={12} md={10}> <Grid item xs={12} md={10}>
<Box xs={12} ml={4} mt={3}>
<Box xs={12} ml={4} mt={3} sx={{ p: 2, border: '3px groove grey', borderRadius: '10px' }}>
<TabTableDetail <TabTableDetail
applicationDetailData={applicationDetailData} applicationDetailData={applicationDetailData}
proofList={proofList} proofList={proofList}
/> />
</Box> </Box>
<br/>
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>


+ 4
- 4
src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js View File

@@ -21,10 +21,10 @@ const ProofTab = Loadable(lazy(() => import('./ProofTab')));


// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //


const PublicNotice = ({applicationDetailData, proofList}) => {
const PublicNotice = ({ applicationDetailData, proofList }) => {
const [_proofList, setProofList] = React.useState([]); const [_proofList, setProofList] = React.useState([]);
const [inProgressList,] = React.useState([]); const [inProgressList,] = React.useState([]);
const [onReady,setOnReady] = React.useState(false);
const [onReady, setOnReady] = React.useState(false);
const [selectedTab, setSelectedTab] = React.useState("1"); const [selectedTab, setSelectedTab] = React.useState("1");
// const navigate = useNavigate(); // const navigate = useNavigate();
const [statusHistoryList, setStatusHistoryList] = React.useState([]); const [statusHistoryList, setStatusHistoryList] = React.useState([]);
@@ -66,13 +66,13 @@ const PublicNotice = ({applicationDetailData, proofList}) => {
!onReady ? !onReady ?
<LoadingComponent /> <LoadingComponent />
: :
<Grid container sx={{minHeight: '40vh'}}>
<Grid container sx={{ minHeight: '40vh' }}>
{/*col 2*/} {/*col 2*/}
<Grid item xs={12}> <Grid item xs={12}>
<TabContext value={selectedTab}> <TabContext value={selectedTab}>
<Box sx={{ borderBottom: 1, borderColor: 'divider' }}> <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
<TabList onChange={handleChange} aria-label="lab API tabs example"> <TabList onChange={handleChange} aria-label="lab API tabs example">
<Tab label={"Proof(" + (_proofList?.length?_proofList?.length:0) + ")"} value="1" />
<Tab label={"Proof(" + (_proofList?.length ? _proofList?.length : 0) + ")"} value="1" />
<Tab label={"Payment(" + inProgressList.length + ")"} value="2" /> <Tab label={"Payment(" + inProgressList.length + ")"} value="2" />
<Tab label={"Status History(" + statusHistoryList.length + ")"} value="3" /> <Tab label={"Status History(" + statusHistoryList.length + ")"} value="3" />
</TabList> </TabList>


+ 7
- 0
src/pages/pnspsUserGroupDetailPage/index.js View File

@@ -25,6 +25,7 @@ const GroupAuthCard = Loadable(lazy(() => import('./GroupAuthCard')));
const UserGroupInfoCard = Loadable(lazy(() => import('./UserGroupInfoCard'))); const UserGroupInfoCard = Loadable(lazy(() => import('./UserGroupInfoCard')));
const UserAddCard = Loadable(lazy(() => import('./UserAddCard'))); const UserAddCard = Loadable(lazy(() => import('./UserAddCard')));
import { useNavigate } from "react-router"; import { useNavigate } from "react-router";
import KeyboardBackspaceOutlinedIcon from '@mui/icons-material/KeyboardBackspaceOutlined';
import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'


const BackgroundHead = { const BackgroundHead = {
@@ -176,6 +177,12 @@ const UserMaintainPage = () => {
</Stack> </Stack>
</div> </div>
</Grid> </Grid>
<Grid item xs={12}>
<Button sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/usergroupSearchview") }}>
<KeyboardBackspaceOutlinedIcon />
<Typography variant="h4">Back</Typography>
</Button>
</Grid>
{/*col 1*/} {/*col 1*/}
<Grid item xs={12} md={5} lg={5}> <Grid item xs={12} md={5} lg={5}>
<Grid container> <Grid container>


Loading…
Cancel
Save