Skip to content

T
Tia-dev
Commit cdb63279 authored by fahrur huzain's avatar fahrur huzain
Browse files
Options

Merge branch 'dev/fahrur-new' into 'ENV-DEV' 

issue TP IDR MB

See merge request !2148
parents cb30ab72 237eac4e
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 7 deletions
src/container/BudgetTahunan/TaxPlanning.js
View file @ cdb63279
...@@ -1698,7 +1698,15 @@ export default class TaxPlanning extends Component { ...@@ -1698,7 +1698,15 @@ export default class TaxPlanning extends Component {
// console.log("nilai : " + Number(dataTable2[88][21])) // console.log("nilai : " + Number(dataTable2[88][21]))
// console.log(JSON.stringify(tableMeta.tableData)) // console.log(JSON.stringify(tableMeta.tableData))
let nilai = Number(total) + Number(dataTable2[tableMeta.rowIndex-10][21]) let nilai = 0
console.log(this.props.defaultCurrency.id)
console.log(Number(dataTable2[tableMeta.rowIndex-9][21]))
console.log(Number(dataTable2[tableMeta.rowIndex-10][21]))
if (this.props.defaultCurrency.id == 1 ){
nilai = Number(total) + Number(dataTable2[tableMeta.rowIndex-9][21])
}else {
nilai = Number(total) + Number(dataTable2[tableMeta.rowIndex-10][21])
}
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = nilai dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = nilai
// console.log("niali :" + Number(dataTable2[88][21])); // console.log("niali :" + Number(dataTable2[88][21]));
return nilai return nilai
...@@ -8052,7 +8060,7 @@ export default class TaxPlanning extends Component { ...@@ -8052,7 +8060,7 @@ export default class TaxPlanning extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.status === 'CLOSED' ? (fixNumber(Number(value), 1) == 0 ? "0.0" : fixNumber(Number(value), 1)) : (fixNumber(Number(handleTotalControl(tableMeta, 1, this.props.periode)), 12) == 0 ?"0.0" : fixNumber(Number(handleTotalControl(tableMeta, 1, this.props.periode)), 12))} value={this.props.status === 'CLOSED' ? (fixNumber(Number(value), 1) == 0 ? "0.0" : fixNumber(Number(value), 1)) : (fixNumber(Number(handleTotalControl(tableMeta, 1, this.props.periode)), 1) == 0 ?"0.0" : this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleTotalControl(tableMeta, 1, this.props.periode)), 11) : fixNumber(Number(handleTotalControl(tableMeta, 1, this.props.periode)), 12))}
/> : /> :
<LightTooltip title={this.state.minValue === null ? `Value Should be 0` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be 0` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat <NumberFormat
...@@ -8061,7 +8069,7 @@ export default class TaxPlanning extends Component { ...@@ -8061,7 +8069,7 @@ export default class TaxPlanning extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.status === 'CLOSED' ? (fixNumber(Number(value), 1) == 0 ? "0.0" : fixNumber(Number(value), 1)) : (fixNumber(Number(handleTotalControl(tableMeta, 1, this.props.periode)), 12) == 0 ?"0.0" : fixNumber(Number(handleTotalControl(tableMeta, 1, this.props.periode)), 12))} value={this.props.status === 'CLOSED' ? (fixNumber(Number(value), 1) == 0 ? "0.0" : fixNumber(Number(value), 1)) : (fixNumber(Number(handleTotalControl(tableMeta, 1, this.props.periode)), 1) == 0 ?"0.0" : this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleTotalControl(tableMeta, 1, this.props.periode)), 11) : fixNumber(Number(handleTotalControl(tableMeta, 1, this.props.periode)), 12))}
/> />
</LightTooltip> </LightTooltip>
...@@ -8698,7 +8706,7 @@ export default class TaxPlanning extends Component { ...@@ -8698,7 +8706,7 @@ export default class TaxPlanning extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)), 12) == 0 ? "0.0" : fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)), 12)} value={fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)), 12) == 0 ? "0.0" : this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)),1) == 0 ? "0.0" : fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)),1) : fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)), 12)}
/> : /> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[25].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[25].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat <NumberFormat
...@@ -8715,7 +8723,7 @@ export default class TaxPlanning extends Component { ...@@ -8715,7 +8723,7 @@ export default class TaxPlanning extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)), 12) == 0 ? "0.0" : fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)), 12)} value={fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)), 12) == 0 ? "0.0" : this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)),1) == 0 ? "0.0" : fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)),1) : fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)), 12)}
/> />
</LightTooltip> </LightTooltip>
: :
...@@ -9264,7 +9272,7 @@ export default class TaxPlanning extends Component { ...@@ -9264,7 +9272,7 @@ export default class TaxPlanning extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)), 12) == 0 ? "0.0" : fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)), 12)} value={fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)), 12) == 0 ? "0.0" : this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)), 1) == 0 ? "0.0" : fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)), 1) : fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)), 12)}
/> : /> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[25].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[25].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat <NumberFormat
...@@ -9281,7 +9289,7 @@ export default class TaxPlanning extends Component { ...@@ -9281,7 +9289,7 @@ export default class TaxPlanning extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)), 12) == 0 ? "0.0" : fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)), 12)} value={fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)), 12) == 0 ? "0.0" : this.props.defaultCurrency.id === 1 ? fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)), 1) == 0 ? "0.0" : fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)), 1) : fixNumber(Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)), 12)}
/> />
</LightTooltip> </LightTooltip>
: :
......
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