From c5286182d96929a21ad3b6ed0c90a3ea5f848b4c Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Sat, 19 Aug 2023 20:14:41 +0700
Subject: [PATCH] =?UTF-8?q?fix=20bug=20&=20=E0=B9=80=E0=B8=9E=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A1=E0=B8=9C=E0=B8=A5=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=97=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=87=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/probation/MainDetail.vue       |  14 +-
 .../08_registryEmployee/views/Main.vue        | 317 ++++--------------
 2 files changed, 84 insertions(+), 247 deletions(-)

diff --git a/src/modules/05_placement/components/probation/MainDetail.vue b/src/modules/05_placement/components/probation/MainDetail.vue
index b5059231d..687270aa0 100644
--- a/src/modules/05_placement/components/probation/MainDetail.vue
+++ b/src/modules/05_placement/components/probation/MainDetail.vue
@@ -76,7 +76,7 @@ const activeTab = ref<string>("tab1");
               </q-item-section> -->
 
               <q-item-section>
-                แบบประเมินผล<br/>(ผู้บังคับบัญชา)
+                แบบประเมินผล<br />(ผู้บังคับบัญชา)
               </q-item-section>
             </q-item>
 
@@ -87,7 +87,7 @@ const activeTab = ref<string>("tab1");
               </q-item-section> -->
 
               <q-item-section>
-                แบบประเมินผล<br/>(คณะกรรมการ)
+                แบบประเมินผล<br />(คณะกรรมการ)
               </q-item-section>
             </q-item>
 
@@ -98,9 +98,15 @@ const activeTab = ref<string>("tab1");
               </q-item-section> -->
 
               <q-item-section>
-                แบบรายงาน<br/>การประเมินฯ
+                แบบรายงาน<br />การประเมินฯ
               </q-item-section>
             </q-item>
+            <q-item>
+              <q-item-section>
+                ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ
+              </q-item-section>
+            </q-item>
+
           </q-list>
         </q-scroll-area>
       </q-drawer>
@@ -112,7 +118,7 @@ const activeTab = ref<string>("tab1");
             </q-tab-panel>
 
             <q-tab-panel name="tab2">
-              <TabsTemplate1 :activeTab="activeTab"/>
+              <TabsTemplate1 :activeTab="activeTab" />
             </q-tab-panel>
 
             <q-tab-panel name="tab3">
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index acb3d0e6c..044186379 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -7,62 +7,26 @@
       <q-btn flat round color="primary" @click="clickAdd" icon="mdi-plus">
         <q-tooltip>เพิ่มข้อมูล</q-tooltip>
       </q-btn>
-      <q-btn
-        flat
-        round
-        color="primary"
-        icon="mdi-account-arrow-right"
-        @click="clickAddOrder"
-      />
+      <q-btn flat round color="primary" icon="mdi-account-arrow-right" @click="clickAddOrder" />
       <q-space />
       <div class="items-center" style="display: flex">
         <!-- ค้นหาข้อความใน table -->
-        <q-input
-          standout
-          dense
-          v-model="filter"
-          ref="filterRef"
-          outlined
-          debounce="300"
-          placeholder="ค้นหา"
-          style="max-width: 200px"
-          class="q-ml-sm"
-        >
+        <q-input standout dense v-model="filter" ref="filterRef" outlined debounce="300" placeholder="ค้นหา"
+          style="max-width: 200px" class="q-ml-sm">
           <template v-slot:append>
             <q-icon v-if="filter == ''" name="search" />
-            <q-icon
-              v-if="filter !== ''"
-              name="clear"
-              class="cursor-pointer"
-              @click="resetFilter"
-            />
+            <q-icon v-if="filter !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
           </template>
         </q-input>
         <!-- แสดงคอลัมน์ใน table -->
