alex
/
PNSPS-frontend-MaterialUI
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

update

master
cyril.tsui 2 years ago
parent
4fc037c21d
commit
caaa87ceb3
4 changed files with 74 additions and 74 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/components/MainCard.js
  2. +24
    -24
      src/pages/PublicNotice/ListPanel/BaseGrid.js
  3. +26
    -26
      src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
  4. +23
    -23
      src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js

+ 1
- 1
src/components/MainCard.js View File

@@ -62,7 +62,7 @@ const MainCard = forwardRef(
fontFamily: theme.typography.fontFamily, fontFamily: theme.typography.fontFamily,
fontSize: '0.75rem' fontSize: '0.75rem'
}, },
maxWidth: { xs: 700, sm: 900, md: 1000, lg: 1300, xl: 1850 },
// maxWidth: { xs: 700, sm: 900, md: 1000, lg: 1300, xl: 1850 },
// minWidth: { xs: 600, sm: 800, md: 900, lg: 1000, xl: 1000 }, // minWidth: { xs: 600, sm: 800, md: 900, lg: 1000, xl: 1000 },
margin: { xs: 2.5, md: 3 }, margin: { xs: 2.5, md: 3 },
// '& > *': { // '& > *': {


+ 24
- 24
src/pages/PublicNotice/ListPanel/BaseGrid.js View File

@@ -33,32 +33,32 @@ export default function BaseGrid({rows}) {
return DateUtils.datetimeStr(params?.value); return DateUtils.datetimeStr(params?.value);
} }
}, },
{
id: 'contactPerson',
field: 'contactPerson',
headerName: '聯絡人',
flex: 2,
renderCell: (params) => {
let phone = JSON.parse(params.row.contactTelNo);
let faxNo = JSON.parse(params.row.contactFaxNo);
// {
// id: 'contactPerson',
// field: 'contactPerson',
// headerName: '聯絡人',
// flex: 2,
// renderCell: (params) => {
// let phone = JSON.parse(params.row.contactTelNo);
// let faxNo = JSON.parse(params.row.contactFaxNo);


let contact = "";
if (phone) {
contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber
}
// let contact = "";
// if (phone) {
// contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber
// }


if (faxNo && faxNo?.faxNumber) {
if (contact != "")
contact = contact + ", "
contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber
}
// if (faxNo && faxNo?.faxNumber) {
// if (contact != "")
// contact = contact + ", "
// contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber
// }


return (<>
{params?.value}<br />
{contact}
</>);
}
},
// return (<>
// {params?.value}<br />
// {contact}
// </>);
// }
// },
{ {
id: 'remarks', id: 'remarks',
field: 'remarks', field: 'remarks',
@@ -90,7 +90,7 @@ export default function BaseGrid({rows}) {
} }


return ( return (
<div style={{height: '100%', width: '100%', padding: 4}}>
<div style={{minHeight: 400, width: '100%', padding: 4}}>
<FiDataGrid <FiDataGrid
rows={rows} rows={rows}
columns={columns} columns={columns}


+ 26
- 26
src/pages/PublicNotice/ListPanel/PendingPaymentTab.js View File

@@ -39,32 +39,32 @@ export default function SubmittedTab({ rows }) {
return DateUtils.datetimeStr(params.value); return DateUtils.datetimeStr(params.value);
} }
}, },
{
id: 'contactPerson',
field: 'contactPerson',
headerName: '聯絡人',
flex: 2,
renderCell: (params) => {
let phone = JSON.parse(params.row.contactTelNo);
let faxNo = JSON.parse(params.row.contactFaxNo);
let contact = "";
if (phone) {
contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber
}
if (faxNo && faxNo?.faxNumber) {
if (contact != "")
contact = contact + ", "
contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber
}
return (<>
{params?.value}<br />
{contact}
</>);
}
},
// {
// id: 'contactPerson',
// field: 'contactPerson',
// headerName: '聯絡人',
// flex: 2,
// renderCell: (params) => {
// let phone = JSON.parse(params.row.contactTelNo);
// let faxNo = JSON.parse(params.row.contactFaxNo);
// let contact = "";
// if (phone) {
// contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber
// }
// if (faxNo && faxNo?.faxNumber) {
// if (contact != "")
// contact = contact + ", "
// contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber
// }
// return (<>
// {params?.value}<br />
// {contact}
// </>);
// }
// },
{ {
id: 'remarks', id: 'remarks',
field: 'remarks', field: 'remarks',


+ 23
- 23
src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js View File

@@ -37,32 +37,32 @@ export default function SearchPublicNoticeTable({ recordList }) {
return DateUtils.datetimeStr(params?.value); return DateUtils.datetimeStr(params?.value);
} }
}, },
{
id: 'contactPerson',
field: 'contactPerson',
headerName: '聯絡人',
flex: 2,
renderCell: (params) => {
let phone = JSON.parse(params.row.contactTelNo);
let faxNo = JSON.parse(params.row.contactFaxNo);
// {
// id: 'contactPerson',
// field: 'contactPerson',
// headerName: '聯絡人',
// flex: 2,
// renderCell: (params) => {
// let phone = JSON.parse(params.row.contactTelNo);
// let faxNo = JSON.parse(params.row.contactFaxNo);


let contact = "";
if (phone) {
contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber
}
// let contact = "";
// if (phone) {
// contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber
// }


if (faxNo && faxNo?.faxNumber) {
if (contact != "")
contact = contact + ", "
contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber
}
// if (faxNo && faxNo?.faxNumber) {
// if (contact != "")
// contact = contact + ", "
// contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber
// }


return (<>
{params?.value}<br />
{contact}
</>);
}
},
// return (<>
// {params?.value}<br />
// {contact}
// </>);
// }
// },
{ {
id: 'remarks', id: 'remarks',
field: 'remarks', field: 'remarks',


Write Preview
Loading…
Cancel
Save