Skip to content

T
Tia-dev
Commit 4786d711 authored by ardiansyah's avatar ardiansyah
Browse files
Options

Merge branch 'ENV-STAGING' into 'ENV-PROD' 

Env staging

See merge request !2131
parents 5e074a3c 1964db66
Expand all Show whitespace changes
Inline Side-by-side
Showing with 245 additions and 231 deletions
src/container/MonthlyReport/MonthlyReport.js
View file @ 4786d711
......@@ -951,7 +951,7 @@ export default class MonthlyReport extends Component {
visibleOI: false,
visibleCF: false,
})
} else if (item === 'List of Credit Facilities') {
} else if (item === 'List Of Credit Facilities and Investment') {
this.setState({
visibleMonthlyReport: false,
visibleBS: false,
......@@ -2566,7 +2566,6 @@ export default class MonthlyReport extends Component {
name: "Action",
options: {
customBodyRender: (val, tableMeta) => {
// console.log(tableMeta);
return (
<div style={{ display: 'flex' }}>
<button
......
src/container/RollingOutlook/TaxPlanningRO.js
View file @ 4786d711
......@@ -760,7 +760,6 @@ export default class TaxPlanning extends Component {
// let data = []
let errorContrl = this.state.buttonError
let editAble = this.state.editAble
// console.log(this.state.dataTable)
this.state.dataTable.map((i, index) => {
if (String(i[8]) == "Control (should be nil)") {
this.setState({ loading: true })
......@@ -7190,11 +7189,15 @@ export default class TaxPlanning extends Component {
marginRight: 20
}}
onClick={() => {
this.setState({ loading: true, dataTable: dataTable2 }, () => {
this.setState({ datatable: dataTable2 }, () => {
setTimeout(() => {
this.setState({ loading: true }, () => {
setTimeout(() => {
this.handleValidate()
}, 100);
})
}, 100);
})
}}
>
<div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960' }}>
......@@ -7308,11 +7311,15 @@ export default class TaxPlanning extends Component {
}}
onClick={() => {
// this.forceUpdate()
this.setState({ loading: true, buttonDraft: false }, () => {
this.setState({ datatable: dataTable2 }, () => {
setTimeout(() => {
this.setState({ loading: true }, () => {
setTimeout(() => {
this.handleValidate()
}, 100);
})
}, 100);
})
}}
>
<div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960' }}>
......
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