浏览代码

update

master
cyril.tsui 1年前
父节点
当前提交
9ab48d256e
共有 5 个文件被更改,包括 26 次插入24 次删除
  1. +18
    -18
      src/pages/Proof/Search_Public/DataGrid.js
  2. +2
    -2
      src/pages/Proof/Search_Public/SearchForm.js
  3. +4
    -2
      src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
  4. +1
    -1
      src/pages/User/SearchPage/UserSearchForm.js
  5. +1
    -1
      src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js

+ 18
- 18
src/pages/Proof/Search_Public/DataGrid.js 查看文件

@@ -37,7 +37,8 @@ export default function SearchPublicNoticeTable({ recordList }) {
navigate('/proof/reply/' + params.row.id); navigate('/proof/reply/' + params.row.id);
}; };


const getGroupTitle = (title) => {
/*eslint no-irregular-whitespace: ["error", { "skipComments": true }]*/
/*const getGroupTitle = (title) => {
switch (title) { switch (title) {
case 'Private Bill': case 'Private Bill':
return "私人帳單"; return "私人帳單";
@@ -52,9 +53,8 @@ export default function SearchPublicNoticeTable({ recordList }) {
default: default:
return title; return title;
} }
}


}*/
const columns = [ const columns = [
{ {
field: 'actions', field: 'actions',
@@ -68,17 +68,17 @@ export default function SearchPublicNoticeTable({ recordList }) {
{ {
id: 'appId', id: 'appId',
field: 'appId', field: 'appId',
headerName: '申請編號 / 憲報編號 / 憲報期數',
headerName: '申請編號 / 憲報期數',
flex: 1, flex: 1,
renderCell: (params) => { renderCell: (params) => {
let appNo = params.row.appNo; let appNo = params.row.appNo;
let code = params.row.groupNo;
// let code = params.row.groupNo;
let isssue = params.row.issueYear let isssue = params.row.issueYear
+ " Vol. " + FormatUtils.zeroPad(params.row.issueVolume, 3) + " Vol. " + FormatUtils.zeroPad(params.row.issueVolume, 3)
+ ", No. " + FormatUtils.zeroPad(params.row.issueNo, 2) + ", No. " + FormatUtils.zeroPad(params.row.issueNo, 2)
+ ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)"); + ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)");


return <div style={{ margin: 4 }}>{appNo}<br />{code}<br />{isssue}</div>
return <div style={{ margin: 4 }}>{appNo}<br />{isssue}</div>
}, },
}, },
{ {
@@ -110,15 +110,15 @@ export default function SearchPublicNoticeTable({ recordList }) {
return params?.value ? DateUtils.datetimeStr(params?.value) : ""; return params?.value ? DateUtils.datetimeStr(params?.value) : "";
} }
}, },
{
id: 'groupTitle',
field: 'groupTitle',
headerName: '憲報類型',
flex: 1,
valueGetter: (params) => {
return getGroupTitle(params?.value);
}
},
// {
// id: 'groupTitle',
// field: 'groupTitle',
// headerName: '憲報類型',
// flex: 1,
// valueGetter: (params) => {
// return getGroupTitle(params?.value);
// }
// },
{ {
id: 'fee', id: 'fee',
field: 'fee', field: 'fee',
@@ -147,9 +147,9 @@ export default function SearchPublicNoticeTable({ recordList }) {
paginationModel: { page: 0, pageSize: 10 }, paginationModel: { page: 0, pageSize: 10 },
}, },
}} }}
getRowHeight={()=>"auto"}
getRowHeight={() => "auto"}
onRowDoubleClick={handleRowDoubleClick} onRowDoubleClick={handleRowDoubleClick}
/> />
</div> </div>
); );
}
}

+ 2
- 2
src/pages/Proof/Search_Public/SearchForm.js 查看文件

@@ -154,7 +154,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
/> />
</Grid> </Grid>


<Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
{/* <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
<Autocomplete <Autocomplete
{...register("gazettGroup")} {...register("gazettGroup")}
disablePortal disablePortal
@@ -175,7 +175,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
/> />
)} )}
/> />
</Grid>
</Grid> */}


<Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}> <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
<TextField <TextField


+ 4
- 2
src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js 查看文件

@@ -480,7 +480,7 @@ const ApplicationDetailCard = (
</Grid> </Grid>
<Grid item xs={12} md={9} lg={9} sx={{ display: 'flex', alignItems: 'center' }}> <Grid item xs={12} md={9} lg={9} sx={{ display: 'flex', alignItems: 'center' }}>
<Grid container direction="row" justifyContent="flex-start"> <Grid container direction="row" justifyContent="flex-start">
<Grid item xs={12} md={5} lg={5} sx={{ display: 'flex', alignItems: 'center' }}>
<Grid item xs={12} md={8} lg={8} sx={{ display: 'flex', alignItems: 'center' }}>
<FormControl variant="outlined" fullWidth > <FormControl variant="outlined" fullWidth >
<Typography <Typography
fullWidth fullWidth
@@ -491,11 +491,13 @@ const ApplicationDetailCard = (
</Typography> </Typography>
</FormControl> </FormControl>
</Grid> </Grid>
<Grid item md={2} lg={2}>
<Grid item md={4} lg={4}>
<Button <Button
size="small" size="small"
variant="contained" variant="contained"
onClick={onDownloadClick()} onClick={onDownloadClick()}
title="下載"
style={{display:"flex-right"}}
sx={{ sx={{
textTransform: 'capitalize', textTransform: 'capitalize',
alignItems: 'end', alignItems: 'end',


+ 1
- 1
src/pages/User/SearchPage/UserSearchForm.js 查看文件

@@ -41,7 +41,7 @@ const UserSearchForm = ({ applySearch }) => {


const temp = { const temp = {
username: data.userName, username: data.userName,
fullenName: data.fullenName,
enName: data.fullenName,
post: data.post, post: data.post,
email: data.email, email: data.email,
phone: data.phone, phone: data.phone,


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

@@ -29,7 +29,7 @@ const UserSearchForm_Individual = ({ applySearch }) => {


const temp = { const temp = {
username: data.userName, username: data.userName,
fullenName: data.fullenName,
fullName: data.fullenName,
email: data.email, email: data.email,
phone: data.phone, phone: data.phone,
accountFilter: accountFilter, accountFilter: accountFilter,


正在加载...
取消
保存