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
b1adec00
Commit
b1adec00
authored
Oct 05, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rifka' into 'master'
issue docmanag & taxplan See merge request
!449
parents
9f65e6d7
32d31217
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
168 additions
and
203 deletions
+168
-203
TaxPlanning.js
src/container/BudgetTahunan/TaxPlanning.js
+145
-189
AllDocument.js
src/container/DocumentManagement/AllDocument.js
+1
-1
CreateManagementDoc.js
src/container/DocumentManagement/CreateManagementDoc.js
+17
-11
DocumentManagement.js
src/container/DocumentManagement/DocumentManagement.js
+5
-2
No files found.
src/container/BudgetTahunan/TaxPlanning.js
View file @
b1adec00
This diff is collapsed.
Click to expand it.
src/container/DocumentManagement/AllDocument.js
View file @
b1adec00
...
@@ -223,7 +223,7 @@ export default class getAllDocument extends Component {
...
@@ -223,7 +223,7 @@ export default class getAllDocument extends Component {
<
/button
>
<
/button
>
<
/a
>
<
/a
>
<
ReactTooltip
border
=
{
true
}
id
=
"download"
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
<
ReactTooltip
border
=
{
true
}
id
=
"download"
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
{
this
.
props
.
btnedit
&&
<
span
>
{
this
.
props
.
btnedit
&&
this
.
props
.
allsubcoEdit
&&
<
span
>
<
a
data
-
tip
=
{
'Edit'
}
data
-
for
=
"edit"
>
<
a
data
-
tip
=
{
'Edit'
}
data
-
for
=
"edit"
>
<
button
<
button
style
=
{{
style
=
{{
...
...
src/container/DocumentManagement/CreateManagementDoc.js
View file @
b1adec00
...
@@ -132,12 +132,23 @@ export default class CreateManagementDoc extends Component {
...
@@ -132,12 +132,23 @@ export default class CreateManagementDoc extends Component {
if
(
response
.
data
)
{
if
(
response
.
data
)
{
if
(
response
.
data
.
status
==
'success'
)
{
if
(
response
.
data
.
status
==
'success'
)
{
let
data
=
response
.
data
.
data
let
data
=
response
.
data
.
data
let
typeData
=
data
.
map
((
item
)
=>
{
let
typeData
=
[]
return
{
data
.
map
((
item
)
=>
{
if
(
String
(
item
.
value
).
includes
(
'Manual'
)){
if
(
this
.
props
.
allsubcoCreate
){
typeData
.
push
(
{
document_category_id
:
item
.
setting_id
,
document_category_id
:
item
.
setting_id
,
document_category_name
:
item
.
value
document_category_name
:
item
.
value
})
}
}
}
else
{
typeData
.
push
(
{
document_category_id
:
item
.
setting_id
,
document_category_name
:
item
.
value
})
})
}
})
console
.
log
(
typeData
)
let
typeProps
=
{
let
typeProps
=
{
options
:
typeData
.
sort
((
a
,
b
)
=>
a
.
document_category_id
-
b
.
document_category_id
),
options
:
typeData
.
sort
((
a
,
b
)
=>
a
.
document_category_id
-
b
.
document_category_id
),
getOptionLabel
:
(
option
)
=>
option
.
document_category_name
,
getOptionLabel
:
(
option
)
=>
option
.
document_category_name
,
...
@@ -243,16 +254,14 @@ export default class CreateManagementDoc extends Component {
...
@@ -243,16 +254,14 @@ export default class CreateManagementDoc extends Component {
validasi
()
{
validasi
()
{
if
(
this
.
state
.
disabledPeriode
===
true
)
{
if
(
this
.
state
.
disabledPeriode
===
true
)
{
if
(
R
.
isNil
(
this
.
state
.
getPerusahaan
))
{
if
(
R
.
isNil
(
this
.
state
.
getDocument
))
{
this
.
setState
({
errorPerusahaan
:
true
,
msgErrorPerusahaan
:
'Company Cannot be Empty'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
getDocument
))
{
this
.
setState
({
errorDocument
:
true
,
msgErrorDocument
:
'Category Cannot be Empty'
})
this
.
setState
({
errorDocument
:
true
,
msgErrorDocument
:
'Category Cannot be Empty'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
file
))
{
}
else
if
(
R
.
isNil
(
this
.
state
.
file
))
{
this
.
setState
({
alert
:
true
,
messageAlert
:
'File Cannot be Empty'
,
tipeAlert
:
'warning'
})
this
.
setState
({
alert
:
true
,
messageAlert
:
'File Cannot be Empty'
,
tipeAlert
:
'warning'
})
}
else
{
}
else
{
const
formData
=
new
FormData
();
const
formData
=
new
FormData
();
formData
.
append
(
"file"
,
this
.
state
.
file
);
formData
.
append
(
"file"
,
this
.
state
.
file
);
formData
.
append
(
"companyId"
,
this
.
state
.
getPerusahaan
.
company_id
);
formData
.
append
(
"companyId"
,
1
);
formData
.
append
(
"settingId"
,
this
.
state
.
getDocument
.
document_category_id
);
formData
.
append
(
"settingId"
,
this
.
state
.
getDocument
.
document_category_id
);
formData
.
append
(
"description"
,
this
.
state
.
description
);
formData
.
append
(
"description"
,
this
.
state
.
description
);
formData
.
append
(
"extension"
,
this
.
state
.
fileType
);
formData
.
append
(
"extension"
,
this
.
state
.
fileType
);
...
@@ -381,7 +390,6 @@ export default class CreateManagementDoc extends Component {
...
@@ -381,7 +390,6 @@ export default class CreateManagementDoc extends Component {
/
>
/
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
{
/* {String(this.props.name).includes('Manual Book TIA') ? false : ( */
}
{
this
.
state
.
disabledPeriode
===
false
?
{
this
.
state
.
disabledPeriode
===
false
?
<
div
className
=
"column-1"
>
<
div
className
=
"column-1"
>
<
div
style
=
{{
padding
:
10
,
borderRadius
:
5
}}
>
<
div
style
=
{{
padding
:
10
,
borderRadius
:
5
}}
>
...
@@ -403,8 +411,6 @@ export default class CreateManagementDoc extends Component {
...
@@ -403,8 +411,6 @@ export default class CreateManagementDoc extends Component {
/
>
/
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
// )}
// {String(this.props.name).includes('Manual Book TIA') ? false : (
:
true
}
:
true
}
{
this
.
state
.
disabledPeriode
===
false
?
{
this
.
state
.
disabledPeriode
===
false
?
<
div
className
=
"column-2"
>
<
div
className
=
"column-2"
>
...
...
src/container/DocumentManagement/DocumentManagement.js
View file @
b1adec00
...
@@ -93,7 +93,7 @@ export default class DocumentManagement extends Component {
...
@@ -93,7 +93,7 @@ export default class DocumentManagement extends Component {
}
}
createDocument
(
payload
,
settingID
,
menuName
)
{
createDocument
(
payload
,
settingID
,
menuName
)
{
this
.
setState
({
loading
:
true
})
this
.
setState
({
visibleCreate
:
false
,
loading
:
true
})
api
.
create
().
uploadDocument
(
payload
).
then
(
response
=>
{
api
.
create
().
uploadDocument
(
payload
).
then
(
response
=>
{
console
.
log
(
response
)
console
.
log
(
response
)
if
(
response
.
data
)
{
if
(
response
.
data
)
{
...
@@ -127,6 +127,7 @@ export default class DocumentManagement extends Component {
...
@@ -127,6 +127,7 @@ export default class DocumentManagement extends Component {
}
}
createUploadDocument
()
{
createUploadDocument
()
{
this
.
setState
({
visibleCreate
:
false
,
loading
:
true
})
const
formData
=
this
.
state
.
formData
const
formData
=
this
.
state
.
formData
formData
.
append
(
"documentId"
,
this
.
state
.
docId
)
formData
.
append
(
"documentId"
,
this
.
state
.
docId
)
formData
.
append
(
"updated"
,
1
)
formData
.
append
(
"updated"
,
1
)
...
@@ -253,7 +254,7 @@ export default class DocumentManagement extends Component {
...
@@ -253,7 +254,7 @@ export default class DocumentManagement extends Component {
{
this
.
state
.
loading
&&
loadingComponent
}
{
this
.
state
.
loading
&&
loadingComponent
}
<
Paper
style
=
{{
padding
:
20
}}
>
<
Paper
style
=
{{
padding
:
20
}}
>
<
div
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
}}
>
<
div
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
}}
>
{(
this
.
state
.
btncreate
&&
this
.
state
.
btnadd
)
&&
<
span
>
{(
this
.
state
.
btncreate
)
&&
<
span
>
<
a
data
-
tip
=
{
'Add'
}
data
-
for
=
"add"
>
<
a
data
-
tip
=
{
'Add'
}
data
-
for
=
"add"
>
<
div
style
=
{{
display
:
'grid'
,
justifyContent
:
'flex-end'
}}
>
<
div
style
=
{{
display
:
'grid'
,
justifyContent
:
'flex-end'
}}
>
<
button
<
button
...
@@ -295,6 +296,7 @@ export default class DocumentManagement extends Component {
...
@@ -295,6 +296,7 @@ export default class DocumentManagement extends Component {
load
=
{
this
.
state
.
load
}
load
=
{
this
.
state
.
load
}
setId
=
{
this
.
state
.
id
}
setId
=
{
this
.
state
.
id
}
userCompActive
=
{
this
.
state
.
userCompActive
}
userCompActive
=
{
this
.
state
.
userCompActive
}
allsubcoEdit
=
{
this
.
state
.
btnadd
}
/
>
/
>
// this.state.id === 68542 ?
// this.state.id === 68542 ?
// <AuditTahunan
// <AuditTahunan
...
@@ -359,6 +361,7 @@ export default class DocumentManagement extends Component {
...
@@ -359,6 +361,7 @@ export default class DocumentManagement extends Component {
setting_id
=
{
this
.
state
.
id
}
setting_id
=
{
this
.
state
.
id
}
name
=
{
this
.
state
.
name
}
name
=
{
this
.
state
.
name
}
handleLoading
=
{
this
.
handleLoading
.
bind
(
this
)}
handleLoading
=
{
this
.
handleLoading
.
bind
(
this
)}
allsubcoCreate
=
{
this
.
state
.
btnadd
}
/
>
/
>
)}
)}
<
/div
>
<
/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