Merge branch 'deni-dev(pc)' into 'master'

api reprot

See merge request !469

src/api/index.js

@@ -234,6 +234,7 @@ const create = (type = "") => {
   const checkUploadOLPA = (body) => api.post('transaction/outlook_pa/check_import', body)
   const validateSubmitReportOLPA = (body) => api.post('transaction/outlook_pa/validate_save', body)
   const uploadOLPA = (body) => api.post('transaction/outlook_pa/import_outlook_pa')
+  const uploadAttOLPA = (body) => api.post('transaction/outlook_pa/upload_attachment', body)
 
   //Template
   const downloadTemplate = (fileName, fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`)
@@ -405,7 +406,8 @@ const create = (type = "") => {
     checkUploadOLPA,
     uploadOLPA,
     validateSubmitReportOLPA,
-    getDetailReportOLPA
+    getDetailReportOLPA,
+    uploadAttOLPA
   }
 }
 

src/container/BudgetTahunan.js

@@ -984,7 +984,7 @@ export default class BudgetTahunan extends Component {
                                         <div style={{ width: '50%' }}>
                                             <Typography style={{ fontSize: '16px', color: '#4b4b4b', fontWeight: 'bold' }}>Attachment: </Typography>
                                         </div>
-                                        {!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' && this.state.lastStatus === 'REVISION') && (
+                                        {!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' || this.state.lastStatus === 'REVISION') && (
                                             <div style={{ width: '50%' }}>
                                                 <button
                                                     style={{
@@ -1030,7 +1030,7 @@ export default class BudgetTahunan extends Component {
                                                 : null
                                             }
                                         </div>
-                                        {!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' && this.state.lastStatus === 'REVISION') && (
+                                        {!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' || this.state.lastStatus === 'REVISION') && (
                                             <div style={{ width: '50%' }}>
                                                 {this.state.listAttachment.length > 0 ?
                                                     this.state.listAttachment.map((item) => {

src/container/OutlookPA.js

@@ -492,7 +492,7 @@ export default class OutlookPA extends Component {
     }
 
     uploadAttachment(formData) {
-        api.create().uploadAttachment(formData).then(response => {
+        api.create().uploadAttOLPA(formData).then(response => {
             if (response.data) {
                 if (response.data.status === "success") {
                     this.setState({ visibleUpload: false }, () => {
@@ -905,7 +905,7 @@ export default class OutlookPA extends Component {
                                         <div style={{ width: '50%' }}>
                                             <Typography style={{ fontSize: '16px', color: '#4b4b4b', fontWeight: 'bold' }}>Attachment: </Typography>
                                         </div>
-                                        {!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' && this.state.lastStatus === 'REVISION') && (
+                                        {!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' || this.state.lastStatus === 'REVISION') && (
                                             <div style={{ width: '50%' }}>
                                                 <button
                                                     style={{
@@ -951,7 +951,7 @@ export default class OutlookPA extends Component {
                                                 : null
                                             }
                                         </div>
-                                        {!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' && this.state.lastStatus === 'REVISION') && (
+                                        {!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' || this.state.lastStatus === 'REVISION') && (
                                             <div style={{ width: '50%' }}>
                                                 {this.state.listAttachment.length > 0 ?
                                                     this.state.listAttachment.map((item) => {

src/container/OutlookPA/BalanceSheetOLPA.js

@@ -341,7 +341,7 @@ export default class BalanceSheetOLPA extends Component {
             balance_sheet: data,
             status: type
         }
-        // console.log(data);
+        console.log(JSON.stringify(body));
         api.create('UPLOAD').uploadOLPA(body).then(response => {
             console.log(response);
             if (response.data) {