Merge branch 'nice' into develop

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">

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);

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 "";
     }