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
2dbf25a3
Commit
2dbf25a3
authored
Dec 29, 2020
by
Riri Novita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
issue
parent
5a218f22
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
BalanceSheetMR.js
src/container/MonthlyReport/BalanceSheetMR.js
+4
-4
FixedAssetsMovementMR.js
src/container/MonthlyReport/FixedAssetsMovementMR.js
+4
-4
No files found.
src/container/MonthlyReport/BalanceSheetMR.js
View file @
2dbf25a3
...
...
@@ -148,7 +148,7 @@ export default class BalanceSheetMR extends Component {
let res = response.data.data
const handlePushChild = (item) => {
let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
if
(
item
.
type_report_id
===
3
&&
item
.
level
===
2
)
{
if (item.type_report_id === 3) {
if (item.balance_sheet.mtd_vs_previous_month == "" && Number(item.balance_sheet.percent_act_vs_previous_month) < this.state.minValue || Number(item.balance_sheet.percent_act_vs_previous_month) > this.state.maxValue) {
err = true
}
...
...
@@ -196,7 +196,7 @@ export default class BalanceSheetMR extends Component {
}
}
res.map((item, index) => {
if
(
item
.
type_report_id
===
3
&&
item
.
level
===
2
)
{
if (item.type_report_id === 3) {
if (item.balance_sheet.mtd_vs_previous_month == "" && Number(item.balance_sheet.percent_act_vs_previous_month) < this.state.minValue || Number(item.balance_sheet.percent_act_vs_previous_month) > this.state.maxValue) {
err = true
}
...
...
@@ -416,7 +416,7 @@ export default class BalanceSheetMR extends Component {
"months": this.props.month.month_id,
"balance_sheet": data
}
console.log(body);
// console.log(JSON.stringify(body));
api.create('UPLOAD').uploadMonthlyReportBS(body).then(response => {
console.log(response);
...
...
@@ -492,7 +492,7 @@ export default class BalanceSheetMR extends Component {
let data = []
let err = false
this.state.dataTable.map((i, index) => {
if
(
i
[
0
]
===
3
&&
i
[
4
]
===
2
)
{
if(i[0] === 3) {
console.log(i);
if ( i[17] === "" && (Number(i[12]) < this.state.minValue || Number(i[12]) > this.state.maxValue)) {
console.log('msk 1');
...
...
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @
2dbf25a3
...
...
@@ -661,7 +661,7 @@ export default class FixedAssetsMovementMR extends Component {
// console.log(tableMeta.rowData[8]);
// console.log(tableMeta.rowData[9]);
// console.log(total)
//
} else if (dex === 2) {
}
else
if
(
dex
===
2
)
{
total
=
Number
(
tableMeta
.
rowData
[
8
])
-
Number
(
tableMeta
.
rowData
[
6
])
==
NaN
?
"0.0"
:
Number
(
tableMeta
.
rowData
[
8
])
-
Number
(
tableMeta
.
rowData
[
6
])
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
Number
(
total
).
toFixed
(
1
)
// console.log(tableMeta.rowData[8]);
...
...
@@ -670,9 +670,9 @@ export default class FixedAssetsMovementMR extends Component {
}
else
if
(
dex
===
3
)
{
total
=
Number
(
tableMeta
.
rowData
[
8
])
-
Number
(
tableMeta
.
rowData
[
7
])
==
NaN
?
"0.0"
:
Number
(
tableMeta
.
rowData
[
8
])
-
Number
(
tableMeta
.
rowData
[
7
])
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
Number
(
total
).
toFixed
(
1
)
console
.
log
(
tableMeta
.
rowData
[
8
]);
console
.
log
(
tableMeta
.
rowData
[
7
]);
console
.
log
(
total
)
//
console.log(tableMeta.rowData[8]);
//
console.log(tableMeta.rowData[7]);
//
console.log(total)
}
return
total
}
...
...
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