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
d7f22e87
Commit
d7f22e87
authored
Oct 11, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'deni-dev(pc)' into 'master'
last See merge request
!503
parents
5bc900c9
b288fc9b
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
48 deletions
+52
-48
index.js
src/api/index.js
+5
-1
BalanceSheet.js
src/container/BudgetTahunan/BalanceSheet.js
+12
-11
OperatingIndicator.js
src/container/OprIndicator/OperatingIndicator.js
+35
-36
No files found.
src/api/index.js
View file @
d7f22e87
...
...
@@ -212,6 +212,8 @@ const create = (type = "") => {
const
historyApproval
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/history_approval'
,
body
)
const
getOpetratingIndID
=
(
body
)
=>
api
.
post
(
'transaction/operating_indicator/get_operating_indicator_id'
,
body
)
const
getSubmitOI
=
(
body
)
=>
api
.
post
(
'transaction/operating_indicator/get_latest_periode_submit'
,
body
)
const
getLastPeriodOI
=
(
idCompany
)
=>
api
.
get
(
`transaction/operating_indicator/get_last_periode/
${
idCompany
}
`
)
const
getAllOperatingInd
=
(
body
)
=>
api
.
post
(
'transaction/operating_indicator/get_all_report'
,
body
)
const
getOperatingIndDetail
=
(
body
)
=>
api
.
post
(
'transaction/operating_indicator/get_report_hierarki'
,
body
)
const
createOpetaingInd
=
(
body
)
=>
api
.
post
(
'transaction/operating_indicator/create_operating_indicator_report'
,
body
)
...
...
@@ -417,7 +419,9 @@ const create = (type = "") => {
getReportOLPA
,
approvalSubmissionOLPA
,
checkApproverOLPA
,
getLastPeriodeOI
getLastPeriodeOI
,
getSubmitOI
,
getLastPeriodOI
}
}
...
...
src/container/BudgetTahunan/BalanceSheet.js
View file @
d7f22e87
...
...
@@ -46,7 +46,8 @@ export default class BalanceSheet extends Component {
buttonError
:
false
,
judulColumn
:
null
,
updateBy
:
'-'
,
handleTekTekTek
:
0
handleTekTekTek
:
0
,
saveDraft
:
true
}
this
.
handleValue
=
this
.
handleValue
.
bind
(
this
)
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
...
...
@@ -331,15 +332,15 @@ export default class BalanceSheet extends Component {
item
.
total_next_year
,
item
.
total_more_year
,
item
.
orders
,
item
.
condition_it_should_be
?
item
.
condition_it_should_be
:
'0'
,
item
.
condition_if_wrong
?
item
.
condition_if_wrong
:
"STOPPER"
,
item
.
condition_it_should_be
,
item
.
condition_if_wrong
,
item
.
error
]
})
this
.
setState
({
dataTable
,
dataLoaded
:
true
,
loading
:
false
,
buttonError
:
false
,
editable
:
true
},
()
=>
{
this
.
setState
({
dataTable
,
dataLoaded
:
true
,
loading
:
false
,
buttonError
:
false
,
editable
:
true
,
errorPreview
:
false
},
()
=>
{
this
.
state
.
dataTable
.
map
(
item
=>
{
if
(
item
[
25
].
length
>
0
)
{
console
.
log
(
'
masuk
'
)
console
.
log
(
'
error
'
)
this
.
setState
({
buttonError
:
true
,
errorPreview
:
true
,
editable
:
true
})
}
})
...
...
@@ -451,9 +452,9 @@ export default class BalanceSheet extends Component {
api
.
create
().
validateSubmitReport
(
payload
).
then
((
response
)
=>
{
console
.
log
(
response
)
if
(
response
.
data
.
data
.
result
)
{
this
.
setState
({
loading
:
false
,
buttonError
:
false
,
editable
:
false
})
this
.
setState
({
loading
:
false
,
buttonError
:
false
,
editable
:
false
,
saveDraft
:
false
})
}
else
{
this
.
setState
({
loading
:
false
,
buttonError
:
true
,
editable
:
true
})
this
.
setState
({
loading
:
false
,
buttonError
:
true
,
editable
:
true
,
saveDraft
:
false
})
}
})
}
...
...
@@ -3022,13 +3023,13 @@ export default class BalanceSheet extends Component {
type
=
"button"
style
=
{{
backgroundColor
:
'transparent'
,
cursor
:
this
.
state
.
editable
!==
true
?
'pointer'
:
'default'
,
cursor
:
this
.
state
.
saveDraft
!==
true
?
'pointer'
:
'default'
,
borderColor
:
'transparent'
,
outline
:
'none'
,
marginRight
:
20
}}
onClick
=
{()
=>
this
.
state
.
editable
===
true
?
this
.
state
.
saveDraft
===
true
?
null
:
this
.
state
.
handleTekTekTek
==
1
?
null
:
this
.
setState
({
handleTekTekTek
:
1
},
()
=>
{
...
...
@@ -3132,13 +3133,13 @@ export default class BalanceSheet extends Component {
type
=
"button"
style
=
{{
backgroundColor
:
'transparent'
,
cursor
:
this
.
state
.
e
ditable
!==
true
?
'pointer'
:
'default'
,
cursor
:
this
.
state
.
e
rrorPreview
!==
true
?
'pointer'
:
'default'
,
borderColor
:
'transparent'
,
outline
:
'none'
,
marginRight
:
20
}}
onClick
=
{()
=>
this
.
state
.
e
ditable
===
true
?
this
.
state
.
e
rrorPreview
===
true
?
null
:
this
.
setState
({
loading
:
true
},
()
=>
this
.
state
.
handleTekTekTek
==
1
?
null
:
...
...
src/container/OprIndicator/OperatingIndicator.js
View file @
d7f22e87
This diff is collapsed.
Click to expand it.
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