diff --git a/src/pages/DemandNote/Search/DataGrid.js b/src/pages/DemandNote/Search/DataGrid.js index 2370d38..71d6600 100644 --- a/src/pages/DemandNote/Search/DataGrid.js +++ b/src/pages/DemandNote/Search/DataGrid.js @@ -43,7 +43,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) const findReadyToSend=()=>{ const temp = { - status: 'pending', + readySend: true }; applySearch(temp); } @@ -165,13 +165,14 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) { field: 'appNo', headerName: 'App No.', - width: 120, + width: 150, }, { id: 'contactPerson', field: 'contactPerson', headerName: 'Client', - width: 300, + minWidth: 300, + flex:1, renderCell: (params) => { let company = params.row.enCompanyName != null?params.row.enCompanyName: params.row.chCompanyName; company = company != null ? company : ""; @@ -200,7 +201,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) { field: 'cm', headerName: 'Length', - width: 100, + width: 120, renderCell: (params) => { return (<> {params?.value + "cm"}
@@ -211,7 +212,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) { field: 'amount', headerName: 'Amount($)', - width: 100, + width: 120, align: 'right', valueGetter: (params) => { return FormatUtils.currencyFormat(params?.value); @@ -220,7 +221,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) { field: 'dnNo', headerName: 'DN No.', - width: 220, + width: 250, renderCell: (params) => { return ; }, @@ -229,11 +230,11 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) id: 'issueDate', field: 'issueDate', headerName: 'Due Date / Sent Date', - width: 250, + width: 300, renderCell: (params) => { return (<> {DateUtils.dateStr(params?.value)} - {params.row.sentDate ? "
" + DateUtils.datetimeStr(params.row.sentDate) + " - " + params.row.sentBy : " / To be sent"} + {params.row.sentDate ? <>
{DateUtils.datetimeStr(params.row.sentDate)} - {params.row.sentBy} : <> / To be sent} ); } }, @@ -243,7 +244,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) renderHeader: () => ( <>DN File ), - width: 250, + width: 280, renderCell: (params) => { return ; },