-        <q-select
-          v-model="visibleColumnsEmployeeTemp"
-          :display-value="$q.lang.table.columns"
-          multiple
-          outlined
-          dense
-          :options="columns"
-          options-dense
-          option-value="name"
-          map-options
-          emit-value
-          style="min-width: 150px"
-          class="gt-xs q-ml-sm"
-        />
+        <q-select v-model="visibleColumnsEmployeeTemp" :display-value="$q.lang.table.columns" multiple outlined dense
+          :options="columns" options-dense option-value="name" map-options emit-value style="min-width: 150px"
+          class="gt-xs q-ml-sm" />
       </div>
     </div>
     <div class="col-12 q-pt-sm">
-      <d-table
-        :rows="rows"
-        :columns="columns"
-        :visible-columns="visibleColumnsEmployeeTemp"
-        :filter="filter"
-        row-key="id"
-      >
+      <d-table :rows="rows" :columns="columns" :visible-columns="visibleColumnsEmployeeTemp" :filter="filter"
+        row-key="id">
         <template v-slot:header="props">
           <q-tr :props="props">
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
@@ -76,25 +40,13 @@
             <q-td key="no" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.rowIndex + 1 }}
             </q-td>
-            <q-td
-              key="fullname"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
+            <q-td key="fullname" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.fullname }}
             </q-td>
-            <q-td
-              key="newAgency"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
-              <div
-                class="col-12"
-                v-if="
-                  props.row.draftOrganizationOrganization == null &&
-                  props.row.draftPositionEmployee == null
-                "
-              >
+            <q-td key="newAgency" :props="props" @click="redirectToPage(props.row.id)">
+              <div class="col-12" v-if="props.row.draftOrganizationOrganization == null &&
+                props.row.draftPositionEmployee == null
+                ">
                 <div class="text-weight-medium">
                   {{ "-" }}
                 </div>
@@ -108,15 +60,8 @@
                 </div>
               </div>
             </q-td>
-            <q-td
-              key="currentAgency"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
-              <div
-                class="col-12"
-                v-if="props.row.oc == null && props.row.position == null"
-              >
+            <q-td key="currentAgency" :props="props" @click="redirectToPage(props.row.id)">
+              <div class="col-12" v-if="props.row.oc == null && props.row.position == null">
                 <div class="text-weight-medium">
                   {{ "-" }}
                 </div>
@@ -161,124 +106,53 @@
             <q-td key="oc" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.oc }}
             </q-td> -->
-            <q-td
-              key="amount"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
+            <q-td key="amount" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.amount }}
             </q-td>
-            <q-td
-              key="govAge"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
+            <q-td key="govAge" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.govAge }}
             </q-td>
-            <q-td
-              key="dateAppoint"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
+            <q-td key="dateAppoint" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.dateAppoint }}
             </q-td>
-            <q-td
-              key="dateStart"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
+            <q-td key="dateStart" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.dateStart }}
             </q-td>
-            <q-td
-              key="salaryDate"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
+            <q-td key="salaryDate" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.salaryDate }}
             </q-td>
-            <q-td
-              key="refSalary"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
+            <q-td key="refSalary" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.refSalary }}
             </q-td>
-            <q-td
-              key="age"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
+            <q-td key="age" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.age }}
             </q-td>
-            <q-td
-              key="fullnameOld"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
+            <q-td key="fullnameOld" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.fullnameOld }}
             </q-td>
-            <q-td
-              key="createdAt"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
+            <q-td key="createdAt" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.createdAt }}
             </q-td>
-            <q-td
-              key="isLeave"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
+            <q-td key="isLeave" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.isLeave }}
             </q-td>
-            <q-td
-              key="leaveDateOrder"
-              :props="props"
-              @click="redirectToPage(props.row.id)"
-            >
+            <q-td key="leaveDateOrder" :props="props" @click="redirectToPage(props.row.id)">
               {{ props.row.leaveDateOrder }}
             </q-td>
 
             <q-td auto-width>
-              <q-btn
-                icon="mdi-dots-vertical"
-                size="12px"
-                color="grey-7"
-                flat
-                round
-                dense
-              >
+              <q-btn icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
                 <q-menu transition-show="jump-down" transition-hide="jump-up">
                   <q-list dense style="min-width: 160px">
