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
6ba78d5f
Commit
6ba78d5f
authored
Sep 28, 2020
by
Rifka Kurnia Irfiana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
taxplan form
parent
f859094d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
TaxPlanning.js
src/container/BudgetTahunan/TaxPlanning.js
+6
-4
EditManagementDoc.js
src/container/DocumentManagement/EditManagementDoc.js
+10
-3
No files found.
src/container/BudgetTahunan/TaxPlanning.js
View file @
6ba78d5f
...
...
@@ -121,7 +121,8 @@ export default class TaxPlanning extends Component {
{
tbc
:
item
.
tax_planning
.
december
.
tbc
,
fcp
:
item
.
tax_planning
.
december
.
fcp
,
tbf
:
item
.
tax_planning
.
december
.
tbf
},
item
.
tax_planning
.
total_current_year
,
{
tbc
:
item
.
tax_planning
.
total_next_year
.
tbc
,
fcp
:
item
.
tax_planning
.
total_next_year
.
fcp
,
tbf
:
item
.
tax_planning
.
total_next_year
.
tbf
},
{
tbc
:
item
.
tax_planning
.
total_more_year
.
tbc
,
fcp
:
item
.
tax_planning
.
total_more_year
.
fcp
,
tbf
:
item
.
tax_planning
.
total_more_year
.
tbf
}
{
tbc
:
item
.
tax_planning
.
total_more_year
.
tbc
,
fcp
:
item
.
tax_planning
.
total_more_year
.
fcp
,
tbf
:
item
.
tax_planning
.
total_more_year
.
tbf
},
item
.
order
])
}
if
(
item
.
children
!==
null
)
{
...
...
@@ -158,7 +159,8 @@ export default class TaxPlanning extends Component {
{
tbc
:
item
.
tax_planning
.
december
.
tbc
,
fcp
:
item
.
tax_planning
.
december
.
fcp
,
tbf
:
item
.
tax_planning
.
december
.
tbf
},
item
.
tax_planning
.
total_current_year
,
{
tbc
:
item
.
tax_planning
.
total_next_year
.
tbc
,
fcp
:
item
.
tax_planning
.
total_next_year
.
fcp
,
tbf
:
item
.
tax_planning
.
total_next_year
.
tbf
},
{
tbc
:
item
.
tax_planning
.
total_more_year
.
tbc
,
fcp
:
item
.
tax_planning
.
total_more_year
.
fcp
,
tbf
:
item
.
tax_planning
.
total_more_year
.
tbf
}
{
tbc
:
item
.
tax_planning
.
total_more_year
.
tbc
,
fcp
:
item
.
tax_planning
.
total_more_year
.
fcp
,
tbf
:
item
.
tax_planning
.
total_more_year
.
tbf
},
item
.
order
])
if
(
item
.
children
!==
null
)
{
if
(
item
.
children
.
length
>
0
)
{
...
...
@@ -800,7 +802,7 @@ export default class TaxPlanning extends Component {
let
reg
=
/^
\d
+$/
splitOperator
.
map
((
item
)
=>
{
if
(
reg
.
test
(
item
)
===
true
)
{
let
i
=
dataTable2
.
findIndex
((
val
)
=>
val
[
2
3
]
==
item
)
let
i
=
dataTable2
.
findIndex
((
val
)
=>
val
[
2
4
]
==
item
)
if
(
i
>
0
)
{
rilFormula
=
rilFormula
.
replace
(
item
,
dataTable2
[
i
][
tableMeta
.
columnIndex
]
===
""
?
"0"
:
dataTable2
[
i
][
tableMeta
.
columnIndex
])
}
...
...
@@ -846,7 +848,7 @@ export default class TaxPlanning extends Component {
let
arrayFormula
=
kondisi
.
match
(
/
[
a-zA-Z
]
+|
[
0-9
]
+|
[
-!$%^&*()_+|~=`{}
\[\]
:";'<>?,.
\/]
+
(?:\.[
0-9
]
+@|
)
/g
)
let
arrayJumlah
=
[]
arrayFormula
.
map
((
item
,
indexs
)
=>
{
let
index
=
dataTable2
.
findIndex
((
val
)
=>
val
[
2
3
]
==
item
)
let
index
=
dataTable2
.
findIndex
((
val
)
=>
val
[
2
4
]
==
item
)
if
(
index
>
0
)
{
arrayJumlah
.
push
(
dataTable2
[
index
][
tableMeta
.
columnIndex
])
}
else
{
...
...
src/container/DocumentManagement/EditManagementDoc.js
View file @
6ba78d5f
...
...
@@ -282,9 +282,11 @@ export default class EditManagementDoc extends Component {
const
formData
=
new
FormData
();
if
(
this
.
state
.
file
==
this
.
state
.
filePath
){
formData
.
append
(
"updated"
,
0
);
formData
.
append
(
"file"
,
null
);
}
else
{
formData
.
append
(
"updated"
,
1
);
formData
.
append
(
"file"
,
this
.
state
.
file
);
}
formData
.
append
(
"updated"
,
1
);
formData
.
append
(
"file"
,
this
.
state
.
file
);
formData
.
append
(
"companyId"
,
this
.
state
.
getPerusahaan
.
company_id
);
formData
.
append
(
"settingId"
,
this
.
state
.
getDocument
.
document_category_id
);
formData
.
append
(
"documentMonth"
,
this
.
state
.
monthId
.
month_id
);
...
...
@@ -295,7 +297,12 @@ export default class EditManagementDoc extends Component {
this
.
setState
({
formData
},
()
=>
{
this
.
props
.
updateDocument
(
this
.
state
.
formData
)
})
console
.
log
(
JSON
.
stringify
(
formData
))
var
object
=
{};
formData
.
forEach
(
function
(
value
,
key
){
object
[
key
]
=
value
;
});
var
json
=
JSON
.
stringify
(
object
);
console
.
log
(
json
)
}
}
...
...
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