Skip to content

T
Tia-dev
Commit 7c832ad1 authored by Hardiansyah's avatar Hardiansyah
Browse files
Options

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

Fix cat name

See merge request !2406
parents bd187d10 1bb7f45c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/container/OutlookPA/OutlookPA.js
View file @ 7c832ad1
...@@ -348,7 +348,7 @@ export default class OutlookPA extends Component { ...@@ -348,7 +348,7 @@ export default class OutlookPA extends Component {
let dataTable = listData.map((item, index) => { let dataTable = listData.map((item, index) => {
return [ return [
item.number, item.number,
item.report_name, item.report_name === 'CAT' ? 'Corporate Annual Target' : item.report_name,
item.revision, item.revision,
this.state.isSubmit === false ? "CLOSED" : item.current_status, this.state.isSubmit === false ? "CLOSED" : item.current_status,
item.report_id, item.report_id,
......
src/container/RollingOutlook/RollingOutlook.js
View file @ 7c832ad1
...@@ -364,7 +364,7 @@ export default class RollingOutlook extends Component { ...@@ -364,7 +364,7 @@ export default class RollingOutlook extends Component {
let dataTable = listData.map((item, index) => { let dataTable = listData.map((item, index) => {
return [ return [
item.number, item.number,
item.report_name, item.report_name === 'CAT' ? 'Corporate Annual Target' : item.report_name,
item.revision, item.revision,
this.state.quarter.value == 'q1' && !this.state.isApprovedMB ? "CLOSED" : (this.state.quarter.value != 'q1' && !this.state.isApprovedRO ? "CLOSED" : (this.state.isSubmit === false ? "CLOSED" : item.current_status)), this.state.quarter.value == 'q1' && !this.state.isApprovedMB ? "CLOSED" : (this.state.quarter.value != 'q1' && !this.state.isApprovedRO ? "CLOSED" : (this.state.isSubmit === false ? "CLOSED" : item.current_status)),
item.report_id, item.report_id,
......
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