diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index 8c6e39176..cd14de2c2 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -118,9 +118,9 @@ const typeOrderFilter = ref<any>({
 
 onMounted(async () => {
   if (orderId) {
-    fecthTypeOption("hasData");
+    await fecthTypeOption("hasData");
   } else {
-    fecthTypeOption("noData");
+    await fecthTypeOption("noData");
   }
 });
 // เลือกคำสั่งโดย
@@ -260,11 +260,13 @@ const fecthCommand = async () => {
     });
 };
 const selectCMP = (selectOrder: OrederResult) => {
-  fecthExamRoundOption(selectOrder.commandCode);
-  if (selectOrder.commandCode === "C-PM-10") {
-    nodeTree();
+  if (selectOrder != null) {
+    fecthExamRoundOption(selectOrder.commandCode);
+    if (selectOrder.commandCode === "C-PM-10") {
+      nodeTree();
+    }
+    nameOrder.value = DataStore.nameOrderFilter(selectOrder.commandCode);
   }
-  nameOrder.value = DataStore.nameOrderFilter(selectOrder.commandCode);
   //01-04
   examRound.value = "";
   conclusionRegisterNo.value = "";
@@ -841,9 +843,10 @@ const getClass = (val: boolean) => {
             hide-bottom-space
           />
         </div>
-        {{ typeOrder }}
-        {{ typeOrder.commandCode }}
-        <div class="col-12 q-mb-md" v-if="typeOrder.commandCode">
+        <div
+          class="col-12 q-mb-md"
+          v-if="typeOrder != null && typeOrder.commandCode"
+        >
           <q-separator />
         </div>
       </div>
@@ -852,10 +855,11 @@ const getClass = (val: boolean) => {
       <div
         class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
         v-if="
-          typeOrder.commandCode === 'C-PM-01' ||
-          typeOrder.commandCode === 'C-PM-02' ||
-          typeOrder.commandCode === 'C-PM-03' ||
-          typeOrder.commandCode === 'C-PM-04'
+          typeOrder != null &&
+          (typeOrder.commandCode === 'C-PM-01' ||
+            typeOrder.commandCode === 'C-PM-02' ||
+            typeOrder.commandCode === 'C-PM-03' ||
+            typeOrder.commandCode === 'C-PM-04')
         "
       >
         <div class="col-xs-12 col-md-12">
@@ -1002,8 +1006,9 @@ const getClass = (val: boolean) => {
       <div
         class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
         v-if="
-          typeOrder.commandCode === 'C-PM-05' ||
-          typeOrder.commandCode === 'C-PM-06'
+          typeOrder != null &&
+          (typeOrder.commandCode === 'C-PM-05' ||
+            typeOrder.commandCode === 'C-PM-06')
         "
       >
         <div class="col-xs-12 col-md-6">
@@ -1061,7 +1066,7 @@ const getClass = (val: boolean) => {
       <!-- C-PM-08 -->
       <div
         class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-        v-if="typeOrder.commandCode === 'C-PM-08'"
+        v-if="typeOrder != null && typeOrder.commandCode === 'C-PM-08'"
       >
         <div class="col-xs-12 col-md-6">
           <q-input
@@ -1125,7 +1130,7 @@ const getClass = (val: boolean) => {
       <!-- C-PM-09 -->
       <div
         class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-        v-if="typeOrder.commandCode === 'C-PM-09'"
+        v-if="typeOrder != null && typeOrder.commandCode === 'C-PM-09'"
       >
         <div class="col-xs-12 col-md-12">
           <q-input
@@ -1244,7 +1249,7 @@ const getClass = (val: boolean) => {
       <!-- C-PM-10 -->
       <div
         class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-        v-if="typeOrder.commandCode === 'C-PM-10'"
+        v-if="typeOrder != null && typeOrder.commandCode === 'C-PM-10'"
       >
         <div class="col-xs-12 col-md-4">
           <q-input
@@ -1476,8 +1481,9 @@ const getClass = (val: boolean) => {
       <div
         class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
         v-if="
-          typeOrder.commandCode === 'C-PM-11' ||
-          typeOrder.commandCode === 'C-PM-12'
+          typeOrder != null &&
+          (typeOrder.commandCode === 'C-PM-11' ||
+            typeOrder.commandCode === 'C-PM-12')
         "
       >
         <div class="col-xs-12 col-md-4">
@@ -1550,7 +1556,7 @@ const getClass = (val: boolean) => {
       <!-- C-PM-13 -->
       <div
         class="row col-6 q-col-gutter-x-lg q-col-gutter-y-md"
-        v-if="typeOrder.commandCode === 'C-PM-13'"
+        v-if="typeOrder != null && typeOrder.commandCode === 'C-PM-13'"
       >
         <div class="col-xs-12 col-md-12">
           <q-input
@@ -1569,7 +1575,7 @@ const getClass = (val: boolean) => {
       <!-- C-PM-14 -->
       <div
         class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-        v-if="typeOrder.commandCode === 'C-PM-14'"
+        v-if="typeOrder != null && typeOrder.commandCode === 'C-PM-14'"
       >
         <div class="col-xs-12 col-md-4">
           <q-input
@@ -1641,7 +1647,7 @@ const getClass = (val: boolean) => {
       <!-- C-PM-16 -->
       <div
         class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
-        v-if="typeOrder.commandCode === 'C-PM-16'"
+        v-if="typeOrder != null && typeOrder.commandCode === 'C-PM-16'"
       >
         <div class="col-xs-12 col-md-6">
           <q-input
@@ -1702,9 +1708,10 @@ const getClass = (val: boolean) => {
       <div
         class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
         v-if="
-          typeOrder.commandCode === 'C-PM-18' ||
-          typeOrder.commandCode === 'C-PM-19' ||
-          typeOrder.commandCode === 'C-PM-20'
+          typeOrder != null &&
+          (typeOrder.commandCode === 'C-PM-18' ||
+            typeOrder.commandCode === 'C-PM-19' ||
+            typeOrder.commandCode === 'C-PM-20')
         "
       >
         <div class="col-xs-12 col-md-6">