Merge branch 'develop' into devTee

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

@@ -432,6 +432,13 @@ onMounted(async () => {
                         ? col.value + " " + "(นั่งทับตำแหน่ง)"
                         : col.value
                     }}
+                    <q-icon
+                      name="mdi-star"
+                      color="primary"
+                      v-if="props.row.isDirector"
+                    >
+                      <q-tooltip>ผู้อำนวยการ/หัวหน้า</q-tooltip>
+                    </q-icon>
                   </div>
                   <div v-else-if="col.name === 'isPosition'">
                     <div v-if="col.value">

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

@@ -336,6 +336,8 @@ async function getTable() {
             bmaOfficerCheck: data.bmaOfficer,
             statusId: data.statusId,
             draft: convertDraft(data.draft),
+            isDraft: data.draft,
+
             typeCommand: data.typeCommand,
             posTypeCandidateId: data.posTypeCandidateId,
             posTypeCandidateName: data.posTypeCandidateName,
@@ -374,7 +376,7 @@ async function getTable() {
 
       const rowData = await (roleAdmin.value
         ? rowsAll.value
-        : rowsAll.value.filter((x: any) => x.statusId !== "DONE"));
+        : rowsAll.value.filter((x: any) => x.isDraft === true));
 
       // รายชื่อทั้งหมด
       await filterpositionCandidate(rowData);
@@ -779,7 +781,7 @@ async function onUpdateNewRows(type: string, pos: string) {
 
     const isStatusMatch = containStatus.value
       ? item.statusId === "DONE"
-      : item.statusId !== "";
+      : item.statusId !== "DONE";
 
     return isTypeMatch && isPositionMatch && isStatusMatch;
   });
@@ -1394,7 +1396,7 @@ onMounted(async () => {
 
   <!-- dialog เพิ่มรายชื่อ -->
   <q-dialog v-model="modaladdlist" persistent>
-    <q-card style="min-width:70%">
+    <q-card style="min-width: 70%">
       <DialogHeader
         tittle="ส่งรายชื่อไปยังหน่วยงาน"
         :close="clickCloseSendModal"