Commit 162b210c authored by EKSAD's avatar EKSAD

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

parents 19b0ac4c 574b28ed
......@@ -266,7 +266,7 @@ export default class CorporateAnnualTarget extends Component {
// console.log(nilaiTotal)
// // console.log(i[2] === undefined ? "" : String(Number(i[2]*100)).length > 3? String(Number(i[2]*100).toFixed(0) + '%') : String(Number(i[2]*100)) + '%')
payload.push({
item_report_id: i[0] === undefined ? "" : reg.test(String(i[0])) === false ? "" : String(i[0]).trim(),
item_report_id: i[0] === undefined ? 0 : reg.test(String(i[0])) === false ? 0 : String(i[0]).trim(),
item_report: i[1] === undefined ? "" : String(i[1]).trim(),
weight: i[2] === undefined ? "" : String(Number(i[2] * 100)).length > 3 ? String(Number(i[2] * 100).toFixed(0) + '%') : String(Number(i[2] * 100)) + '%',
uom: i[3] === undefined ? "" : String(i[3]).trim(),
......@@ -322,7 +322,7 @@ export default class CorporateAnnualTarget extends Component {
}
}
})
// console.log(JSON.stringify(this.state.payload))
console.log(JSON.stringify(this.state.payload))
api.create().checkUploadMB(this.state.payload).then(response => {
// // console.log(JSON.stringify(this.state.payload));
// console.log(response)
......@@ -488,6 +488,13 @@ export default class CorporateAnnualTarget extends Component {
}
}
// if (i[0] == null && i[2] == null) {
// if (i[6] == "" || i[7] == "" || i[9] == null || i[10] == null || i[11] == null) {
// handleKosongKPIMAXYTD = true
// // console.log(handleKosongKPIMAXYTD)
// }
// }
if (i[2] !== null) {
let indexID = dataTampung.findIndex((val) => val.id == i[2])
if (indexID !== -1) {
......@@ -511,7 +518,7 @@ export default class CorporateAnnualTarget extends Component {
}
data.push({
"item_report_id": i[1] == "" ? null : i[1],
"item_report_id": i[1] == "" || i[1] == null? 0 : i[1],
"item_name": String(i[6]),
"parent": i[2] == "" ? null : i[2],
"weight": weightReal == null ? String(i[7]) : weightReal,
......@@ -578,7 +585,7 @@ export default class CorporateAnnualTarget extends Component {
this.state.dataTable.map(i => {
// // console.log(i[9] == null? "" : i[9].value)
data.push({
"item_report_id": i[1] == "" ? null : i[1],
"item_report_id": i[1] == "" || i[1] == null? 0 : i[1],
"item_name": String(i[6]),
"parent": i[2] == "" ? null : i[2],
"weight": String(i[7]),
......@@ -865,7 +872,7 @@ export default class CorporateAnnualTarget extends Component {
return false
}
} else {
if (typeReport == null) {
if (typeReport == null || typeReport == 3) {
return true
} else if (tableMeta !== undefined && tableMeta.rowData[0] == 1) {
let indexID = dataTable2.findIndex((val) => val[2] == tableMeta.rowData[1])
......@@ -887,9 +894,9 @@ export default class CorporateAnnualTarget extends Component {
newData.push(item)
if (index == rowIndex) {
newData.push([
3,
null,
"",
item[2] == null ? item[1] : item[2],
item[2] == null || item[2] == ""? item[1] : item[2],
item[3],
item[4],
"",
......@@ -1065,7 +1072,7 @@ export default class CorporateAnnualTarget extends Component {
onBlur={(event) => {
// console.log(event.target.value)
handleChangeText(event.target.value, tableMeta)
// console.log(dataTable2)
console.log(dataTable2)
}}
/>
}
......
This diff is collapsed.
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