From 0bdb67b0ff187d0bd5f73938f3e786f6bfabbfd1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 9 Jul 2024 17:14:40 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=20=3D>=20=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B9=80=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/10_order/components/step/step01.vue | 12 ++++++++----
 src/modules/10_order/components/step/step04.vue |  2 +-
 src/modules/10_order/store.ts                   |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index e06d50818..91c76df07 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -57,7 +57,7 @@ const CommandOption = ref<DataOption1[]>([]);
 
 //Main
 const typeOrder = ref<any>();
-const nameOrder = ref<any>("");
+const nameOrder = ref<string>("");
 const command = ref<number | "">();
 const dateYear = ref<number | null>(null);
 const dateCommand = ref<Date | null>(null);
@@ -174,6 +174,7 @@ const fecthTypeOption = async (actions: string) => {
     .get(config.API.typeOrder())
     .then((res) => {
       const response = res.data.result;
+
       const filterRes = response.filter((e: any) =>
         commandCodes.value.includes(e.commandCode)
       );
@@ -327,7 +328,8 @@ const optionsData = async (commandCode: string) => {
     orderTypeCode == "C-PM-01" ||
     orderTypeCode == "C-PM-02" ||
     orderTypeCode == "C-PM-03" ||
-    orderTypeCode == "C-PM-04"
+    orderTypeCode == "C-PM-04" ||
+    orderTypeCode == "C-PM-39"
   ) {
     fecthExamRoundOption(orderTypeCode);
   }
@@ -504,7 +506,8 @@ const onSubmit = async () => {
     typeOrder.value.commandCode == "C-PM-01" ||
     typeOrder.value.commandCode == "C-PM-02" ||
     typeOrder.value.commandCode == "C-PM-03" ||
-    typeOrder.value.commandCode == "C-PM-04"
+    typeOrder.value.commandCode == "C-PM-04" ||
+    typeOrder.value.commandCode == "C-PM-39"
   ) {
     Object.assign(formdata, {
       examRound: examRound.value,
@@ -1058,7 +1061,8 @@ const getClass = (val: boolean) => {
             (typeOrder.commandCode === 'C-PM-01' ||
               typeOrder.commandCode === 'C-PM-02' ||
               typeOrder.commandCode === 'C-PM-03' ||
-              typeOrder.commandCode === 'C-PM-04')
+              typeOrder.commandCode === 'C-PM-04' ||
+              typeOrder.commandCode === 'C-PM-39')
           "
         >
           <div class="col-xs-12 col-md-12">
diff --git a/src/modules/10_order/components/step/step04.vue b/src/modules/10_order/components/step/step04.vue
index 14ab30351..91bd9a60e 100644
--- a/src/modules/10_order/components/step/step04.vue
+++ b/src/modules/10_order/components/step/step04.vue
@@ -49,7 +49,7 @@ const statusOrder = ref<string>();
 const orderName = ref<string>("");
 const orderStatusName = ref<string>("");
 
-const orderId = ref<string>(orderId_params.toString());
+const orderId = ref<string>(orderId_params?.toString());
 onMounted(async () => {
   if (orderId.value) {
     await fetchAttachment(orderId.value);
diff --git a/src/modules/10_order/store.ts b/src/modules/10_order/store.ts
index a57153ea6..2fea55def 100644
--- a/src/modules/10_order/store.ts
+++ b/src/modules/10_order/store.ts
@@ -180,8 +180,8 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
         return "คำสั่งให้ลูกจ้างประจำได้รับค่าตอบแทนพิเศษ";
       case "C-PM-38":
         return "แต่งตั้งข้าราชการให้ดำรงตำแหน่ง"; // คำสั่งปรับโครงสร้าง
-      // case "C-PM-39":
-      //   return "คำสั่งปรับโครงสร้าง";
+      case "C-PM-39":
+        return "คำสั่งเลื่อน : สำหรับข้าราชการ กทม. เดิม";
       default:
         return "";
     }