Skip to content

T
Tia-dev
Commit 3111c9f1 authored by ardiansyah's avatar ardiansyah
Browse files
Options

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

Env dev

See merge request !2403
parents 52492b43 9dd6074b
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
src/container/MonthlyReport/MonthlyReport.js
View file @ 3111c9f1
...@@ -2612,6 +2612,8 @@ export default class MonthlyReport extends Component { ...@@ -2612,6 +2612,8 @@ export default class MonthlyReport extends Component {
lastStatusCat, lastStatusCat,
submitter, submitter,
submitterCAT, submitterCAT,
pic,
picCAT,
listAttachment, listAttachment,
listAttachmentCAT listAttachmentCAT
} = this.state; } = this.state;
...@@ -2619,8 +2621,8 @@ export default class MonthlyReport extends Component { ...@@ -2619,8 +2621,8 @@ export default class MonthlyReport extends Component {
const key = tableKeyParam ?? tableKey; const key = tableKeyParam ?? tableKey;
return key === 2 return key === 2
? { btnApprove: btnApproveCAT, lastStatus: lastStatusCat, submitter: submitterCAT, listAttachment: listAttachmentCAT } ? { btnApprove: btnApproveCAT, lastStatus: lastStatusCat, submitter: submitterCAT, pic: picCAT, listAttachment: listAttachmentCAT }
: { btnApprove, lastStatus, submitter, listAttachment }; : { btnApprove, lastStatus, submitter, pic, listAttachment };
}; };
renderFilter = () => { renderFilter = () => {
...@@ -3412,7 +3414,7 @@ export default class MonthlyReport extends Component { ...@@ -3412,7 +3414,7 @@ export default class MonthlyReport extends Component {
); );
const mstIdFinance = this.state?.rowDataFinance?.length > 0 && this.state.rowDataFinance[0]?.master_report_type_id const mstIdFinance = this.state?.rowDataFinance?.length > 0 && this.state.rowDataFinance[0]?.master_report_type_id
const mstIdCAT = this.state?.rowDataCAT?.length > 0 && this.state.rowDataCAT[0]?.master_report_type_ids const mstIdCAT = this.state?.rowDataCAT?.length > 0 && this.state.rowDataCAT[0]?.master_report_type_id
return ( return (
<div style={{ flex: 1, backgroundColor: '#f8f8f8', overflow: 'scroll' }}> <div style={{ flex: 1, backgroundColor: '#f8f8f8', overflow: 'scroll' }}>
<Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}> <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
...@@ -3521,8 +3523,8 @@ export default class MonthlyReport extends Component { ...@@ -3521,8 +3523,8 @@ export default class MonthlyReport extends Component {
options={options} options={options}
/> />
</MuiThemeProvider> </MuiThemeProvider>
{this.renderAttachment(mstIdFinance)} {this.renderAttachment(mstIdCAT)}
{this.renderApproveMB(mstIdFinance)} {this.renderApproveMB(mstIdCAT)}
{this.renderHistoryInfo(mstIdCAT)} {this.renderHistoryInfo(mstIdCAT)}
{this.state.visibleTableHistoryCAT && ( {this.state.visibleTableHistoryCAT && (
<div style={{ marginTop: 20 }}> <div style={{ marginTop: 20 }}>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment