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
5f4e2680
Commit
5f4e2680
authored
May 07, 2021
by
d.arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into GGMAC
parents
9cc6a760
e110fb50
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
71 additions
and
70 deletions
+71
-70
BalanceSheetRO.js
src/container/RollingOutlook/BalanceSheetRO.js
+14
-13
ProfitLossRO.js
src/container/RollingOutlook/ProfitLossRO.js
+57
-57
No files found.
src/container/RollingOutlook/BalanceSheetRO.js
View file @
5f4e2680
...
...
@@ -512,22 +512,23 @@ export default class BalanceSheetRO extends Component {
item
.
level
,
item
.
item_report
,
item
.
total_december_last_year
===
""
?
"0"
:
item
.
total_december_last_year
,
String
(
item
.
item_report
).
toLocaleLowerCase
()
==
"profit (loss) mtd"
?
{
value
:
item
.
january
,
formula
:
item
.
january_formula
}
:
Number
(
item
.
january
).
toFixed
(
1
),
String
(
item
.
item_report
).
toLocaleLowerCase
()
==
"profit (loss) mtd"
?
{
value
:
item
.
february
,
formula
:
item
.
february_formula
}
:
Number
(
item
.
february
).
toFixed
(
1
),
String
(
item
.
item_report
).
toLocaleLowerCase
()
==
"profit (loss) mtd"
?
{
value
:
item
.
march
,
formula
:
item
.
march_formula
}
:
Number
(
item
.
march
).
toFixed
(
1
),
String
(
item
.
item_report
).
toLocaleLowerCase
()
==
"profit (loss) mtd"
?
{
value
:
item
.
april
,
formula
:
item
.
april_formula
}
:
Number
(
item
.
april
).
toFixed
(
1
),
String
(
item
.
item_report
).
toLocaleLowerCase
()
==
"profit (loss) mtd"
?
{
value
:
item
.
may
,
formula
:
item
.
may_formula
}
:
Number
(
item
.
may
).
toFixed
(
1
),
String
(
item
.
item_report
).
toLocaleLowerCase
()
==
"profit (loss) mtd"
?
{
value
:
item
.
june
,
formula
:
item
.
june_formula
}
:
Number
(
item
.
june
).
toFixed
(
1
),
String
(
item
.
item_report
).
toLocaleLowerCase
()
==
"profit (loss) mtd"
?
{
value
:
item
.
july
,
formula
:
item
.
july_formula
}
:
Number
(
item
.
july
).
toFixed
(
1
),
String
(
item
.
item_report
).
toLocaleLowerCase
()
==
"profit (loss) mtd"
?
{
value
:
item
.
august
,
formula
:
item
.
august_formula
}
:
Number
(
item
.
august
).
toFixed
(
1
),
String
(
item
.
item_report
).
toLocaleLowerCase
()
==
"profit (loss) mtd"
?
{
value
:
item
.
september
,
formula
:
item
.
september_formula
}
:
Number
(
item
.
september
).
toFixed
(
1
),
String
(
item
.
item_report
).
toLocaleLowerCase
()
==
"profit (loss) mtd"
?
{
value
:
item
.
october
,
formula
:
item
.
october_formula
}
:
Number
(
item
.
october
).
toFixed
(
1
),
String
(
item
.
item_report
).
toLocaleLowerCase
()
==
"profit (loss) mtd"
?
{
value
:
item
.
november
,
formula
:
item
.
november_formula
}
:
Number
(
item
.
november
).
toFixed
(
1
),
String
(
item
.
item_report
).
toLocaleLowerCase
()
==
"profit (loss) mtd"
?
{
value
:
item
.
december
,
formula
:
item
.
december_formula
}
:
Number
(
item
.
december
).
toFixed
(
1
),
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
january
,
formula
:
item
.
january_formula
}
:
Number
(
item
.
january
).
toFixed
(
1
),
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
february
,
formula
:
item
.
february_formula
}
:
Number
(
item
.
february
).
toFixed
(
1
),
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
march
,
formula
:
item
.
march_formula
}
:
Number
(
item
.
march
).
toFixed
(
1
),
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
april
,
formula
:
item
.
april_formula
}
:
Number
(
item
.
april
).
toFixed
(
1
),
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
may
,
formula
:
item
.
may_formula
}
:
Number
(
item
.
may
).
toFixed
(
1
),
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
june
,
formula
:
item
.
june_formula
}
:
Number
(
item
.
june
).
toFixed
(
1
),
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
july
,
formula
:
item
.
july_formula
}
:
Number
(
item
.
july
).
toFixed
(
1
),
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
august
,
formula
:
item
.
august_formula
}
:
Number
(
item
.
august
).
toFixed
(
1
),
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
september
,
formula
:
item
.
september_formula
}
:
Number
(
item
.
september
).
toFixed
(
1
),
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
october
,
formula
:
item
.
october_formula
}
:
Number
(
item
.
october
).
toFixed
(
1
),
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
november
,
formula
:
item
.
november_formula
}
:
Number
(
item
.
november
).
toFixed
(
1
),
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
december
,
formula
:
item
.
december_formula
}
:
Number
(
item
.
december
).
toFixed
(
1
),
item
.
total_december_year
===
""
?
"0"
:
item
.
total_december_year
,
item
.
order
,
item
.
condition_it_should_be
,
item
.
condition_if_wrong
item
.
condition_if_wrong
,
item
.
forecast_formula
==
null
?
[]
:
item
.
forecast_formula
]
})
console
.
log
(
dataTable
)
...
...
src/container/RollingOutlook/ProfitLossRO.js
View file @
5f4e2680
This diff is collapsed.
Click to expand it.
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