รายการออกคำสั่งย้ายสับเปลี่ยนตำแหน่ง (รอ API)

src/api/02_organizational/api.organization.ts

@@ -92,4 +92,6 @@ export default {
 
   //
   orgCheckAvatar: (id: string) => `${orgProfile}/avatar/profileId/${id}`,
+
+  changePosition: `${organization}/placement/change-position`,
 };

src/api/05_placement/api.placement.ts

@@ -175,4 +175,7 @@ export default {
   appointEmployeeOrder: (typeId: string) =>
     `${placement}/appointment/temp/report/${typeId}`,
   apppointmentPositionUse: () => `${placement}/appointment/temp/use`,
+
+
+
 };

src/modules/05_placement/components/ChangePosition/DialogRound.vue

@@ -26,20 +26,19 @@ function close() {
 }
 
 function onSubmit() {
-//   dialogConfirm($q, () => {
+  dialogConfirm($q, () => {
-//     const url = editCheck.value
+    const url = editCheck.value
-//       ? config.API.
+      ? config.API.changePosition+`/${idRound.value}`
-//       : config.API.;
+      : config.API.changePosition;
 
-//     http[editCheck.value ? "put" : "post"](url, {
+    http[editCheck.value ? "put" : "post"](url, {
-//       id: editCheck.value ? idRound : undefined,
+      name: round.value,
-//       round: round.value,
+    }).then((res) => {
-//     }).then((res) => {
+      close();
-//       close();
+      success($q, "บันทึกข้อมูลสำเร็จ");
-//       success($q, "บันทึกข้อมูลสำเร็จ");
+      props.getData?.();
-//       props.getData?.();
+    });
-//     });
+  });
-//   });
 }
 </script>
 
@@ -54,13 +53,14 @@ function onSubmit() {
           :close="close"
         />
         <q-separator />
-        <q-card-section>
+        <q-card-section class="q-pa-sm">
           <div class="row">
             <div class="col-12">
               <q-input
-                :model-value="round"
+                v-model="round"
                 outlined
                 dense
+                hide-bottom-space
                 class="inputgreen"
                 label="ชื่อรอบการย้ายสับเปลี่ยนตำแหน่ง"
                 :rules="[(val:string) => !!val || `${'กรุณากรอกชื่อรอบการย้ายสับเปลี่ยนตำแหน่ง'}`,]"

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

@@ -111,37 +111,19 @@ const sendToCommand = () => {
 
 //ดึงข้อมูล API
 const fecthLists = async () => {
-  // showLoader();
+  showLoader();
-  // rows.value = [];
+  rows.value = [];
-  // await http
+  await http
-  //   .get(config.API.appointmentMain())
+    .get(config.API.changePosition)
-  //   .then((res) => {
+    .then((res) => {
-  //     let response = res.data.result;
+      rows.value = res.data.result;
-  //     listRecevice.value = response;
+    })
-  //     rows.value = response;
+    .catch((e) => {
-  //     rows2.value = rows.value.filter(
+      messageError($q, e);
-  //       (e: any) => e.status !== "REPORT" && e.status !== "DONE"
+    })
-  //     );
+    .finally(() => {
-  //   })
+      hideLoader();
-  //   .catch((e) => {
+    });
-  //     messageError($q, e);
-  //   })
-  //   .finally(() => {
-  //     hideLoader();
-  //   });
-
-  rows.value = [
-    {
-      id: "08dc86c2-98a5-45f0-8e37-3502a4eb78c0",
-      name: "ย้ายสับเปลี่ยนตำแหน่งทุกเขต",
-      status: "WAITTING",
-      createdAt: "2024-06-07T14:22:31.985829",
-    },
-  ];
-
-  rows2.value = rows.value.filter(
-    (e: any) => e.status !== "REPORT" && e.status !== "DONE"
-  );
 };
 
 // dialog สำหรับแก้ไข
@@ -160,19 +142,19 @@ function addRound() {
 //ลบข้อมูล
 const clickDelete = (id: string) => {
   dialogRemove($q, () => {
-    //   showLoader();
+      showLoader();
-    //   http
+      http
-    //     .delete(config.API.appointmentDelete(id))
+        .delete(config.API.changePosition+`/${id}`)
-    //     .then(() => {
+        .then(() => {
-    //       success($q, "ลบข้อมูลสำเร็จ");
+          success($q, "ลบข้อมูลสำเร็จ");
-    //     })
+        })
-    //     .catch((e) => {
+        .catch((e) => {
-    //       messageError($q, e);
+          messageError($q, e);
-    //     })
+        })
-    //     .finally(() => {
+        .finally(() => {
-    //       fecthLists();
+          fecthLists();
-    //       hideLoader();
+          hideLoader();
-    //     });
+        });
   });
 };
 
@@ -183,23 +165,6 @@ const personalListPage = (id: string) => {
   });
 };
 
-function onSave(data: any) {
-  // showLoader();
-  // http
-  //   .put(config.API.appointmentPosition(personalId.value), dataAppoint)
-  //   .then((res) => {
-  //     modalTree.value = false;
-  //     success($q, "บันทึกสำเร็จ");
-  //   })
-  //   .catch((e) => {
-  //     messageError($q, e);
-  //   })
-  //   .finally(async () => {
-  //     fecthLists();
-  //     hideLoader();
-  //   });
-}
-
 onMounted(() => {
   fecthLists();
 });

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

@@ -2,7 +2,7 @@
 import { ref, onMounted } from "vue";
 import type { QTableProps } from "quasar";
 import { useQuasar } from "quasar";
-import { useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useTransferDataStore } from "@/modules/05_placement/store";
 
@@ -13,6 +13,12 @@ import config from "@/app.config";
 import DialogOrgSelect from "@/components/Dialogs/DialogOrgSelect.vue";
 import DialogEvalute from '@/modules/05_placement/components/ChangePosition/DialogChange.vue'
 
+const router = useRouter();
+const route = useRoute();
+const id = ref<string>(
+  route.params.id ? route.params.id.toString() : ""
+);
+
 const modalDialog = ref<boolean>(false)
 const posType = ref<string>("");
 const posLevel = ref<string>("");
@@ -34,7 +40,7 @@ const {
   dialogRemove,
 } = mixin;
 
-const router = useRouter();
+
 const rows = ref<any>([]);
 const modalTree = ref<boolean>(false);
 const personalId = ref<string>("");
@@ -144,20 +150,20 @@ const addPerson = () => {
 
 //ดึงข้อมูล API
 const fecthLists = async () => {
-  // showLoader();
+  showLoader();
-  // rows.value = [];
+  rows.value = [];
-  // await http
+  await http
-  //   .get(config.API.appointmentMain())
+    .get(config.API.changePosition+`/${id.value}`)
-  //   .then((res) => {
+    .then((res) => {
-  //     let response = res.data.result;
+      let response = res.data.result;
-  //     rows.value = response;
+      rows.value = response;
-  //   })
+    })
-  //   .catch((e) => {
+    .catch((e) => {
-  //     messageError($q, e);
+      messageError($q, e);
-  //   })
+    })
-  //   .finally(() => {
+    .finally(() => {
-  //     hideLoader();
+      hideLoader();
-  //   });
+    });
 
   rows.value = [
     {
@@ -598,8 +604,7 @@ onMounted(() => {
     :onSubmit="onSave"
   />
 
-  <DialogEvalute 
+  <DialogEvalute v-model:modal="modalDialog" />
-  v-model:modal="modalDialog"/>
 </template>
 
 <style scoped lang="scss"></style>