Merge branch 'develop' into dev

src/modules/05_placement/components/PersonalList/Table.vue

@@ -799,13 +799,13 @@ function openModalOrder(val: boolean) {
         e.statusId !== "DONE") ||
       (DataStore.isOfficer &&
         e.root === "สำนักปลัดกรุงเทพมหานคร" &&
-        e.rootId != e.rootIdOld &&
         e.draft == "ส่งตัวแล้ว" &&
         e.nodeName !== null &&
         e.reportingDate !== null &&
         e.statusId !== "REPORT" &&
         e.statusId !== "DONE")
   );
+
   modalOrder.value = val;
 }