Commit f51e4e68 authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'didam' into 'master'

apdet

See merge request !500
parents bedced23 05a82b8d
...@@ -218,8 +218,9 @@ export default class VisualisasiAM extends Component { ...@@ -218,8 +218,9 @@ export default class VisualisasiAM extends Component {
<ReactDragListView {...dragProps}> <ReactDragListView {...dragProps}>
<ol style={{paddingLeft: 15}}> <ol style={{paddingLeft: 15}}>
{this.state.listApproval.sort((a,b) => a.orderId - b.orderId).map((item, index) => ( {this.state.listApproval.sort((a,b) => a.orderId - b.orderId).map((item, index) => (
<li key={index} style={{color: '#4b4b4b', fontSize: 14}}> <li key={index} style={{color: 'white', fontSize: 14}}>
<a href='#' style={{ color: '#4b4b4b', fontSize: '14px', cursor: 'auto', outline: 'none' }}> <a href='#' style={{ color: '#4b4b4b', fontSize: '14px', cursor: 'auto', outline: 'none', justifyContent: 'flex-start', display: 'flex'}}>
<label style={{color: '#4b4b4b', marginRight: 15}}>{Number(index+1)}</label>
<div className="grid grid-4x grid-mobile-none gap-20px margin-bottom-20px" style={{width: '75%'}}> <div className="grid grid-4x grid-mobile-none gap-20px margin-bottom-20px" style={{width: '75%'}}>
{item.data.map((items, indexs) => {return(<label>{items.fullname}</label>)})} {item.data.map((items, indexs) => {return(<label>{items.fullname}</label>)})}
<label>{item.data.length == 1? '' : item.data[0].operator_type_name}</label> <label>{item.data.length == 1? '' : item.data[0].operator_type_name}</label>
......
...@@ -763,6 +763,7 @@ export default class TaxPlanning extends Component { ...@@ -763,6 +763,7 @@ export default class TaxPlanning extends Component {
render() { render() {
let dataTable2 = this.state.dataTable let dataTable2 = this.state.dataTable
let dataFormula = []
const handleValueFormula = (value, tableMeta, dex) => { const handleValueFormula = (value, tableMeta, dex) => {
let form = dex === 1 ? tableMeta.rowData[6].tbc : dex === 2 ? tableMeta.rowData[6].fcp : tableMeta.rowData[6].tbf let form = dex === 1 ? tableMeta.rowData[6].tbc : dex === 2 ? tableMeta.rowData[6].fcp : tableMeta.rowData[6].tbf
let splitFormula = String(form).split('@') let splitFormula = String(form).split('@')
...@@ -857,19 +858,25 @@ export default class TaxPlanning extends Component { ...@@ -857,19 +858,25 @@ export default class TaxPlanning extends Component {
// console.log(total) // console.log(total)
// console.log(splitFormula) // console.log(splitFormula)
// let dataSub = dex == 1? dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc : dex == 2? dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp : dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf // let dataSub = dex == 1? dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc : dex == 2? dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp : dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf
// if (dex == 1) { if (dex == 1) {
// if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value == undefined) { if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value == undefined) {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc = total
// } else { } else {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value = total // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value = total
// } }
// } else { } else if (dex == 2) {
// if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) { if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value == undefined) {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp = total
// } else { } else {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = total // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value = total
// } }
// } } else {
if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = total
} else {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = total
}
}
return total return total
} }
......
...@@ -217,12 +217,17 @@ export default class OperatingIndicator extends Component { ...@@ -217,12 +217,17 @@ export default class OperatingIndicator extends Component {
if (item >= 2000 && item <= (Number(currentYear) + 1)) { if (item >= 2000 && item <= (Number(currentYear) + 1)) {
data.push(item) data.push(item)
} }
console.log('bibim')
} else { } else {
if ((item >= 2000) && (item == this.state.lastPeriod || item < this.state.lastPeriod)) { if ((item >= 2000) && (item == this.state.lastPeriod || item < this.state.lastPeriod)) {
data.push(item) data.push(item)
} }
console.log('bubum')
} }
}) })
console.log(this.state.lastPeriod)
console.log(this.state.lastPeriod)
console.log(this.state.isApprover)
let periodeData = data.map((item) => { let periodeData = data.map((item) => {
return { return {
periode: item, periode: item,
......
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