Skip to content

T
Tia-dev
Commit 99a47381 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'riri' into 'master' 

bikin puyeng

See merge request !845
parents 74c9bbee d19c51eb
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/container/MonthlyReport/ProfitLossMR.js
View file @ 99a47381
......@@ -192,7 +192,7 @@ export default class ProfitLossMR 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) {
if (item.type_report_id === 3 && item.level === 2) {
if (item.profit_loss.mtd_vs_previous_month == "" && Number(item.profit_loss.percent_act_vs_previous_month) < this.state.minValue || Number(item.profit_loss.percent_act_vs_previous_month) > this.state.maxValue) {
err = true
......@@ -241,7 +241,7 @@ export default class ProfitLossMR extends Component {
}
}
res.map((item, index) => {
if (item.type_report_id === 3) {
if (item.type_report_id === 3 && item.level === 2) {
if (item.profit_loss.mtd_vs_previous_month == "" && Number(item.profit_loss.percent_act_vs_previous_month) < this.state.minValue || Number(item.profit_loss.percent_act_vs_previous_month) > this.state.maxValue) {
err = true
......@@ -551,8 +551,8 @@ export default class ProfitLossMR extends Component {
let data = []
let err = false
this.state.dataTable.map((i, index) => {
if(i[0] === 3) {
// console.log(i);
if(i[0] === 3 && i[4] === 2) {
console.log(i);
if ( i[19] === "" && (Number(i[14]) < this.state.minValue || Number(i[14]) > this.state.maxValue)) {
console.log('msk 1');
// console.log(i);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment