Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
bbf74390
Commit
bbf74390
authored
Apr 30, 2021
by
d.arizona
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
handle q1 approve
parent
acb4bd4f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
3 deletions
+27
-3
RollingOutlook.js
src/container/RollingOutlook.js
+27
-3
No files found.
src/container/RollingOutlook.js
View file @
bbf74390
...
...
@@ -265,7 +265,7 @@ export default class RollingOutlook extends Component {
item
.
number
,
item
.
report_name
,
item
.
revision
,
this
.
state
.
isSubmit
===
false
?
"CLOSED"
:
item
.
current_status
,
this
.
state
.
quarter
.
value
==
'q1'
&&
!
this
.
state
.
isApprovedMB
?
"CLOSED"
:
(
this
.
state
.
quarter
.
value
!=
'q1'
&&
!
this
.
state
.
isApprovedRO
?
"CLOSED"
:
(
this
.
state
.
isSubmit
===
false
?
"CLOSED"
:
item
.
current_status
))
,
item
.
report_id
,
// Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
item
.
report_name
===
"Cash Flow"
?
item
.
is_can_upload
:
(
Number
(
item
.
revision
)
>
0
?
(
item
.
current_status
==
"not-yet"
?
false
:
item
.
is_can_upload
)
:
item
.
is_can_upload
),
...
...
@@ -540,7 +540,11 @@ export default class RollingOutlook extends Component {
lastStatus
:
response
.
data
.
data
.
last_status
===
null
?
'SUBMIT'
:
response
.
data
.
data
.
last_status
,
loading
:
false
,
lastRevision
:
response
.
data
.
data
.
last_revision
,
btnApprove
:
response
.
data
.
data
.
is_submit
btnApprove
:
response
.
data
.
data
.
is_submit
,
isApprovedMB
:
response
.
data
.
data
.
is_approved_master_budget
,
isApprovedRO
:
response
.
data
.
data
.
is_approved_rolling_before
,
msgApproveMB
:
response
.
data
.
data
.
message_approval_master_budget
,
msgApproveRO
:
response
.
data
.
data
.
message_approval_rolling_outlook
},
()
=>
{
console
.
log
(
this
.
state
.
lastStatus
);
this
.
historyApproval
()
...
...
@@ -1768,6 +1772,16 @@ export default class RollingOutlook extends Component {
<
/div
>
)}
<
/div
>
{
this
.
state
.
quarter
!=
null
&&
this
.
state
.
quarter
.
value
==
'q1'
&&
this
.
state
.
isApprovedMB
===
false
&&
(
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
<
span
>
{
this
.
state
.
msgApproveMB
}
<
/span
>
<
/div
>
)}
{
this
.
state
.
quarter
!=
null
&&
this
.
state
.
quarter
.
value
!=
'q1'
&&
this
.
state
.
isApprovedRO
===
false
&&
(
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
<
span
>
{
this
.
state
.
msgApproveRO
}
<
/span
>
<
/div
>
)}
{
this
.
state
.
checkApprover
===
true
?
this
.
state
.
lastStatus
===
'WAITING FOR REVIEW'
?
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
...
...
@@ -1775,7 +1789,16 @@ export default class RollingOutlook extends Component {
<
/div> : this.state.lastStatus === 'WAITING FOR YOUR APPROVAL'
?
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
<
span
>
{
this
.
state
.
lastStatus
}
<
/span
>
<
/div> : nul
l
<
/div> : this.state.lastStatus === 'WAITING FOR APPROVAL'
?
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
<
span
>
{
`
${
this
.
state
.
lastStatus
}
-
${
this
.
state
.
pic
}
`
}
<
/span
>
<
/div> : this.state.lastStatus === 'REVISION'
?
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
<
span
>
{
this
.
state
.
textRevision
}
<
/span
>
<
/div> : this.state.lastStatus === 'APPROVED'
?
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
<
span
>
{
`
${
this
.
state
.
lastStatus
}
`
}
<
/span
>
<
/div> : nul
l
:
this
.
state
.
lastStatus
===
'SUBMITTED'
?
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
...
...
@@ -2008,6 +2031,7 @@ export default class RollingOutlook extends Component {
quarter
=
{
this
.
state
.
quarter
.
value
}
isApprover
=
{
this
.
state
.
isApprover
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
PLBSFAMSubmitted
=
{
this
.
state
.
lastStatus
==
'APPROVED'
?
true
:
false
}
/
>
)}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment