Merge branch 'dev/riri' into 'ENV-DEV'

Anomali CAT

See merge request !1877

src/container/BudgetTahunan/BudgetTahunan.js

@@ -628,7 +628,7 @@ export default class BudgetTahunan extends Component {
             console.log(response)
             if (response.data) {
                 if (response.data.status === "success") {
-                    if (type === "CAT") {
+                    if (type === "CAT" || type === "DraftCAT") {
                         this.setState({ visibleCAT: false, visibleBudgetTahunan: true, loading: false })
                     } else {
                         this.setState({ visibleBudgetTahunan: true, loading: false })

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -825,10 +825,10 @@ export default class CorporateAnnualTarget extends Component {
                         if (type == 'submitted') {
                             this.props.getReport(body, 'CAT')
                         } else {
-                            this.props.getReport(body)
+                            this.props.getReport(body, 'DraftCAT')
                         }
                         this.setState({ loading: false })
-                        // this.props.onClickClose()
+                        this.props.onClickClose()
                         // this.props.getReport()
                     } else {
                         if (response.data?.message == "Please Set Up Rate Currency First") {