Skip to content

T
Tia-dev
Commit 316690b3 authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'deni-' into 'master' 

ketinggalan

See merge request !649
parents be25c9a0 1ef23a82
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
src/container/BudgetTahunan/TaxPlanning.js
View file @ 316690b3
...@@ -795,8 +795,8 @@ export default class TaxPlanning extends Component { ...@@ -795,8 +795,8 @@ export default class TaxPlanning extends Component {
if (splitform[1] == 'TP1' || splitform[1] == 'TP2' || splitform[1] == 'TP3') { if (splitform[1] == 'TP1' || splitform[1] == 'TP2' || splitform[1] == 'TP3') {
let indexID = dataTable2.findIndex((val) => val[24] == splitform[0]) let indexID = dataTable2.findIndex((val) => val[24] == splitform[0])
if (indexID !== -1) { if (indexID !== -1) {
let data = dataTable2[indexID][19].tbf.value let data = dataTable2[indexID][20].fcp
console.log(dataTable2[indexID][19].tbf.value); console.log(dataTable2[indexID][20]);
// let data = splitform[1] == 'TP1' ? dataTable2[indexID][tableMeta.columnIndex].tbc : splitform[1] == 'TP2' ? dataTable2[indexID][tableMeta.columnIndex].fcp : dataTable2[indexID][tableMeta.columnIndex].tbf // let data = splitform[1] == 'TP1' ? dataTable2[indexID][tableMeta.columnIndex].tbc : splitform[1] == 'TP2' ? dataTable2[indexID][tableMeta.columnIndex].fcp : dataTable2[indexID][tableMeta.columnIndex].tbf
// let valuezz = data.value == undefined ? data : data.value // let valuezz = data.value == undefined ? data : data.value
anjay.push(data == "" ? 0 : data) anjay.push(data == "" ? 0 : data)
...@@ -6027,7 +6027,7 @@ export default class TaxPlanning extends Component { ...@@ -6027,7 +6027,7 @@ export default class TaxPlanning extends Component {
type="text" type="text"
placeholder="input" placeholder="input"
disabled={this.props.isApprover == true ? true : ((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)} disabled={this.props.isApprover == true ? true : ((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)}
value={Number(handleNewFormula(tableMeta, 3, "@83-@87#TP2")).toFixed(1)} value={Number(handleNewFormula(tableMeta, 3, "@83*@87#TP2")).toFixed(1)}
/> />
} }
/> />
...@@ -6045,13 +6045,13 @@ export default class TaxPlanning extends Component { ...@@ -6045,13 +6045,13 @@ export default class TaxPlanning extends Component {
type="text" type="text"
placeholder="input" placeholder="input"
disabled={this.props.isApprover == true ? true : ((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)} disabled={this.props.isApprover == true ? true : ((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)}
value={Number(handleNewFormula(tableMeta, 3, "@87-@88")).toFixed(1)} value={Number(handleNewFormula(tableMeta, 3, "@87+@88")).toFixed(1)}
/> />
} }
/> />
</div> </div>
: :
String(tableMeta.rowData[8]).toUpperCase() === 'UNDER PAYMENT /(OVER PAYMENT ) INCOME TAX ART. 29' ? tableMeta.rowData[8] === "Under payment /(Over Payment ) Income Tax Art. 29" ?
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -6063,7 +6063,7 @@ export default class TaxPlanning extends Component { ...@@ -6063,7 +6063,7 @@ export default class TaxPlanning extends Component {
type="text" type="text"
placeholder="input" placeholder="input"
disabled={this.props.isApprover == true ? true : ((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)} disabled={this.props.isApprover == true ? true : ((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)}
value={Number(handleNewFormula(tableMeta, 3, "@87-@88")).toFixed(1)} value={Number(handleNewFormula(tableMeta, 3, "@89-(@92+@93+@94+95)")).toFixed(1)}
/> />
} }
/> />
......
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