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
723b4cd3
Commit
723b4cd3
authored
Dec 10, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'deni-' into 'master'
Deni See merge request
!784
parents
8d006290
4e3dc5c4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
BudgetTahunan.js
src/container/BudgetTahunan.js
+4
-3
MonthlyReport.js
src/container/MonthlyReport.js
+2
-2
No files found.
src/container/BudgetTahunan.js
View file @
723b4cd3
...
...
@@ -83,7 +83,7 @@ export default class BudgetTahunan extends Component {
})
this
.
props
.
selectIndex
(
'Master Budget & CAT'
)
if
(
this
.
props
.
location
.
state
!==
undefined
)
{
// //
console.log(this.props);
console
.
log
(
this
.
props
);
this
.
setState
({
userType
:
this
.
props
.
location
.
state
.
userType
,
intent
:
'Home'
,
lastPeriod
:
this
.
props
.
location
.
state
.
rawData
.
periode
,
rawData
:
this
.
props
.
location
.
state
.
rawData
},
()
=>
{
this
.
getPermission
()
// this.checkApprover()
...
...
@@ -562,7 +562,7 @@ export default class BudgetTahunan extends Component {
document
.
body
.
style
.
overflow
=
'hidden'
;
})
let
body
=
{
"approval_id"
:
this
.
props
.
location
.
state
==
undefined
?
this
.
state
.
approverID
:
this
.
state
.
rawData
.
approval_id
,
"approval_id"
:
this
.
state
.
approverID
,
"status"
:
type
,
"detail"
:
this
.
state
.
detailRevisiCheck
}
...
...
@@ -572,7 +572,8 @@ export default class BudgetTahunan extends Component {
"max_periode"
:
moment
(
this
.
state
.
maxDateRevision
).
format
(
'YYYY-MM-DD'
)
}
// // console.log(payload)
// // console.log(body)
// console.log(this.props.location);
// console.log(body)
api
.
create
().
approvalSubmission
(
body
).
then
((
res
)
=>
{
// // console.log(res)
// this.setState({ loading: false }, () => {
...
...
src/container/MonthlyReport.js
View file @
723b4cd3
...
...
@@ -718,7 +718,7 @@ export default class MonthlyReport extends Component {
}
render
()
{
const
columns
=
[
"#"
,
"
Jenis Laporan
"
,
const
columns
=
[
"#"
,
"
Report Type
"
,
{
name
:
"Revision"
,
options
:
{
...
...
@@ -901,7 +901,7 @@ export default class MonthlyReport extends Component {
})}
disableClearable
style
=
{{
width
:
250
}}
renderInput
=
{(
params
)
=>
<
TextField
{...
params
}
label
=
"Period
e
"
margin
=
"normal"
style
=
{{
marginTop
:
7
}}
/>
}
renderInput
=
{(
params
)
=>
<
TextField
{...
params
}
label
=
"Period"
margin
=
"normal"
style
=
{{
marginTop
:
7
}}
/>
}
value
=
{
this
.
state
.
periode
}
/
>
<
/div
>
...
...
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