Skip to content

T
Tia-dev
Commit 87b67844 authored by d.arizona's avatar d.arizona
Browse files
Options

update

parent f33cb776
Show whitespace changes
Inline Side-by-side
Showing with 526 additions and 603 deletions
src/container/BudgetTahunan.js
View file @ 87b67844
......@@ -342,7 +342,7 @@ export default class BudgetTahunan extends Component {
// // // console.log(response);
if (response.data) {
if (response.data.status === "success") {
this.setState({ isSubmit: true }, () => {
this.setState({ isSubmit: response.data.data.is_can_submit }, () => {
this.getReport()
this.getReportAttachment()
})
......@@ -2224,7 +2224,7 @@ export default class BudgetTahunan extends Component {
this.state.dataTable.map(item => {
// if (item[1] !== 'Cash Flow') {
if (item[3] !== "submitted" && item[3] !== 'approved') {
// canSubmit = false
canSubmit = false
array.push(item[3])
}
// }
......@@ -2357,9 +2357,9 @@ export default class BudgetTahunan extends Component {
borderColor: 'transparent'
}}
onClick={() =>
// tableMeta.rowData[5] == true ?
tableMeta.rowData[5] == true ?
this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
// : null
: null
}
>
{/* {this.state.isApprover == true ?
......
src/container/BudgetTahunan/BalanceSheet.js
View file @ 87b67844
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/CashFlow.js
View file @ 87b67844
......@@ -3195,8 +3195,8 @@ export default class CashFlow extends Component {
</div>
</button>
</div>
{/* {this.props.isApprover === true || dataTable2.length == 0 ? null :
(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') ? */}
{this.props.isApprover === true || dataTable2.length == 0 ? null :
(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') ?
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
<button
type="button"
......@@ -3221,7 +3221,7 @@ export default class CashFlow extends Component {
</div>
</button>
</div>
{/* : null} */}
: null}
</div>
</div>
</Paper>
......
src/container/BudgetTahunan/ProfitLoss.js
View file @ 87b67844
......@@ -595,8 +595,8 @@ export default class ProfitLoss extends Component {
}
})
let indexParent = dataTable2.findIndex((val) => val[1] == dataTable2[data.rowIndex][2])
// let a = dataTable2[data.rowIndex][data.columnIndex] = Number(total)
let a = dataTable2[data.rowIndex][data.columnIndex] = Number(value)
let a = dataTable2[data.rowIndex][data.columnIndex] = Number(total)
// let a = dataTable2[data.rowIndex][data.columnIndex] = Number(value)
// console.log(indexParent);
return a
}
......@@ -2523,8 +2523,8 @@ export default class ProfitLoss extends Component {
placeholder=""
disabled={true}
decimalScale={1}
value={Number(value).toFixed(1)}
// value={Number(handleTotal(tableMeta)).toFixed(1)}
// value={Number(value).toFixed(1)}
value={Number(handleTotal(tableMeta)).toFixed(1)}
/>
</span>}
</div>
......@@ -2888,7 +2888,7 @@ export default class ProfitLoss extends Component {
</button>
</a>}
<ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
{/* {((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')) && */}
{((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')) &&
<a data-tip={'Upload'} data-for="upload">
<button
style={{
......@@ -2902,7 +2902,7 @@ export default class ProfitLoss extends Component {
<img src={Images.upload} />
</button>
</a>
{/* // } */}
}
<ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" />
<a data-tip={'Download'} data-for="download">
<button
......
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