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
35ed8ee7
Commit
35ed8ee7
authored
Sep 24, 2020
by
EKSAD
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into riri
parents
3a36d3ae
69f1194b
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
190 additions
and
37 deletions
+190
-37
ApprovalMatrix.js
src/container/ApprovalMatrix/ApprovalMatrix.js
+2
-2
TaxPlanning.js
src/container/BudgetTahunan/TaxPlanning.js
+177
-30
CreateManagementDoc.js
src/container/DocumentManagement/CreateManagementDoc.js
+1
-1
EditManagementDoc.js
src/container/DocumentManagement/EditManagementDoc.js
+7
-1
Parameter.js
src/container/MasterData/Parameter/Parameter.js
+2
-2
UnitBisnis.js
src/container/MasterData/UnitBisnis.js
+1
-1
No files found.
src/container/ApprovalMatrix/ApprovalMatrix.js
View file @
35ed8ee7
...
@@ -92,8 +92,8 @@ export default class ApprovalMatrix extends Component {
...
@@ -92,8 +92,8 @@ export default class ApprovalMatrix extends Component {
let
body
=
{
let
body
=
{
approval_matrix
:
payload
approval_matrix
:
payload
}
}
console
.
log
(
resp
.
rows
[
1
])
this
.
setState
({
payload
:
body
,
buttonError
:
false
,
judul
:
resp
.
rows
[
1
][
0
]
})
this
.
setState
({
payload
:
body
,
buttonError
:
false
,
judul
:
resp
.
rows
[
1
][
0
]
})
console
.
log
(
this
.
state
.
payload
)
}
}
});
});
}
}
...
@@ -621,7 +621,7 @@ export default class ApprovalMatrix extends Component {
...
@@ -621,7 +621,7 @@ export default class ApprovalMatrix extends Component {
filter
:
false
,
filter
:
false
,
sort
:
false
,
sort
:
false
,
customBodyRender
:
(
val
,
tableMeta
)
=>
{
customBodyRender
:
(
val
,
tableMeta
)
=>
{
console
.
log
(
tableMeta
)
//
console.log(tableMeta)
return
(
return
(
<
div
style
=
{{
display
:
'flex'
}}
>
<
div
style
=
{{
display
:
'flex'
}}
>
{
this
.
state
.
btnedit
&&
<
span
>
{
this
.
state
.
btnedit
&&
<
span
>
...
...
src/container/BudgetTahunan/TaxPlanning.js
View file @
35ed8ee7
This diff is collapsed.
Click to expand it.
src/container/DocumentManagement/CreateManagementDoc.js
View file @
35ed8ee7
...
@@ -64,7 +64,7 @@ export default class CreateManagementDoc extends Component {
...
@@ -64,7 +64,7 @@ export default class CreateManagementDoc extends Component {
if
(
response
.
data
)
{
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
setState
({
this
.
setState
({
sizeUpload
:
response
.
data
.
data
[
0
]
.
value
sizeUpload
:
response
.
data
.
data
[
0
]
?
response
.
data
.
data
[
0
].
value
===
undefined
?
"1"
:
response
.
data
.
data
[
0
].
value
:
"1"
})
})
}
}
}
}
...
...
src/container/DocumentManagement/EditManagementDoc.js
View file @
35ed8ee7
...
@@ -66,7 +66,7 @@ export default class EditManagementDoc extends Component {
...
@@ -66,7 +66,7 @@ export default class EditManagementDoc extends Component {
if
(
response
.
data
)
{
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
setState
({
this
.
setState
({
sizeUpload
:
response
.
data
.
data
[
0
]
.
value
sizeUpload
:
response
.
data
.
data
[
0
]
?
response
.
data
.
data
[
0
].
value
===
undefined
?
"1"
:
response
.
data
.
data
[
0
].
value
:
"1"
})
})
}
}
}
}
...
@@ -88,6 +88,7 @@ export default class EditManagementDoc extends Component {
...
@@ -88,6 +88,7 @@ export default class EditManagementDoc extends Component {
period
:
data
.
document_periode
,
period
:
data
.
document_periode
,
getMonthName
:
data
.
document_month
,
getMonthName
:
data
.
document_month
,
description
:
data
.
description
,
description
:
data
.
description
,
filePath
:
data
.
document_filepath
,
file
:
data
.
document_filepath
,
file
:
data
.
document_filepath
,
document_name
:
data
.
document_name
,
document_name
:
data
.
document_name
,
document_size
:
data
.
document_size
,
document_size
:
data
.
document_size
,
...
@@ -279,6 +280,10 @@ export default class EditManagementDoc extends Component {
...
@@ -279,6 +280,10 @@ export default class EditManagementDoc extends Component {
// this.setState({ errorDocument: true, msgErrorDocument: 'File Cannot be Empty' })
// this.setState({ errorDocument: true, msgErrorDocument: 'File Cannot be Empty' })
}
else
{
}
else
{
const
formData
=
new
FormData
();
const
formData
=
new
FormData
();
if
(
this
.
state
.
file
==
this
.
state
.
filePath
){
formData
.
append
(
"updated"
,
0
);
}
formData
.
append
(
"updated"
,
1
);
formData
.
append
(
"file"
,
this
.
state
.
file
);
formData
.
append
(
"file"
,
this
.
state
.
file
);
formData
.
append
(
"companyId"
,
this
.
state
.
getPerusahaan
.
company_id
);
formData
.
append
(
"companyId"
,
this
.
state
.
getPerusahaan
.
company_id
);
formData
.
append
(
"settingId"
,
this
.
state
.
getDocument
.
document_category_id
);
formData
.
append
(
"settingId"
,
this
.
state
.
getDocument
.
document_category_id
);
...
@@ -290,6 +295,7 @@ export default class EditManagementDoc extends Component {
...
@@ -290,6 +295,7 @@ export default class EditManagementDoc extends Component {
this
.
setState
({
formData
},
()
=>
{
this
.
setState
({
formData
},
()
=>
{
this
.
props
.
updateDocument
(
this
.
state
.
formData
)
this
.
props
.
updateDocument
(
this
.
state
.
formData
)
})
})
console
.
log
(
JSON
.
stringify
(
formData
))
}
}
}
}
...
...
src/container/MasterData/Parameter/Parameter.js
View file @
35ed8ee7
...
@@ -69,11 +69,11 @@ export default class Parameter extends Component {
...
@@ -69,11 +69,11 @@ export default class Parameter extends Component {
type
:
'MAX_FILE_SIZE'
type
:
'MAX_FILE_SIZE'
}
}
api
.
create
().
getAllSettingByType
(
body
).
then
(
response
=>
{
api
.
create
().
getAllSettingByType
(
body
).
then
(
response
=>
{
console
.
log
(
response
);
console
.
log
(
response
.
data
.
data
[
0
]
);
if
(
response
.
data
)
{
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
setState
({
this
.
setState
({
sizeUpload
:
response
.
data
.
data
[
0
]
.
value
sizeUpload
:
response
.
data
.
data
[
0
]
?
response
.
data
.
data
[
0
].
value
===
undefined
?
"1"
:
response
.
data
.
data
[
0
].
value
:
"1"
})
})
}
}
}
}
...
...
src/container/MasterData/UnitBisnis.js
View file @
35ed8ee7
...
@@ -240,7 +240,7 @@ export default class UnitBisnis extends Component {
...
@@ -240,7 +240,7 @@ export default class UnitBisnis extends Component {
if
(
response
.
data
)
{
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
setState
({
this
.
setState
({
sizeUpload
:
response
.
data
.
data
[
0
]
.
value
sizeUpload
:
response
.
data
.
data
[
0
]
?
response
.
data
.
data
[
0
].
value
===
undefined
?
"1"
:
response
.
data
.
data
[
0
].
value
:
"1"
})
})
}
}
}
}
...
...
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