diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index cd14de2c2..b72df7f8b 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -111,6 +111,9 @@ const guiltyBasis = ref<string>("");
 const conclusionFireNo = ref<string>("");
 const conclusionFireDate = ref<Date>(new Date());
 const conclusionFireResolution = ref<string>("");
+// C-PM-24
+const conclusionTranferNo = ref<string>("");
+const conclusionTranferDate = ref<Date>(new Date());
 
 const typeOrderFilter = ref<any>({
   typeOrderOption: [],
@@ -239,6 +242,10 @@ const fetchdetailOrder = async () => {
       conclusionFireNo.value = data.conclusionFireNo;
       conclusionFireDate.value = data.conclusionFireDate;
       conclusionFireResolution.value = data.conclusionFireResolution;
+      // 24
+      conclusionTranferNo.value = data.conclusionTranferNo;
+      conclusionTranferDate.value = data.conclusionTranferDate;
+
       fecthExamRoundOption(data.orderTypeCode);
     })
     .catch((e) => {
@@ -314,6 +321,9 @@ const selectCMP = (selectOrder: OrederResult) => {
   conclusionFireNo.value = "";
   conclusionFireDate.value = new Date();
   conclusionFireResolution.value = "";
+  // 24
+  conclusionTranferNo.value = "";
+  conclusionTranferDate.value = new Date();
 };
 // เรียกรอบการสอบ
 const fecthExamRoundOption = async (commandCode: string) => {
@@ -441,7 +451,13 @@ const submit = async () => {
       conclusionFireDate: conclusionFireDate.value,
       conclusionFireResolution: conclusionFireResolution.value,
     });
+  } else if (typeOrder.value.commandCode == "C-PM-24") {
+    Object.assign(formdata, {
+      conclusionTranferNo: conclusionTranferNo.value,
+      conclusionTranferDate: conclusionTranferDate.value,
+    });
   }
+
   // เช็คค่าว่าง
   await myForm.value!.validate().then((result: boolean) => {
     if (result) {
@@ -1817,6 +1833,67 @@ const getClass = (val: boolean) => {
           />
         </div>
       </div>
+
+      <!-- C-PM-24 -->
+      <div
+        class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"
+        v-if="typeOrder != null && typeOrder.commandCode === 'C-PM-24'"
+      >
+        <div class="col-xs-12 col-md-3">
+          <q-input
+            :class="getClass(true)"
+            outlined
+            dense
+            lazy-rules
+            v-model="conclusionTranferNo"
+            :rules="[(val) => !!val || `${'กรุณากรอกครั่งที่'}`]"
+            hide-bottom-space
+            :label="`${'ครั้งที่'}`"
+          />
+        </div>
+
+        <div class="col-xs-12 col-md-3">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="conclusionTranferDate"
+            :locale="'th'"
+            autoApply
+            borderless
+            :enableTimePicker="false"
+            week-start="0"
+          >
+            <template #year="{ year }">
+              {{ year + 543 }}
+            </template>
+            <template #year-overlay-value="{ value }">
+              {{ parseInt(value + 543) }}
+            </template>
+            <template #trigger>
+              <q-input
+                outlined
+                dense
+                class="full-width datepicker"
+                :model-value="
+                  conclusionTranferDate != null
+                    ? date2Thai(conclusionTranferDate)
+                    : null
+                "
+                :label="`${'เมื่อวันที่'}`"
+                :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]"
+              >
+                <template v-slot:prepend>
+                  <q-icon
+                    name="event"
+                    class="cursor-pointer"
+                    style="color: var(--q-primary)"
+                  >
+                  </q-icon>
+                </template>
+              </q-input>
+            </template>
+          </datepicker>
+        </div>
+      </div>
     </q-form>
   </div>