| @@ -43,7 +43,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) | |||||
| const findReadyToSend=()=>{ | const findReadyToSend=()=>{ | ||||
| const temp = { | const temp = { | ||||
| status: 'pending', | |||||
| readySend: true | |||||
| }; | }; | ||||
| applySearch(temp); | applySearch(temp); | ||||
| } | } | ||||
| @@ -165,13 +165,14 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) | |||||
| { | { | ||||
| field: 'appNo', | field: 'appNo', | ||||
| headerName: 'App No.', | headerName: 'App No.', | ||||
| width: 120, | |||||
| width: 150, | |||||
| }, | }, | ||||
| { | { | ||||
| id: 'contactPerson', | id: 'contactPerson', | ||||
| field: 'contactPerson', | field: 'contactPerson', | ||||
| headerName: 'Client', | headerName: 'Client', | ||||
| width: 300, | |||||
| minWidth: 300, | |||||
| flex:1, | |||||
| renderCell: (params) => { | renderCell: (params) => { | ||||
| let company = params.row.enCompanyName != null?params.row.enCompanyName: params.row.chCompanyName; | let company = params.row.enCompanyName != null?params.row.enCompanyName: params.row.chCompanyName; | ||||
| company = company != null ? company : ""; | company = company != null ? company : ""; | ||||
| @@ -200,7 +201,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) | |||||
| { | { | ||||
| field: 'cm', | field: 'cm', | ||||
| headerName: 'Length', | headerName: 'Length', | ||||
| width: 100, | |||||
| width: 120, | |||||
| renderCell: (params) => { | renderCell: (params) => { | ||||
| return (<> | return (<> | ||||
| {params?.value + "cm"}<br /> | {params?.value + "cm"}<br /> | ||||
| @@ -211,7 +212,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) | |||||
| { | { | ||||
| field: 'amount', | field: 'amount', | ||||
| headerName: 'Amount($)', | headerName: 'Amount($)', | ||||
| width: 100, | |||||
| width: 120, | |||||
| align: 'right', | align: 'right', | ||||
| valueGetter: (params) => { | valueGetter: (params) => { | ||||
| return FormatUtils.currencyFormat(params?.value); | return FormatUtils.currencyFormat(params?.value); | ||||
| @@ -220,7 +221,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) | |||||
| { | { | ||||
| field: 'dnNo', | field: 'dnNo', | ||||
| headerName: 'DN No.', | headerName: 'DN No.', | ||||
| width: 220, | |||||
| width: 250, | |||||
| renderCell: (params) => { | renderCell: (params) => { | ||||
| return <Button sx={{fontSize: '8px'}} onClick={handleDnClick(params)}><u>{params.row.dnNo}</u></Button>; | return <Button sx={{fontSize: '8px'}} onClick={handleDnClick(params)}><u>{params.row.dnNo}</u></Button>; | ||||
| }, | }, | ||||
| @@ -229,11 +230,11 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) | |||||
| id: 'issueDate', | id: 'issueDate', | ||||
| field: 'issueDate', | field: 'issueDate', | ||||
| headerName: 'Due Date / Sent Date', | headerName: 'Due Date / Sent Date', | ||||
| width: 250, | |||||
| width: 300, | |||||
| renderCell: (params) => { | renderCell: (params) => { | ||||
| return (<> | return (<> | ||||
| {DateUtils.dateStr(params?.value)} | {DateUtils.dateStr(params?.value)} | ||||
| {params.row.sentDate ? "<br />" + DateUtils.datetimeStr(params.row.sentDate) + " - " + params.row.sentBy : " / To be sent"} | |||||
| {params.row.sentDate ? <><br /> {DateUtils.datetimeStr(params.row.sentDate)} - {params.row.sentBy} </>: <> / To be sent</>} | |||||
| </>); | </>); | ||||
| } | } | ||||
| }, | }, | ||||
| @@ -243,7 +244,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) | |||||
| renderHeader: () => ( | renderHeader: () => ( | ||||
| <><DownloadIcon />DN File</> | <><DownloadIcon />DN File</> | ||||
| ), | ), | ||||
| width: 250, | |||||
| width: 280, | |||||
| renderCell: (params) => { | renderCell: (params) => { | ||||
| return <Button onClick={onDownloadClick(params)}><u>{params.row.filename}</u></Button>; | return <Button onClick={onDownloadClick(params)}><u>{params.row.filename}</u></Button>; | ||||
| }, | }, | ||||