diff --git a/src/pages/DemandNote/Create/DataGrid.js b/src/pages/DemandNote/Create/DataGrid.js index 333634d..6a1d18d 100644 --- a/src/pages/DemandNote/Create/DataGrid.js +++ b/src/pages/DemandNote/Create/DataGrid.js @@ -54,54 +54,41 @@ export default function SearchPublicNoticeTable({ recordList }) { return PublicNoteStatusUtils.getStatusByTextEng(params.row.status, params.row.creditor); } }, - { - field: 'date', - headerName: 'Submit Date', - flex: 1, - minWidth: 200, - renderCell: (params) => { - return DateUtils.datetimeStr(params.row.created); - } - }, + // { + // field: 'date', + // headerName: 'Submit Date', + // flex: 1, + // minWidth: 200, + // renderCell: (params) => { + // return DateUtils.datetimeStr(params.row.created); + // } + // }, { id: 'contactPerson', field: 'contactPerson', - headerName: 'Contact Person', - flex: 1, - minWidth: 200, + headerName: 'Client', + flex: 3, + minWidth: 300, renderCell: (params) => { let company = params.row.enCompanyName != null?params.row.enCompanyName: params.row.chCompanyName; company = company != null ? company : ""; - - /* - let phone = JSON.parse(params.row.contactTelNo); - let faxNo = JSON.parse(params.row.contactFaxNo); - - let contact = ""; - if (phone) { - contact = "Phone No.: " + phone?.countryCode + " " + phone?.phoneNumber - } - - if (faxNo && faxNo?.faxNumber) { - if (contact != "") - contact = contact + ", " - contact = contact + "Fax No.:" + faxNo?.countryCode + " " + faxNo?.faxNumber - } - */ - - return (<> - {params?.value}
{company} - ); + return
+ {params?.value}
{company}
Client Remark: {params.row.careOf} +
; } }, { id: 'groupNo', field: 'groupNo', - headerName: 'Gazette Group', - flex: 1, - minWidth: 150, - valueGetter: (params) => { - return (params?.value) ? (params?.value) : ""; + headerName: 'Gazette', + flex: 2, + minWidth: 300, + renderCell: (params) => { + return <>{params.row.issueYear + + " Vol. " + FormatUtils.zeroPad(params.row.issueVolume, 3) + + ", No. " + FormatUtils.zeroPad(params.row.issueNo, 2) + + ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)")} +
{(params?.value)}; } }, { @@ -109,7 +96,7 @@ export default function SearchPublicNoticeTable({ recordList }) { field: 'fee', headerName: 'Amount($)', flex: 1, - minWidth: 150, + minWidth: 100, valueGetter: (params) => { return FormatUtils.currencyFormat(params?.value); } diff --git a/src/translations/en.json b/src/translations/en.json index a23c157..56bfcd9 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -285,7 +285,7 @@ "applyPublicNotice": "Apply for Public Notice", - "attention": "attention", + "attention": "Attention", "to": "To", "all": "All", "success": "Success",