diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 0a7be1d7..a5a4d276 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -207,7 +207,30 @@
                             </div>
                         </div>
 
-                        <div v-if="currentQuestionId === '1688_issue_others'">
+                        <div v-if="currentQuestionId === 'edit_po'">
+                            <div v-if="externalApiResponse.data" class="row">
+                                <div class="col">
+                                    <h3>
+                                        <span class="bold d-inline-block m-r-15">ORDER Marking: </span>
+                                        <a :href="route('booking.details', externalApiResponse.data.marking)"
+                                            target="_blank">{{ externalApiResponse.data.marking }}</a>
+                                    </h3>
+                                    <div class="row b-a b-primary padding-30 bg-white m-t-25">
+                                        <div class="col">
+                                            <purchase-order-form-component :data="externalApiResponse.data"
+                                                section="section"></purchase-order-form-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-else class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
+                                <div class="col">
+                                    <h1 class="text-white">Api Failed. Please contact Tech Support</h1>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div v-if="currentQuestionId === '1688_issue_others' || currentQuestionId === 'po_others'">
                             <div v-if="externalApiResponse.data" class="row">
                                 <div class="col">
                                     <div class="row b-a b-primary padding-30 bg-white m-t-25">
@@ -399,9 +422,7 @@ export default {
                     // "text": "Order Number",
                     "load_api": this.route("api.admin_work_flow.fetch_pending_fill_po"),
                     "answers": [
-                        { "text": "Approve", "next": "po_approved" },
                         { "text": "Edit PO", "next": "edit_po" },
-                        { "text": "Reject", "next": "reject_po" }
                     ]
                 },
                 "po_filled": {
@@ -411,7 +432,6 @@ export default {
                         { "text": "Next PO", "next": "approve_po" }
                     ]
                 },
-                "submit_po": {},
                 "po_approved": {
                     "text": "PO Approved",
                     "answers": [
@@ -419,8 +439,18 @@ export default {
                         { "text": "Next PO", "next": "approve_po" }
                     ]
                 },
-                "edit_po": {},
-                "po_others": {},
+                "edit_po": {
+                    "answers": [
+                        { "text": "Issue?", "next": "issue_po"},
+                        { "text": "Done", "next": "po_filled" },
+                    ]
+                },
+                "po_others": {
+                    "text": "Others",
+                    "answers": [
+                        { "text": "Submit Issue", "next": "issue_submit"}
+                    ]
+                },
                 "reject_po": {
                     "text": "PO Rejected",
                     "answers": [
@@ -512,6 +542,14 @@ export default {
                     }, false, false);
                     nextQuestionId = '1688_issue_others';
 
+                } else if(nextQuestionId === 'po_others') {
+                    this.callApi(this.route('api.admin_work_flow.create_approve_issue_remark'), 'post', 'section', {
+                        'booking_id': this.currentOrder.booking_id,
+                        'remark': nextQuestionId,
+                        'user_id': this.$store.getters.getUserId,
+                    }, false, false);
+                    nextQuestionId = 'po_others';
+
                 } else {
                     this.callApi(this.route('api.admin_work_flow.create_1688_login_issue_remark'), 'post', 'section', {
                         'booking_id': this.currentOrder.booking_id,