-                    <q-item
-                      clickable
-                      v-close-popup
-                      @click="editDetail(props.row)"
-                    >
-                      <q-item-section
-                        style="min-width: 0px"
-                        avatar
-                        class="q-py-sm"
-                      >
-                        <q-icon
-                          color="blue"
-                          size="xs"
-                          name="mdi-account-settings"
-                        />
+                    <q-item clickable v-close-popup @click="editDetail(props.row)">
+                      <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                        <q-icon color="blue" size="xs" name="mdi-account-settings" />
                       </q-item-section>
                       <q-item-section>กำหนดตำแหน่ง</q-item-section>
                     </q-item>
                     <q-separator />
-                    <q-item
-                      clickable
-                      v-close-popup
-                      @click="clickDelete(props.row.id)"
-                    >
-                      <q-item-section
-                        style="min-width: 0px"
-                        avatar
-                        class="q-py-sm"
-                      >
+                    <q-item clickable v-close-popup @click="clickDelete(props.row.id)">
+                      <q-item-section style="min-width: 0px" avatar class="q-py-sm">
                         <q-icon color="red" size="xs" name="mdi-delete" />
                       </q-item-section>
                       <q-item-section>ลบ</q-item-section>
@@ -299,34 +173,16 @@
       <DialogHeader tittle="กำหนดตำแหน่ง" :close="modalOpenClose" />
       <q-separator />
       <q-card-section class="q-pa-sm">
-        <d-table
-          :rows="rowsPosition"
-          :columns="columnsPosition"
-          row-key="id"
-          selection="single"
-          v-model:selected="selectedPosition"
-          :visible-columns="visibleColumnsPosition"
-        >
+        <d-table :rows="rowsPosition" :columns="columnsPosition" row-key="id" selection="single"
+          v-model:selected="selectedPosition" :visible-columns="visibleColumnsPosition">
           <template v-slot:body-selection="scope">
-            <q-checkbox
-              keep-color
-              color="primary"
-              dense
-              v-model="scope.selected"
-            />
+            <q-checkbox keep-color color="primary" dense v-model="scope.selected" />
           </template>
         </d-table>
       </q-card-section>
       <q-separator />
       <q-card-actions align="right">
-        <q-btn
-          dense
-          unelevated
-          label="บันทึก"
-          color="public"
-          @click="checkSave"
-          class="q-px-md"
-          ><!-- icon="mdi-content-save-outline"
+        <q-btn dense unelevated label="บันทึก" color="public" @click="checkSave" class="q-px-md"><!-- icon="mdi-content-save-outline"
         <q-tooltip>บันทึก</q-tooltip> -->
         </q-btn>
       </q-card-actions>
@@ -336,24 +192,14 @@
   <!-- dialog ส่งรายชื่อไปออกคำสั่ง -->
   <q-dialog v-model="modaladdOrder">
     <q-card style="width: 900px; max-width: 80vw">
-      <DialogHeader
-        tittle="ส่งรายชื่อไปออกคำสั่ง"
-        :close="clickCloseSendModal"
-      />
+      <DialogHeader tittle="ส่งรายชื่อไปออกคำสั่ง" :close="clickCloseSendModal" />
       <q-separator />
       <q-card-section class="q-pt-none">
         <div class="row justify-end">
           <div class="col-5">
             <q-toolbar style="padding: 0">
-              <q-input
-                borderless
-                outlined
-                dense
-                debounce="300"
-                v-model="filter"
-                placeholder="ค้นหา"
-                style="width: 850px; max-width: auto"
-              >
+              <q-input borderless outlined dense debounce="300" v-model="filter" placeholder="ค้นหา"
+                style="width: 850px; max-width: auto">
                 <template v-slot:append>
                   <q-icon name="search" />
                 </template>
@@ -362,32 +208,15 @@
           </div>
         </div>
 
-        <d-table
-          :rows="rowsOrder"
-          :columns="columnsOrder"
-          :visible-columns="visibleColumnsOrder"
-          :filter="filter"
-          row-key="id"
-          selection="single"
-          v-model:selected="selectedToOrder"
-        >
+        <d-table :rows="rowsOrder" :columns="columnsOrder" :visible-columns="visibleColumnsOrder" :filter="filter"
+          row-key="id" selection="single" v-model:selected="selectedToOrder">
           <template v-slot:body-selection="scope">
