Skip to content

T
Tia-dev
Commit 2eff8816 authored by ardiansyah's avatar ardiansyah
Browse files
Options

Merge branch 'ENV-DEV' into 'ENV-STAGING' 

Env dev

See merge request !1881
parents 7fdbbcd7 97ddf8b2
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
src/container/BudgetTahunan/BudgetTahunan.js
View file @ 2eff8816
......@@ -628,7 +628,7 @@ export default class BudgetTahunan extends Component {
console.log(response)
if (response.data) {
if (response.data.status === "success") {
if (type === "CAT") {
if (type === "CAT" || type === "DraftCAT") {
this.setState({ visibleCAT: false, visibleBudgetTahunan: true, loading: false })
} else {
this.setState({ visibleBudgetTahunan: true, loading: false })
......
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 2eff8816
......@@ -825,10 +825,10 @@ export default class CorporateAnnualTarget extends Component {
if (type == 'submitted') {
this.props.getReport(body, 'CAT')
} else {
this.props.getReport(body)
this.props.getReport(body, 'DraftCAT')
}
this.setState({ loading: false })
// this.props.onClickClose()
this.props.onClickClose()
// this.props.getReport()
} else {
if (response.data?.message == "Please Set Up Rate Currency First") {
......
src/container/MasterData/Company/Company.js
View file @ 2eff8816
......@@ -195,7 +195,7 @@ export default class Perusahaan extends Component {
customBodyRender: (val, tableMeta) => {
let check = null
if (tableMeta.rowData[7] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('unit_bisnis'))
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('currency'))
if (check > -1) {
this.setState({ buttonError: true })
}
......@@ -203,12 +203,12 @@ export default class Perusahaan extends Component {
return (
<div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="unit_bisnis">
<a data-tip={tableMeta.rowData[7][check].message} data-for="currency">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
}
<ReactTooltip border={true} id="unit_bisnis" place="bottom" type="light" effect="solid" />
<ReactTooltip border={true} id="currency" place="bottom" type="light" effect="solid" />
</div >
);
}
......@@ -220,7 +220,7 @@ export default class Perusahaan extends Component {
customBodyRender: (val, tableMeta) => {
let check = null
if (tableMeta.rowData[7] != null) {
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('unit_bisnis'))
check = tableMeta.rowData[7].findIndex((val) => val.field.includes('default_currency'))
if (check > -1) {
this.setState({ buttonError: true })
}
......@@ -228,12 +228,12 @@ export default class Perusahaan extends Component {
return (
<div style={{ display: 'flex' }}>
{tableMeta.rowData[7] != null && check > -1 ?
<a data-tip={tableMeta.rowData[7][check].message} data-for="unit_bisnis">
<a data-tip={tableMeta.rowData[7][check].message} data-for="default_currency">
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
</a> :
<span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
}
<ReactTooltip border={true} id="unit_bisnis" place="bottom" type="light" effect="solid" />
<ReactTooltip border={true} id="default_currency" place="bottom" type="light" effect="solid" />
</div >
);
}
......
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