วินัย เรียงลำดับการแสดงรายการคำสั่งในหน้าสรุปผล

src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue

@@ -167,16 +167,20 @@ watch(
       rowsMain.value = rows.value;
 
       const data = await storeCommand.getCommandTypes();
-      listCommand.value = data.filter(
-        (v: any) =>
-          v.code == "C-PM-19" ||
-          v.code == "C-PM-20" ||
-          v.code == "C-PM-27" ||
-          v.code == "C-PM-28" ||
-          v.code == "C-PM-29" ||
-          v.code == "C-PM-30" ||
-          v.code == "C-PM-31"
-      );
+      const order = [
+        "C-PM-20",
+        "C-PM-19",
+        "C-PM-29",
+        "C-PM-28",
+        "C-PM-27",
+        "C-PM-30",
+        "C-PM-31",
+      ];
+      listCommand.value = data
+        .filter((v: any) => order.includes(v.code))
+        .sort(
+          (a: any, b: any) => order.indexOf(a.code) - order.indexOf(b.code)
+        );
     }
   }
 );