-            <q-checkbox
-              keep-color
-              color="primary"
-              dense
-              v-model="scope.selected"
-            />
+            <q-checkbox keep-color color="primary" dense v-model="scope.selected" />
           </template>
           <template v-slot:body="props">
             <q-tr :props="props" class="cursor-pointer">
               <q-td>
-                <q-checkbox
-                  keep-color
-                  color="primary"
-                  dense
-                  v-model="props.selected"
-                />
+                <q-checkbox keep-color color="primary" dense v-model="props.selected" />
               </q-td>
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
@@ -1168,8 +997,8 @@ const checkNull = (text: string) =>
   text == null
     ? ""
     : text == "00000000-0000-0000-0000-000000000000"
-    ? ""
-    : text;
+      ? ""
+      : text;
 
 const getPosition = async (id: string) => {
   showLoader();
@@ -1251,7 +1080,7 @@ const getPosition = async (id: string) => {
 const clickAddOrder = () => {
   modaladdOrder.value = true;
   const filteredRows = rowsOrder.value.filter(
-    (row) => row.positionEmployeePosition !== null
+    (row) => row.draftPositionEmployee !== null
   );
   rowsOrder.value = filteredRows;
 };
@@ -1259,8 +1088,8 @@ const clickAddOrder = () => {
 const clickCloseSendModal = () => {
   modaladdOrder.value = false;
 };
-const checkSave = () =>{
-  dialogConfirm($q,async() => await saveData())
+const checkSave = () => {
+  dialogConfirm($q, async () => await saveData())
 }
 const saveData = async () => {
   if (selectedPosition.value.length == 0) {
@@ -1280,8 +1109,8 @@ const saveData = async () => {
     await savePosition();
   }
 };
-const checkSaveOrder = () =>{
-  dialogConfirm($q,async() => await SaveOrder())
+const checkSaveOrder = () => {
+  dialogConfirm($q, async () => await SaveOrder())
 }
 const SaveOrder = async () => {
   if (selectedToOrder.value.length == 0) {
@@ -1298,7 +1127,8 @@ const SaveOrder = async () => {
     );
     return;
   } else {
-    await saveOrder();
+    // ส่งไปออกคำสั่ง
+    await sendToOrder();
   }
 };
 
@@ -1321,7 +1151,8 @@ const savePosition = async () => {
     });
 };
 
-const saveOrder = async () => {
+const sendToOrder = async () => {
+  modaladdOrder.value = false;
   //   showLoader();
   //   const data = {
   //     organizationEmployeeId: selectedPosition.value[0].id,
@@ -1349,9 +1180,9 @@ const modalOpenClose = () => {
   }
 };
 
-const next = (id: string) => {
-  router.push(`/registry-employee/${id}`);
-};
+// const next = (id: string) => {
+//   router.push(`/registry-employee/${id}`);
+// };
 
 const resetFilter = () => {
   // reset ค่าที่ค้นหาเมื่อกดปุ่ม X ในกล่องค้นหา
@@ -1404,24 +1235,24 @@ const editDetail = async (row: any) => {
 };
 
 
-const clickDelete = (id: string) =>{
-  dialogRemove($q,async () => await deleteData(id))
+const clickDelete = (id: string) => {
+  dialogRemove($q, async () => await deleteData(id))
 }
 
-const deleteData = async(id: string) => {
-      showLoader();
-      await http
-        .delete(config.API.profileInforId(id))
-        .then((res) => {
-          success($q, "ลบข้อมูลการสอบสำเร็จ");
-          showEmployeeTemp();
-        })
-        .catch((e) => {
-          messageError($q, e);
-        })
-        .finally(() => {
-          hideLoader();
-        })
+const deleteData = async (id: string) => {
+  showLoader();
+  await http
+    .delete(config.API.profileInforId(id))
+    .then((res) => {
+      success($q, "ลบข้อมูลการสอบสำเร็จ");
+      showEmployeeTemp();
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    })
 };
 
 const nodeTree = async () => {