Skip to content

T
Tia-dev
Commit 44e3e8f8 authored by d.arizona's avatar d.arizona
Browse files
Options

push

parent 3ef2d52d
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
src/container/MonthlyReport.js
View file @ 44e3e8f8
......@@ -68,7 +68,8 @@ export default class MonthlyReport extends Component {
listStatus: [],
selectedStatus: [],
detailRevisiCheck: [],
isApprovedMB: false
isApprovedMB: false,
textRevision: ''
}
this.myRef = React.createRef()
this.fileHandler = this.fileHandler.bind(this);
......@@ -581,7 +582,8 @@ export default class MonthlyReport extends Component {
lastRevision: response.data.data.last_revision,
btnApprove: response.data.data.is_submit,
monthlyReportId: response.data.data ? response.data.data.monthly_report_id : null,
isApprovedMB: response.data.data.is_approved_master_budget
isApprovedMB: response.data.data.is_approved_master_budget,
textRevision: response.data.data.text_revision
}, () => {
// // console.log(this.state.lastStatus);
this.historyApproval()
......@@ -1370,6 +1372,7 @@ export default class MonthlyReport extends Component {
style={{ width: 250 }}
onChange={(event, newInputValue) => {
this.setState({selectedStatus: newInputValue}, () => {
console.log(newInputValue);
this.getCompanySubmitted()
})
}}
......@@ -1433,7 +1436,7 @@ export default class MonthlyReport extends Component {
<div style={{ width: '50%' }}>
<Typography style={{ fontSize: '16px', color: '#4b4b4b', fontWeight: 'bold' }}>Attachment: </Typography>
</div>
{!this.state.approverTrue && (this.state.lastStatus === 'SUBMIT' || this.state.lastStatus === 'REVISION') && (
{!this.state.checkApprover && (this.state.lastStatus === 'SUBMIT' || this.state.lastStatus === 'REVISION') && (
<div style={{ width: '50%' }}>
<button
style={{
......@@ -1479,7 +1482,7 @@ export default class MonthlyReport extends Component {
: null
}
</div>
{!this.state.approverTrue && (this.state.lastStatus === 'SUBMIT' || this.state.lastStatus === 'REVISION') && (
{!this.state.checkApprover && (this.state.lastStatus === 'SUBMIT' || this.state.lastStatus === 'REVISION') && (
<div style={{ width: '50%' }}>
{
this.state.listAttachment.length > 0 ?
......@@ -1534,7 +1537,7 @@ export default class MonthlyReport extends Component {
</div> :
this.state.lastStatus === 'REVISION' ?
<div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
<span>NEED REVISION</span>
<span>{this.state.textRevision}</span>
</div> :
this.state.lastStatus === 'APPROVED' ?
<div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
......@@ -1587,7 +1590,7 @@ export default class MonthlyReport extends Component {
</div>
</div>
:
this.state.approverTrue?
this.state.checkApprover?
this.state.lastStatus === 'WAITING FOR REVIEW' ?
<div style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', display: 'flex', justifyContent: 'flex-end' }} >
<button
......
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