Merge branch 'develop' into devTee

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

@@ -114,16 +114,16 @@ function filterByPersonIdNull(obj: any) {
 }
 
 /**get data ตำแหน่งงาน */
-async function fetchplacementPosition() {
-  await http
-    .get(config.API.placementPosition())
-    .then((res: any) => {
-      placementPosition.value = res.data.result;
-    })
-    .catch((e: any) => {
-      messageError($q, e);
-    });
-}
+// async function fetchplacementPosition() {
+//   await http
+//     .get(config.API.placementPosition())
+//     .then((res: any) => {
+//       placementPosition.value = res.data.result;
+//     })
+//     .catch((e: any) => {
+//       messageError($q, e);
+//     });
+// }
 
 /** รับค่ามาจาก หน้าหลัก*/
 const props = defineProps({
@@ -204,7 +204,7 @@ async function saveAppoint() {
             await closeAndClear();
             // await fetchPublishFile();
             // await loadTreeData();
-            await fetchplacementPosition();
+            // await fetchplacementPosition();
             hideLoader();
           });
       });
@@ -393,7 +393,7 @@ async function postClearPosition() {
 watch(props, () => {
   expanded.value = [];
   const dataPersonal = props.personal;
-  fetchplacementPosition();
+  // fetchplacementPosition();
   if (dataPersonal) {
     dataPersonal.map((data: any) => {
       personal.value = data;
@@ -421,7 +421,7 @@ watch(props, () => {
 onMounted(async () => {
   // await fetchPublishFile();
   // await loadTreeData();
-  await fetchplacementPosition();
+  // await fetchplacementPosition();
 });
 </script>
 

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

@@ -287,12 +287,13 @@ async function getTable() {
     .get(config.API.personalList(examIdString))
     .then(async (res: any) => {
       dataRes.value = res.data.result;
+
       rowsAll.value = [];
       (rowsFilter.value = []),
         res.data.result.map((data: any) => {
           const rowData = {
             personalId: data.personalId,
-            avatar: data.avatar,
+            avatar: avatar,
             name: data.fullName,
             fullName: data.fullName + " " + data.idCard,
             idCard: data.idCard,
@@ -372,7 +373,7 @@ async function getTable() {
           e.reportingDate !== null
       );
 
-      insertAvatar(rows.value);
+      // insertAvatar(rows.value);
     })
     .catch((e) => {
       messageError($q, e);
@@ -382,31 +383,31 @@ async function getTable() {
     });
 }
 
-function insertAvatar(items: any) {
-  items.map((x: any, index: number) => {
-    http
-      .get(
-        config.API.fileByFile(
-          "ทะเบียนประวัติ",
-          "โปรไฟล์",
-          x.personalId,
-          "profile-" + x.personalId
-        )
-      )
-      .then((img) => {
-        rows.value[index] = {
-          ...x,
-          avatar: img.data.downloadUrl,
-        };
-      })
-      .catch(() => {
-        rows.value[index] = {
-          ...x,
-          avatar: avatar,
-        };
-      });
-  });
-}
+// function insertAvatar(items: any) {
+//   items.map((x: any, index: number) => {
+//     http
+//       .get(
+//         config.API.fileByFile(
+//           "ทะเบียนประวัติ",
+//           "โปรไฟล์",
+//           x.personalId,
+//           "profile-" + x.personalId
+//         )
+//       )
+//       .then((img) => {
+//         rows.value[index] = {
+//           ...x,
+//           avatar: img.data.downloadUrl,
+//         };
+//       })
+//       .catch(() => {
+//         rows.value[index] = {
+//           ...x,
+//           avatar: avatar,
+//         };
+//       });
+//   });
+// }
 
 /**ยืนยันการผ่อนผัน */
 async function saveDeferment() {