Skip to content

T
Tia-dev
Commit f1b57128 authored by faisalhamdi's avatar faisalhamdi
Browse files
Options

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

parents 932be3a2 a740c839
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 10 deletions
src/container/MonthlyReport/ProfitLossMR.js
View file @ f1b57128
...@@ -349,6 +349,7 @@ export default class ProfitLossMR extends Component { ...@@ -349,6 +349,7 @@ export default class ProfitLossMR extends Component {
} }
backToMonthlyReport(type) { backToMonthlyReport(type) {
console.log('test');
// this.setState({ loading: true }) // this.setState({ loading: true })
let data = [] let data = []
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
...@@ -2019,14 +2020,15 @@ export default class ProfitLossMR extends Component { ...@@ -2019,14 +2020,15 @@ export default class ProfitLossMR extends Component {
type="button" type="button"
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.saveDraft !== true ? 'pointer' : 'default', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
}} }}
onClick={() => onClick={() =>
this.state.saveDraft === true ? this.state.saveDraft === true ?
null : this.setState({ alert: true, messageAlert: 'Data Incomplete !', tipeAlert: 'error' })
:
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1, loading: true }, () => { this.setState({ handleTekTekTek: 1, loading: true }, () => {
this.backToMonthlyReport('draft') this.backToMonthlyReport('draft')
...@@ -2045,10 +2047,10 @@ export default class ProfitLossMR extends Component { ...@@ -2045,10 +2047,10 @@ export default class ProfitLossMR extends Component {
</button>} </button>}
{this.state.get_for == 'edit' && <button {this.state.get_for == 'edit' && <button
type="button" type="button"
// disabled={this.state.butto nError} // disabled={this.state.buttonError}
onClick={() => onClick={() =>
this.state.buttonError ? this.state.buttonError ?
this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' }) this.setState({ alert: true, messageAlert: 'Data Incomplete !', tipeAlert: 'error' })
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1, loading: true }, () => { this.setState({ handleTekTekTek: 1, loading: true }, () => {
...@@ -2056,7 +2058,7 @@ export default class ProfitLossMR extends Component { ...@@ -2056,7 +2058,7 @@ export default class ProfitLossMR extends Component {
})} })}
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.buttonError === true ? 'default' : 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none',
}} }}
...@@ -2149,14 +2151,15 @@ export default class ProfitLossMR extends Component { ...@@ -2149,14 +2151,15 @@ export default class ProfitLossMR extends Component {
type="button" type="button"
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.saveDraft !== true ? 'pointer' : 'default', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
}} }}
onClick={() => onClick={() =>
this.state.saveDraft === true ? this.state.saveDraft === true ?
null : this.setState({ alert: true, messageAlert: 'Data Incomplete !', tipeAlert: 'error' })
:
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1, loading: true }, () => { this.setState({ handleTekTekTek: 1, loading: true }, () => {
this.uploadProfitLossMR('draft') this.uploadProfitLossMR('draft')
...@@ -2178,7 +2181,7 @@ export default class ProfitLossMR extends Component { ...@@ -2178,7 +2181,7 @@ export default class ProfitLossMR extends Component {
disabled={this.state.buttonError} disabled={this.state.buttonError}
onClick={() => onClick={() =>
this.state.buttonError ? this.state.buttonError ?
this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' }) this.setState({ alert: true, messageAlert: 'Data Incomplete !', tipeAlert: 'error' })
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1, loading: true }, () => { this.setState({ handleTekTekTek: 1, loading: true }, () => {
...@@ -2186,7 +2189,7 @@ export default class ProfitLossMR extends Component { ...@@ -2186,7 +2189,7 @@ export default class ProfitLossMR extends Component {
})} })}
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.buttonError === true ? 'default' : 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none',
}} }}
......
src/container/MonthlyReport/TaxPlanningMR.js
View file @ f1b57128
...@@ -574,7 +574,7 @@ export default class TaxPlanningMR extends Component { ...@@ -574,7 +574,7 @@ export default class TaxPlanningMR extends Component {
} }
} else { } else {
let data = tableMeta.rowData[12] let data = tableMeta.rowData[12]
let indexID = data.findIndex((val) => val.item_formula == String(`${item}`) && val.periode == Number(this.props.periode)) let indexID = data.findIndex((val) => val.item_formula == String(`@${item}`) && val.periode == Number(this.props.periode))
if (indexID !== -1) { if (indexID !== -1) {
let valuezz = data[indexID].value let valuezz = data[indexID].value
anjay.push(valuezz == "" ? 0 : valuezz) anjay.push(valuezz == "" ? 0 : valuezz)
......
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