ทดลองงาน fix bug

src/modules/05_placement/components/AppointMent/Main.vue

@@ -258,26 +258,23 @@ const openModalTree = (data: any, type: string) => {
   posLevel.value = data.positionLevelOld;
   position.value = data.positionOld;
 };
-//เเจ้งเตือนลบข้อมูล
+//เบข้อมูล
 const clickDelete = (id: string) => {
-  dialogRemove($q, () => deleteAppoint(id));
+  dialogRemove($q, () => {
-};
+    showLoader();
-
+    http
-// ลบข้อมูล
+      .delete(config.API.appointmentDelete(id))
-const deleteAppoint = async (id: string) => {
+      .then(() => {
-  showLoader();
+        success($q, "ลบข้อมูลสำเร็จ");
-  await http
+      })
-    .delete(config.API.appointmentDelete(id))
+      .catch((e) => {
-    .then(() => {
+        messageError($q, e);
-      success($q, "ลบข้อมูลสำเร็จ");
+      })
-    })
+      .finally(() => {
-    .catch((e) => {
+        fecthlistappointment();
-      messageError($q, e);
+        hideLoader();
-    })
+      });
-    .finally(() => {
+  });
-      fecthlistappointment();
-      hideLoader();
-    });
 };
 
 // ไปหน้ารายละเอียด
@@ -546,7 +543,7 @@ onMounted(() => {
                         <q-item
                           clickable
                           v-close-popup
-                          @click="clickDelete(props.row.personalId)"
+                          @click="clickDelete(props.row.id)"
                         >
                           <q-item-section
                             style="min-width: 0px"

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

@@ -336,6 +336,7 @@ async function getTable() {
             posLevelCandidateId: data.posLevelCandidateId,
             posLevelCandidateName: data.posLevelCandidateName,
             posmasterId: data.posmasterId,
+            statusNameCheck: convertContainStatus(data.statusId),
 
             statusName:
               convertContainStatus(data.statusId) +
@@ -362,11 +363,9 @@ async function getTable() {
         : rowsAll.value.filter((x: any) => x.statusId !== "CONTAIN");
       // รายชื่อไปยังหน่วยงาน
       rowsFilter.value = rows.value.filter(
-        (e: any) =>
+        (e: any) => e.draft == "รอส่งตัว" && e.statusNameCheck == "เตรียมบรรจุ"
-          e.draft == "รอส่งตัว" &&
-          e.positionNumber !== null &&
-          e.statusName == "เตรียมบรรจุ"
       );
+      console.log(rows.value);
 
       insertAvatar(rowsAll.value);
     })
@@ -1243,7 +1242,7 @@ onMounted(async () => {
                 :props="props"
                 class="cursor-pointer"
               >
-                <template v-if="col.name === 'position'">
+                <template v-if="col.name === 'no'">
                   {{ props.rowIndex + 1 }}
                 </template>
                 <template
@@ -1252,8 +1251,13 @@ onMounted(async () => {
                 >
                   <q-item v-ripple style="padding: 0">
                     <q-item-section avatar>
-                      <q-avatar size="32px" color="grey-4">
+                      <q-avatar size="30px" color="grey-4">
-                        <q-img :src="props.row.avatar" class="photo-profile" />
+                        <q-img
+                          :src="props.row.avatar"
+                          class="photo-profile"
+                          v-if="props.row.avatar"
+                        />
+                        <q-img :src="avatar" class="photo-profile" v-else"/>
                       </q-avatar>
                     </q-item-section>