Skip to content

T
Tia-dev
Commit 291a1f4f authored by EKSAD's avatar EKSAD
Browse files
Options

edit profit loss

parent fcc1a02e
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 76 deletions
src/api/index.js
View file @ 291a1f4f
...@@ -38,7 +38,7 @@ const create = (type = "") => { ...@@ -38,7 +38,7 @@ const create = (type = "") => {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
}, },
// 40 second timeout... // 40 second timeout...
timeout: 40000 timeout: 50000
}) })
break; break;
default: default:
......
src/container/BudgetTahunan/ProfitLoss.js
View file @ 291a1f4f
...@@ -352,6 +352,7 @@ export default class ProfitLoss extends Component { ...@@ -352,6 +352,7 @@ export default class ProfitLoss extends Component {
}) })
}) })
let body = { let body = {
submission_id: this.props.submissionID,
company_id: this.props.company.company_id, company_id: this.props.company.company_id,
periode: this.props.periode, periode: this.props.periode,
report_id: this.props.report_id, report_id: this.props.report_id,
...@@ -370,6 +371,9 @@ export default class ProfitLoss extends Component { ...@@ -370,6 +371,9 @@ export default class ProfitLoss extends Component {
} }
} else { } else {
alert(response.problem) alert(response.problem)
this.setState({loading: false})
this.props.onClickClose()
this.props.getReport()
} }
}) })
} }
...@@ -406,16 +410,21 @@ export default class ProfitLoss extends Component { ...@@ -406,16 +410,21 @@ export default class ProfitLoss extends Component {
// } else { // } else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
// } // }
let total = 0
dataTable2[tableMeta.rowIndex].map((item,index) => {
if (index >= 8 && index <= 19) {
let valItem = item == undefined || item == ""? 0 : item
total += Number(valItem)
}
})
dataTable2[tableMeta.rowIndex][20] = total
} }
} }
const handleTotal = (tableMeta) => {
let total = 0
dataTable2[tableMeta.rowIndex].map((item, index) => {
if (index >= 7 && index <= 18) {
let valItem = item == undefined || item == "" ? 0 : item
total += Number(valItem)
}
})
dataTable2[tableMeta.rowIndex][19] = total
return total
// console.log(total);
}
const handleNotes = (value, tableMeta) => { const handleNotes = (value, tableMeta) => {
console.log(value) console.log(value)
let a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = value let a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = value
...@@ -557,14 +566,14 @@ export default class ProfitLoss extends Component { ...@@ -557,14 +566,14 @@ export default class ProfitLoss extends Component {
{tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null : {tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null :
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
value={value} // value={value}
control={ control={
<Input <Input
disableUnderline={true} disableUnderline={true}
style={{ color: "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
value={value} defaultValue={value}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleNotes(event.target.value, tableMeta) handleNotes(event.target.value, tableMeta)
...@@ -1692,29 +1701,9 @@ export default class ProfitLoss extends Component { ...@@ -1692,29 +1701,9 @@ export default class ProfitLoss extends Component {
setCellProps: () => ({ style2 }), setCellProps: () => ({ style2 }),
customBodyRender: (value, tableMeta, updateValue) => { customBodyRender: (value, tableMeta, updateValue) => {
return ( return (
<div style={{ textAlign: 'right' }}> <div style={{ width: 96, textAlign: 'right' }}>
{tableMeta.rowData[0] === 3 ? {tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ?
<div style={{ flex: 1 }}> null : tableMeta.rowData[0] === 2 ?
<FormControlLabel
style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
console.log(dataTable2)
}}
/>
}
/>
</div> :
tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1724,48 +1713,17 @@ export default class ProfitLoss extends Component { ...@@ -1724,48 +1713,17 @@ export default class ProfitLoss extends Component {
disabled={true} disabled={true}
value={handleValue(tableMeta)} value={handleValue(tableMeta)}
/> />
</span> </span> :
: <span style={{ fontSize: 12, textAlign: 'right' }}>
tableMeta.rowData[0] === 4 ? <NumberFormat
null thousandSeparator={true}
: style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
tableMeta.rowData[0] === 6 ? type="text"
// <NumberFormat placeholder=""
// thousandSeparator={true} disabled={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} value={handleTotal(tableMeta)}
// type="text" />
// placeholder="" </span>}
// disabled={true}
// value={handleFormula(value, tableMeta)}
// />
null
:
tableMeta.rowData[0] === 5 ?
// <NumberFormat
// thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// placeholder=""
// disabled={true}
// value={handleFormula(value, tableMeta)}
// />
null
:
tableMeta.rowData[0] === 1 ?
// value === "" ?
// null :
// <NumberFormat
// thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// placeholder=""
// disabled={true}
// value={Number(value)}
// />
null
:
null
}
</div> </div>
) )
} }
......
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