Skip to content

T
Tia-dev
Commit 9ff03260 authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'GGMAC' into 'master' 

push dulu

See merge request !1343
parents 115b3b35 833ce80b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 23 deletions
src/container/RollingOutlook.js
View file @ 9ff03260
...@@ -260,18 +260,7 @@ export default class RollingOutlook extends Component { ...@@ -260,18 +260,7 @@ export default class RollingOutlook extends Component {
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
let dataTable = response.data.data.map((item, index) => { let dataTable = response.data.data.map((item, index) => {
if (item.report_name =='CAT') { return [
dataHardcode.push([
item.number,
'Cash Flow',
item.revision,
this.state.isSubmit === false ? "CLOSED" : item.current_status,
999,
Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
item.revision
])
}
dataHardcode.push([
item.number, item.number,
item.report_name, item.report_name,
item.revision, item.revision,
...@@ -279,16 +268,7 @@ export default class RollingOutlook extends Component { ...@@ -279,16 +268,7 @@ export default class RollingOutlook extends Component {
item.report_id, item.report_id,
Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload, Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
item.revision item.revision
]) ]
// return [
// item.number,
// item.report_name,
// item.revision,
// this.state.isSubmit === false ? "CLOSED" : item.current_status,
// item.report_id,
// Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
// item.revision
// ]
}) })
let dataTableRevision = response.data.data.map((item, index) => { let dataTableRevision = response.data.data.map((item, index) => {
return [ return [
...@@ -298,7 +278,7 @@ export default class RollingOutlook extends Component { ...@@ -298,7 +278,7 @@ export default class RollingOutlook extends Component {
] ]
}) })
// console.log(dataTable); // console.log(dataTable);
this.setState({ dataTable: dataHardcode, loading: false, dataTableRevision, dataForRevision: response.data.data }) this.setState({ dataTable, loading: false, dataTableRevision, dataForRevision: response.data.data })
} }
} else { } else {
this.setState({ loading: false }) this.setState({ loading: false })
......
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