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
f51e4e68
Commit
f51e4e68
authored
Oct 10, 2020
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'didam' into 'master'
apdet See merge request
!500
parents
bedced23
05a82b8d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
15 deletions
+28
-15
VisualisasiAM.js
src/container/ApprovalMatrix/VisualisasiAM.js
+3
-2
TaxPlanning.js
src/container/BudgetTahunan/TaxPlanning.js
+20
-13
OperatingIndicator.js
src/container/OprIndicator/OperatingIndicator.js
+5
-0
No files found.
src/container/ApprovalMatrix/VisualisasiAM.js
View file @
f51e4e68
...
...
@@ -218,8 +218,9 @@ export default class VisualisasiAM extends Component {
<
ReactDragListView
{...
dragProps
}
>
<
ol
style
=
{{
paddingLeft
:
15
}}
>
{
this
.
state
.
listApproval
.
sort
((
a
,
b
)
=>
a
.
orderId
-
b
.
orderId
).
map
((
item
,
index
)
=>
(
<
li
key
=
{
index
}
style
=
{{
color
:
'#4b4b4b'
,
fontSize
:
14
}}
>
<
a
href
=
'#'
style
=
{{
color
:
'#4b4b4b'
,
fontSize
:
'14px'
,
cursor
:
'auto'
,
outline
:
'none'
}}
>
<
li
key
=
{
index
}
style
=
{{
color
:
'white'
,
fontSize
:
14
}}
>
<
a
href
=
'#'
style
=
{{
color
:
'#4b4b4b'
,
fontSize
:
'14px'
,
cursor
:
'auto'
,
outline
:
'none'
,
justifyContent
:
'flex-start'
,
display
:
'flex'
}}
>
<
label
style
=
{{
color
:
'#4b4b4b'
,
marginRight
:
15
}}
>
{
Number
(
index
+
1
)}
<
/label
>
<
div
className
=
"grid grid-4x grid-mobile-none gap-20px margin-bottom-20px"
style
=
{{
width
:
'75%'
}}
>
{
item
.
data
.
map
((
items
,
indexs
)
=>
{
return
(
<
label
>
{
items
.
fullname
}
<
/label>
)
}
)
}
<
label
>
{
item
.
data
.
length
==
1
?
''
:
item
.
data
[
0
].
operator_type_name
}
<
/label
>
...
...
src/container/BudgetTahunan/TaxPlanning.js
View file @
f51e4e68
...
...
@@ -763,6 +763,7 @@ export default class TaxPlanning extends Component {
render
()
{
let
dataTable2
=
this
.
state
.
dataTable
let
dataFormula
=
[]
const
handleValueFormula
=
(
value
,
tableMeta
,
dex
)
=>
{
let
form
=
dex
===
1
?
tableMeta
.
rowData
[
6
].
tbc
:
dex
===
2
?
tableMeta
.
rowData
[
6
].
fcp
:
tableMeta
.
rowData
[
6
].
tbf
let
splitFormula
=
String
(
form
).
split
(
'@'
)
...
...
@@ -857,19 +858,25 @@ export default class TaxPlanning extends Component {
// console.log(total)
// console.log(splitFormula)
// let dataSub = dex == 1? dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc : dex == 2? dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp : dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf
// if (dex == 1) {
// if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value == undefined) {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc = total
// } else {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value = total
// }
// } else {
// if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = total
// } else {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = total
// }
// }
if
(
dex
==
1
)
{
if
(
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbc
.
value
==
undefined
)
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbc
=
total
}
else
{
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value = total
}
}
else
if
(
dex
==
2
)
{
if
(
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
fcp
.
value
==
undefined
)
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
fcp
=
total
}
else
{
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value = total
}
}
else
{
if
(
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
.
value
==
undefined
)
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
=
total
}
else
{
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = total
}
}
return
total
}
...
...
src/container/OprIndicator/OperatingIndicator.js
View file @
f51e4e68
...
...
@@ -217,12 +217,17 @@ export default class OperatingIndicator extends Component {
if
(
item
>=
2000
&&
item
<=
(
Number
(
currentYear
)
+
1
))
{
data
.
push
(
item
)
}
console
.
log
(
'bibim'
)
}
else
{
if
((
item
>=
2000
)
&&
(
item
==
this
.
state
.
lastPeriod
||
item
<
this
.
state
.
lastPeriod
))
{
data
.
push
(
item
)
}
console
.
log
(
'bubum'
)
}
})
console
.
log
(
this
.
state
.
lastPeriod
)
console
.
log
(
this
.
state
.
lastPeriod
)
console
.
log
(
this
.
state
.
isApprover
)
let
periodeData
=
data
.
map
((
item
)
=>
{
return
{
periode
:
item
,
...
...
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