Commit fa6bc23e authored by d.arizona's avatar d.arizona

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into didam

parents 18bebb7a e57dcc56
...@@ -191,6 +191,7 @@ const create = (type = "") => { ...@@ -191,6 +191,7 @@ const create = (type = "") => {
const getPeriodeTransaction = () => api.get('transaction/get_periode') const getPeriodeTransaction = () => api.get('transaction/get_periode')
const deleteAttachment = (id) => api.post(`transaction/delete_attachment/${id}`) const deleteAttachment = (id) => api.post(`transaction/delete_attachment/${id}`)
const getDetailReportMB = (body) => api.post('/transaction/master_budget/get_report_hierarki', body) const getDetailReportMB = (body) => api.post('/transaction/master_budget/get_report_hierarki', body)
const getLastestUpdateMB = (body) => api.post('/transaction/master_budget/get_latest_update', body)
const createSubmitReport = (body) => api.post('transaction/master_budget/create_submission_report', body) const createSubmitReport = (body) => api.post('transaction/master_budget/create_submission_report', body)
const getSubmission = (body) => api.post('transaction/get_submission_id', body) const getSubmission = (body) => api.post('transaction/get_submission_id', body)
const checkUploadMB = (body) => api.post('transaction/master_budget/check_import', body) const checkUploadMB = (body) => api.post('transaction/master_budget/check_import', body)
...@@ -348,7 +349,8 @@ const create = (type = "") => { ...@@ -348,7 +349,8 @@ const create = (type = "") => {
deleteAllItemReport, deleteAllItemReport,
validateSubmitReport, validateSubmitReport,
checkUploadOperatingInd, checkUploadOperatingInd,
uploadOperatingInd uploadOperatingInd,
getLastestUpdateMB
} }
} }
......
...@@ -349,7 +349,7 @@ export default class BudgetTahunan extends Component { ...@@ -349,7 +349,7 @@ export default class BudgetTahunan extends Component {
render() { render() {
const columns = ["#", "Jenis Laporan", const columns = ["#", "Report Type",
{ {
name: "Revision", name: "Revision",
options: { options: {
...@@ -464,12 +464,12 @@ export default class BudgetTahunan extends Component { ...@@ -464,12 +464,12 @@ export default class BudgetTahunan extends Component {
{this.state.visibleBudgetTahunan && ( {this.state.visibleBudgetTahunan && (
<div> <div>
<div className={"main-color"} style={{ height: 78, display: 'flex', alignItems: 'center', paddingLeft: 20 }}> <div className={"main-color"} style={{ height: 78, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
<Typography style={{ fontSize: '16px', color: 'white' }}>Pengajuan Budget Tahunan</Typography> <Typography style={{ fontSize: '16px', color: 'white' }}>Master Budget Submission</Typography>
</div> </div>
<div style={{ padding: 20, width: '100%' }}> <div style={{ padding: 20, width: '100%' }}>
<Paper style={{ paddingTop: 10 }}> <Paper style={{ paddingTop: 10 }}>
<div style={{ borderBottom: 'solid 1px #c4c4c4' }} > <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >
<Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Budget Tahunan</Typography> <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Master Budget</Typography>
</div> </div>
<div style={{ padding: 20 }}> <div style={{ padding: 20 }}>
<div> <div>
...@@ -484,7 +484,7 @@ export default class BudgetTahunan extends Component { ...@@ -484,7 +484,7 @@ export default class BudgetTahunan extends Component {
disableClearable disableClearable
style={{ width: 250 }} style={{ width: 250 }}
renderInput={(params) => renderInput={(params) =>
<TextField {...params} label="Periode" margin="normal" style={{ marginTop: 7 }} <TextField {...params} label="Period" margin="normal" style={{ marginTop: 7 }}
/>} />}
value={this.state.periode} value={this.state.periode}
/> />
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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