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
3d8c563e
Commit
3d8c563e
authored
Oct 05, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into deni-dev(pc)
parents
b4f022ff
2dcba2e2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
4 deletions
+21
-4
BudgetTahunan.js
src/container/BudgetTahunan.js
+4
-2
AllDocument.js
src/container/DocumentManagement/AllDocument.js
+16
-2
DocumentManagement.js
src/container/DocumentManagement/DocumentManagement.js
+1
-0
No files found.
src/container/BudgetTahunan.js
View file @
3d8c563e
...
...
@@ -65,7 +65,8 @@ export default class BudgetTahunan extends Component {
lastPeriod
:
''
,
latestPeriode
:
''
,
minDateRevision
:
new
Date
(),
maxDateRevision
:
new
Date
()
maxDateRevision
:
new
Date
(),
btnApprove
:
false
}
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
}
...
...
@@ -376,6 +377,7 @@ export default class BudgetTahunan 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
},
()
=>
{
console
.
log
(
this
.
state
.
lastStatus
);
this
.
historyApproval
()
...
...
@@ -1100,7 +1102,7 @@ export default class BudgetTahunan extends Component {
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Review
<
/Typography
>
<
/div
>
<
/button
>
<
/div> :
this.state.lastStatus === 'WAITING FOR YOUR APPROVAL'
?
<
/div> :
(
this.state.lastStatus === 'WAITING FOR YOUR APPROVAL' && this.state.btnApprove
)
?
<
div
className
=
"grid grid-2x"
style
=
{{
borderTop
:
'solid 1px #c4c4c4'
,
padding
:
10
,
backgroundColor
:
'#f5f5f5'
,
width
:
'100%'
,
}}
>
<
div
className
=
"col-1"
>
<
button
...
...
src/container/DocumentManagement/AllDocument.js
View file @
3d8c563e
...
...
@@ -34,7 +34,6 @@ export default class getAllDocument extends Component {
componentDidMount
()
{
this
.
getData
()
console
.
log
(
this
.
props
.
userCompActive
)
}
componentWillReceiveProps
(
props
)
{
...
...
@@ -60,6 +59,20 @@ export default class getAllDocument extends Component {
response
.
data
.
data
.
map
((
item
,
index
)
=>
{
let
indexId
=
this
.
props
.
userCompActive
.
findIndex
((
val
)
=>
val
==
item
.
company_id
)
console
.
log
(
indexId
)
if
(
String
(
this
.
props
.
name
).
includes
(
'Manual'
)){
dataTable
.
push
(
[
index
,
item
.
document_name
,
item
.
description
,
item
.
company_name
,
item
.
document_month
,
item
.
document_periode
,
item
.
document_type
,
String
(
Number
(
item
.
document_size
)
/
1000
+
' KB'
),
item
.
created_by
,
item
.
created_at
,
])
}
else
{
if
(
indexId
!==
-
1
)
{
dataTable
.
push
(
[
index
,
...
...
@@ -74,6 +87,7 @@ export default class getAllDocument extends Component {
item
.
created_at
,
])
}
}
})
console
.
log
(
dataTable
)
this
.
setState
({
dataTable
,
loading
:
false
})
...
...
src/container/DocumentManagement/DocumentManagement.js
View file @
3d8c563e
...
...
@@ -296,6 +296,7 @@ export default class DocumentManagement extends Component {
userCompActive
=
{
this
.
state
.
userCompActive
}
allsubcoEdit
=
{
this
.
state
.
btnadd
}
handleLoading
=
{
this
.
handleLoading
.
bind
(
this
)}
name
=
{
this
.
state
.
name
}
/
>
// this.state.id === 68542 ?
// <AuditTahunan
...
...
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