diff --git a/src/auth/utils.js b/src/auth/utils.js index 3dae272..3825631 100644 --- a/src/auth/utils.js +++ b/src/auth/utils.js @@ -10,8 +10,8 @@ export const hostname = 'localhost'; const hostPort = '8090'; export const hostPath = `http://${hostname}:${hostPort}`; //export const apiPath = `http://192.168.0.112:8090/api`; -// export const apiPath = `${hostPath}/api`; -export const apiPath = `/api`; +export const apiPath = `${hostPath}/api`; +//export const apiPath = `/api`; export const paymentPath = `https://pnspsdev.gld.gov.hk/payment`; export const iAmSmartPath = `https://`; diff --git a/src/pages/Proof/Search_Public/DataGrid.js b/src/pages/Proof/Search_Public/DataGrid.js index 76ffefc..72de2eb 100644 --- a/src/pages/Proof/Search_Public/DataGrid.js +++ b/src/pages/Proof/Search_Public/DataGrid.js @@ -59,7 +59,7 @@ export default function SearchPublicNoticeTable({ recordList }) { { field: 'actions', headerName: '校對編號', - width: 150, + width: 250, cellClassName: 'actions', renderCell: (params) => { return ; @@ -68,7 +68,7 @@ export default function SearchPublicNoticeTable({ recordList }) { { id: 'appId', field: 'appId', - headerName: '申請編號 / 憲報期數', + headerName: '申請編號 / 憲報期數 / 我的備註', flex: 1, renderCell: (params) => { let appNo = params.row.appNo; @@ -78,14 +78,14 @@ export default function SearchPublicNoticeTable({ recordList }) { + ", No. " + FormatUtils.zeroPad(params.row.issueNo, 2) + ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)"); - return
{appNo}
{isssue}
+ return
{appNo}
{isssue}
{params.row.appRemarks}
}, }, { id: 'created', field: 'created', headerName: '校對日期', - flex: 1, + width: 250, valueGetter: (params) => { return DateUtils.datetimeStr(params?.value); } @@ -94,7 +94,7 @@ export default function SearchPublicNoticeTable({ recordList }) { id: 'returnBeforeDate', field: 'returnBeforeDate', headerName: '此日期前回覆', - flex: 1, + width: 250, valueGetter: (params) => { let returnBeforeDate = DateUtils.convertToDate(params?.value); returnBeforeDate = returnBeforeDate.setHours(14, 0, 0, 0); @@ -105,7 +105,7 @@ export default function SearchPublicNoticeTable({ recordList }) { id: 'replyDate', field: 'replyDate', headerName: '回覆日期', - flex: 1, + width: 250, valueGetter: (params) => { return params?.value ? DateUtils.datetimeStr(params?.value) : ""; } @@ -123,7 +123,7 @@ export default function SearchPublicNoticeTable({ recordList }) { id: 'fee', field: 'fee', headerName: '費用', - flex: 1, + width: 250, valueGetter: (params) => { return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : ""; }