Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/04_registryPerson/components/requestEdit/01_TabInformation.vue

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

@@ -744,7 +744,8 @@ function onSubmitDate() {
 function openModalOrder(val: boolean) {
   // ยังไม่ได้ดัก ส่ง ไป ทั้ง object #e.draft == "รอส่งตัว" &&
   rowsOrder.value = rows.value.filter(
-    (e: any) => e.nodeName !== null && e.reportingDate !== null
+    (e: any) =>
+      e.nodeName !== null && e.reportingDate !== null && e.statusId !== "REPORT"
   );
   modalOrder.value = val;
 }
@@ -808,6 +809,7 @@ onMounted(async () => {
             <q-btn
               v-if="
                 props.row.statusId !== 'DONE' &&
+                props.row.statusId !== 'REPORT' &&
                 (checkPermission($route)?.attrIsGet ||
                   checkPermission($route)?.attrIsUpdate)
               "