Commit 2dbf25a3 authored by Riri Novita's avatar Riri Novita

issue

parent 5a218f22
...@@ -148,7 +148,7 @@ export default class BalanceSheetMR extends Component { ...@@ -148,7 +148,7 @@ export default class BalanceSheetMR extends Component {
let res = response.data.data let res = response.data.data
const handlePushChild = (item) => { const handlePushChild = (item) => {
let indexIDzz = dataTable.findIndex((val) => val[1] === item.id) 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) { 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 err = true
} }
...@@ -196,7 +196,7 @@ export default class BalanceSheetMR extends Component { ...@@ -196,7 +196,7 @@ export default class BalanceSheetMR extends Component {
} }
} }
res.map((item, index) => { 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) { 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 err = true
} }
...@@ -416,7 +416,7 @@ export default class BalanceSheetMR extends Component { ...@@ -416,7 +416,7 @@ export default class BalanceSheetMR extends Component {
"months": this.props.month.month_id, "months": this.props.month.month_id,
"balance_sheet": data "balance_sheet": data
} }
console.log(body);
// console.log(JSON.stringify(body)); // console.log(JSON.stringify(body));
api.create('UPLOAD').uploadMonthlyReportBS(body).then(response => { api.create('UPLOAD').uploadMonthlyReportBS(body).then(response => {
console.log(response); console.log(response);
...@@ -492,7 +492,7 @@ export default class BalanceSheetMR extends Component { ...@@ -492,7 +492,7 @@ export default class BalanceSheetMR extends Component {
let data = [] let data = []
let err = false let err = false
this.state.dataTable.map((i, index) => { this.state.dataTable.map((i, index) => {
if(i[0] === 3 && i[4] === 2) { if(i[0] === 3) {
console.log(i); console.log(i);
if ( i[17] === "" && (Number(i[12]) < this.state.minValue || Number(i[12]) > this.state.maxValue)) { if ( i[17] === "" && (Number(i[12]) < this.state.minValue || Number(i[12]) > this.state.maxValue)) {
console.log('msk 1'); console.log('msk 1');
......
...@@ -661,7 +661,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -661,7 +661,7 @@ export default class FixedAssetsMovementMR extends Component {
// console.log(tableMeta.rowData[8]); // console.log(tableMeta.rowData[8]);
// console.log(tableMeta.rowData[9]); // console.log(tableMeta.rowData[9]);
// console.log(total) // 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]) 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) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
// console.log(tableMeta.rowData[8]); // console.log(tableMeta.rowData[8]);
...@@ -670,9 +670,9 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -670,9 +670,9 @@ export default class FixedAssetsMovementMR extends Component {
} else if (dex === 3) { } else if (dex === 3) {
total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[7]) == NaN? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[7]) 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) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
console.log(tableMeta.rowData[8]); // console.log(tableMeta.rowData[8]);
console.log(tableMeta.rowData[7]); // console.log(tableMeta.rowData[7]);
console.log(total) // console.log(total)
} }
return total return total
} }
......
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