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
e8e72a40
Commit
e8e72a40
authored
Jun 10, 2021
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into riri
parents
89aeefde
7fef07b6
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
22 deletions
+25
-22
FixedAssetsMovement.js
src/container/BudgetTahunan/FixedAssetsMovement.js
+1
-1
TaxPlanning.js
src/container/BudgetTahunan/TaxPlanning.js
+17
-16
BalanceSheetMR.js
src/container/MonthlyReport/BalanceSheetMR.js
+2
-2
CorporateAnnualTargetMR.js
src/container/MonthlyReport/CorporateAnnualTargetMR.js
+5
-3
No files found.
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @
e8e72a40
...
...
@@ -2575,7 +2575,7 @@ export default class FixedAssetsMovement extends Component {
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
handleForecast
(
tableMeta
,
`
${
Number
(
this
.
props
.
periode
)
+
1
}
`
)).
toFixed
(
1
)}
value
=
{
Number
(
handleForecast
(
tableMeta
,
`
${
Number
(
this
.
props
.
periode
)
+
2
}
`
)).
toFixed
(
1
)}
/
>
:
tableMeta
.
rowData
[
0
]
===
1
?
...
...
src/container/BudgetTahunan/TaxPlanning.js
View file @
e8e72a40
This diff is collapsed.
Click to expand it.
src/container/MonthlyReport/BalanceSheetMR.js
View file @
e8e72a40
...
...
@@ -576,14 +576,14 @@ export default class BalanceSheetMR extends Component {
// // console.log(i);
// err = true
// } else
if
(
i
[
18
]
===
""
&&
(
Number
(
i
[
14
])
<
this
.
state
.
minValue
||
Number
(
i
[
14
]
)
>
this
.
state
.
maxValue
))
{
if
(
i
[
18
]
===
""
&&
(
Number
(
i
[
14
])
.
toFixed
(
1
)
<
this
.
state
.
minValue
||
Number
(
i
[
14
]).
toFixed
(
1
)
>
this
.
state
.
maxValue
))
{
console
.
log
(
'msk 2'
);
err
=
true
}
}
if
(
String
(
i
[
5
])
==
"Control (should be nil)"
)
{
if
(
Number
(
i
[
9
])
<
this
.
state
.
minValue
||
Number
(
i
[
9
]
)
>
this
.
state
.
maxValue
)
{
if
(
Number
(
i
[
9
])
.
toFixed
(
1
)
<
this
.
state
.
minValue
||
Number
(
i
[
9
]).
toFixed
(
1
)
>
this
.
state
.
maxValue
)
{
errorContrl
=
true
editAble
=
true
}
...
...
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @
e8e72a40
...
...
@@ -212,6 +212,7 @@ export default class CorporateAnnualTargetMR extends Component {
if
(
indexIDzz
===
-
1
)
{
let
parentTrue
=
item
.
parent_name
==
'INTERNAL BUSINESS PROCESS PERSPECTIVE'
||
item
.
parent_name
==
'CUSTOMER PERSPECTIVE'
let
weight
=
String
(
item
.
weight
).
substr
(
0
,
String
(
item
.
weight
).
length
-
1
)
let
weightTB
=
String
(
item
.
corporate_annual_target
.
weight
).
substr
(
0
,
String
(
item
.
corporate_annual_target
.
weight
).
length
-
1
)
// console.log(weight)
dataTable
.
push
([
item
.
type_report_id
,
...
...
@@ -221,7 +222,7 @@ export default class CorporateAnnualTargetMR extends Component {
item
.
level
,
item
.
description
,
// item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(weight).toFixed(1),
parentTrue
?
weight
:
item
.
corporate_annual_target
.
weight
,
parentTrue
?
weight
:
weightTB
,
parentTrue
?
item
.
corporate_annual_target
.
uom
:
item
.
uom
,
parentTrue
?
item
.
corporate_annual_target
.
jenis_kpi
==
""
?
null
:
item
.
corporate_annual_target
.
jenis_kpi
:
item
.
jenis_kpi
==
""
?
null
:
item
.
kpi_type
,
// parentTrue ? item.corporate_annual_target.kpi_type == "" ? null : { value: item.corporate_annual_target.kpi_type } : item.kpi_type == "" ? null : { value: item.kpi_type },
...
...
@@ -330,8 +331,9 @@ export default class CorporateAnnualTargetMR extends Component {
}
downloadTemplate
=
async
()
=>
{
console
.
log
(
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/cat/monthly_report/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&
${
this
.
props
.
periode
}
`
)
let
res
=
await
fetch
(
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/cat/monthly_report/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&
year=2021
`
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/cat/monthly_report/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&
${
this
.
props
.
periode
}
`
)
console
.
log
(
res
);
res
=
await
res
.
blob
()
...
...
@@ -417,7 +419,7 @@ export default class CorporateAnnualTargetMR extends Component {
item
.
formula
,
item
.
level
,
item
.
item_report
,
String
(
item
.
weight
).
includes
(
"%"
)
?
String
(
item
.
weight
).
substr
(
0
,
String
(
item
.
weight
).
length
-
1
)
:
item
.
weight
,
String
(
item
.
weight
).
includes
(
"%"
)
?
String
(
item
.
weight
).
trim
().
substr
(
0
,
String
(
item
.
weight
).
trim
(
).
length
-
1
)
:
item
.
weight
,
item
.
uom
,
item
.
jenis_kpi
,
item
.
max_ach
,
...
...
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