Commit 5e620906 authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'faisal' into 'master'

update action company

See merge request !144
parents d534fd40 f6c27c4e
......@@ -48,9 +48,8 @@ export default class CreatePerusahaan extends Component {
this.getParentCompany()
this.getAllUnitBisnis()
if(this.props.type === 'edit') {
let data = this.props.data
this.getDetailPerusahaan(data.company_id,)
console.log(this.props.data);
this.getDetailPerusahaan()
// console.log(this.props.data);
} else {
let date = format(new Date, 'yyyy-MM-dd')
// console.log(date);
......@@ -61,8 +60,8 @@ export default class CreatePerusahaan extends Component {
}
}
getDetailPerusahaan(id) {
api.create().getDetailPerusahaan(id).then(response => {
getDetailPerusahaan() {
api.create().getDetailPerusahaan(this.props.data[1]).then(response => {
if (response.data.status === "success") {
console.log(response);
this.setState({
......@@ -229,7 +228,7 @@ export default class CreatePerusahaan extends Component {
"company_name": this.state.company,
"parent": this.state.getPerusahaan == null ? null : this.state.getPerusahaan.company_id,
"business_unit_id": this.state.getTypes.business_unit_id,
"total_report": this.state.totalReport,
// "total_report": this.state.totalReport,
"start_date": this.state.startDate,
"end_date": this.state.endDate
}
......@@ -356,7 +355,7 @@ export default class CreatePerusahaan extends Component {
</div>
<div style={{ display: 'flex' }}>
<Typography style={{ fontSize: 11, width: '20%' }}>Diubah</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.updated == - null ? "" : this.props.data.updated}</Typography>
<Typography style={{ fontSize: 11 }}>: {this.state.updated}</Typography>
</div>
</div>
</div>
......
......@@ -238,7 +238,7 @@ export default class Perusahaan extends Component {
console.log(response)
if (response.data.status == 'success') {
let data = response.data.data
let listData = data.map((item, index) => {
let listData = data.sort((a, b) => a.company_id - b.company_id).map((item, index) => {
return [index, item.company_id, item.company_name, item.parent_name, item.business_unit_name, item.total_report, item.status]
})
this.setState({ dataTable: listData, listData: response.data.data })
......@@ -248,15 +248,15 @@ export default class Perusahaan extends Component {
})
}
openPopUp(index, type) {
openPopUp(rowData, type) {
if (type === 'edit') {
this.setState({
selectIndex: index,
rowData: rowData,
visibleEdit: true
})
} else {
this.setState({
data: this.state.listData[index],
rowData: rowData,
visibleCreate: true
})
}
......@@ -268,7 +268,7 @@ export default class Perusahaan extends Component {
"keyword": e
}
api.create().searchPerusahaan(body).then(response => {
console.log(response.data);
// console.log(response.data);
if (response.data.status == 'success') {
let data = response.data.data
let listData = data.map((item, index) => {
......@@ -357,7 +357,7 @@ export default class Perusahaan extends Component {
borderColor: 'transparent'
}}
// onClick={() => this.setState({ visibleEdit: true, data: tableMeta.rowData })}
onClick={() => this.openPopUp(tableMeta.rowIndex, 'edit')}
onClick={() => this.openPopUp(tableMeta.rowData, 'edit')}
>
<img src={Images.editCopy} />
</button>
......@@ -600,7 +600,7 @@ export default class Perusahaan extends Component {
<CreatePerusahaan
type={"edit"}
onClickClose={() => this.setState({ visibleEdit: false })}
data={this.state.listData[this.state.selectIndex]}
data={this.state.rowData}
updatePerusahaan={this.updatePerusahaan.bind(this)}
/>
)}
......
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