From fd1f5ce8e4826bb404650aea9caa19e5bf111820 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 21 Aug 2023 11:55:57 +0700
Subject: [PATCH 1/4] no message

---
 src/api/07_insignia/api.insignia.ts           |  7 ++
 .../components/1_Proposals/listProposals.vue  | 43 +++++++++-
 .../07_insignia/components/2_Manage/Tab1.vue  | 37 +++++++++
 .../components/2_Manage/listManage.vue        | 78 ++++++++++++-------
 src/modules/07_insignia/store.ts              |  6 +-
 5 files changed, 140 insertions(+), 31 deletions(-)

diff --git a/src/api/07_insignia/api.insignia.ts b/src/api/07_insignia/api.insignia.ts
index f05e19bca..41ccd6778 100644
--- a/src/api/07_insignia/api.insignia.ts
+++ b/src/api/07_insignia/api.insignia.ts
@@ -3,12 +3,19 @@
  */
 import env from "../index";
 const insignia = `${env.API_URI}/insignia`;
+const Organization = `${env.API_URI}/Organization`
 export default {
   getRoundInsignia: (id: string) => `${insignia}/period/${id}`,
   listRoundInsignia: (type: string) => `${insignia}/period/${type}`,
   editRoundInsignia: (id: string) => `${insignia}/period/${id}`,
   RoundInsignia: (id: string) => `${insignia}/period/${id}`,
+  requestInsignia: (insigniaPeriodId: string) => `${insignia}/request/${insigniaPeriodId}`,
+  // Type
+  typeOc: () => `${Organization}/history/type/หน่วยงาน`,
+
+
   // manage
   insigniaManage: (type: string) => `${insignia}/manage/${type}`,
+  insigniaList: (insigniaPeriodId: any, ocId: string, role: string, status: any) => `${insignia}/request/${insigniaPeriodId}/${ocId}/${role}/${status}`
 
 };
diff --git a/src/modules/07_insignia/components/1_Proposals/listProposals.vue b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
index c558d3d48..74139883e 100644
--- a/src/modules/07_insignia/components/1_Proposals/listProposals.vue
+++ b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
@@ -20,6 +20,7 @@ const {
   dateToISO,
   showLoader,
   hideLoader,
+  dialogConfirm,
 } = mixin;
 const route = useRoute();
 const $q = useQuasar(); //ใช้ noti quasar
@@ -232,6 +233,32 @@ const clickProposals = (file: string) => {
     window.open(file);
   }
 };
+const clickListInsignia = async (propsId: string) => {
+  dialogConfirm(
+    $q,
+    async () => {
+      await getRequest(propsId);
+    },
+    "ยืนยันการคำนวณราชชื่อผู้ได้รับเครื่องราช",
+    "ต้องการยืนยันการคำนวณราชชื่อผู้ได้รับเครื่องราชนี้หรือไม่ ?"
+  );
+};
+const getRequest = async (id: string) => {
+  showLoader();
+  await http
+    .get(config.API.requestInsignia(id))
+    .then((res) => {
+      console.log(res);
+      success($q, "ยืนยันสำเร็จ");
+    })
+    .catch((err) => {
+      console.log(err);
+      messageError($q, err);
+    })
+    .finally(async () => {
+      await fetchData();
+    });
+};
 
 // ค้นหาในตาราง
 const filterKeyword = ref<string>("");
@@ -338,6 +365,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
               </q-th>
               <q-th auto-width />
               <q-th auto-width />
+              <q-th auto-width />
             </q-tr>
           </template>
           <template v-slot:body="props">
@@ -390,6 +418,19 @@ const paginationLabel = (start: string, end: string, total: string) => {
                   @click="clickEdit(props.row)"
                 />
               </q-td>
+              <q-td auto-width>
+                <q-btn
+                  dense
+                  size="12px"
+                  flat
+                  round
+                  color="primary"
+                  @click="clickListInsignia(props.row.id)"
+                  icon="mdi-account-star"
+                >
+                  <q-tooltip>ผู้ได้รับเครื่องราชฯ</q-tooltip>
+                </q-btn>
+              </q-td>
               <q-td auto-width>
                 <q-btn
                   dense
@@ -436,8 +477,6 @@ const paginationLabel = (start: string, end: string, total: string) => {
   </q-card>
 </template>
 
-
-
 <style lang="scss" scope>
 .filter-card {
   background-color: #f1f1f1b0;
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 10d8a7f18..39f7588c5 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -3,10 +3,14 @@ import { onMounted, ref, watch } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 import type { QTableProps } from "quasar";
+import { useInsigniaDataStore } from "@/modules/07_insignia/store";
+import http from "@/plugins/http";
+import config from "@/app.config";
 
 const mixin = useCounterMixin();
 const { dialogRemove, dialogConfirm } = mixin;
 const $q = useQuasar();
+const DataStore = useInsigniaDataStore();
 
 const modalNote = ref<boolean>(false);
 const organization = ref<number>(1);
@@ -187,6 +191,39 @@ const titleModal = ref<string>("");
 const actionModal = ref<string>("");
 const person = ref<any>([]);
 
+const props = defineProps({
+  tab: {
+    type: String,
+  },
+  roundId: {
+    type: String,
+  },
+});
+onMounted(async () => {
+  console.log(props);
+
+  organizationOptions.value = DataStore.optionsTypeOc;
+  console.log(organizationOptions.value);
+  await fecthInsignia();
+});
+
+const fecthInsignia = async () => {
+  for (const item of DataStore.optionsTypeOc) {
+    console.log(item.index);
+
+    // await http
+    //   .get(
+    //     config.API.insigniaList(props.roundId, item["id"], "officer", props.tab)
+    //   )
+    //   .then((res) => {
+    //     console.log(res);
+    //   })
+    //   .catch((err) => {
+    //     console.log(err);
+    //   });
+  }
+};
+
 const clickAction = (props: any, action: string) => {
   Note.value = "";
   person.value = props;
diff --git a/src/modules/07_insignia/components/2_Manage/listManage.vue b/src/modules/07_insignia/components/2_Manage/listManage.vue
index 285698187..d0cb2e24c 100644
--- a/src/modules/07_insignia/components/2_Manage/listManage.vue
+++ b/src/modules/07_insignia/components/2_Manage/listManage.vue
@@ -1,18 +1,12 @@
 <script setup lang="ts">
 import { onMounted, ref, watch } from "vue";
-import type { QTableProps } from "quasar";
-import type {
-  FormMainProbation,
-  FormMainProbation2,
-} from "@/modules/05_placement/interface/request/Main";
-import type { DataOption1 } from "@/modules/05_placement/interface/index/Main";
 import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import DialogHeader from "@/modules/07_insignia/components/DialogHeader.vue";
+
 import { useCounterMixin } from "@/stores/mixin";
-import type { resMain } from "@/modules/06_retirement/interface/response/Main";
+import { useInsigniaDataStore } from "@/modules/07_insignia/store";
 
 import cardTop from "@/modules/07_insignia/components/2_Manage/StatCard.vue";
 import tab1 from "@/modules/07_insignia/components/2_Manage/Tab1.vue";
@@ -20,20 +14,20 @@ import tab2 from "@/modules/07_insignia/components/2_Manage/Tab2.vue";
 import tab3 from "@/modules/07_insignia/components/2_Manage/Tab3.vue";
 import tab4 from "@/modules/07_insignia/components/2_Manage/Tab4.vue";
 
-const Note = ref<string>("");
-const addNote = ref<boolean>(false);
-const saveWriteNote = ref<any[]>([]);
+const DataStore = useInsigniaDataStore();
 const mixin = useCounterMixin();
 const { messageError, date2Thai, showLoader, hideLoader, dialogMessage } =
   mixin;
 const router = useRouter();
 const $q = useQuasar(); //ใช้ noti quasar
 
+const loading = ref<boolean>(false);
 const round = ref<string>("");
+const optionRound = ref<any>([]);
+// const typeOc = ref<string>("kljkljk");
+const optiontypeOc = ref<any>([]);
 
-const optionRound = ref<DataOption1[]>([]);
-
-const tab = ref<any>("haveInsignia");
+const tab = ref<any>("pending");
 const stat = ref<any>({
   total: 0,
   sendName: 0,
@@ -42,20 +36,48 @@ const stat = ref<any>({
   disclaim: 0,
 });
 onMounted(async () => {
+  console.log(DataStore.optionsTypeOc);
+
   await fecthlistRound();
+  await fecthType();
 });
 const fecthlistRound = async () => {
   await http
     .get(config.API.listRoundInsignia("insignia"))
     .then((res: any) => {
-      optionRound.value = res.data.result.map((e) => ({
+      optionRound.value = res.data.result.map((e: any) => ({
         id: e.period_id,
         year: e.period_year,
         name: `รอบการเสนอพระราชทานเครื่องราช ${e.period_name}  ปี ${e.period_year} `,
       }));
+      console.log(optionRound.value);
+      // const lastIndex = optionRound.value.length;
+      const lastValue = optionRound.value[0];
+      round.value = lastValue.id.toString();
     })
     .catch((err) => {
       console.log(err);
+      // messageError($q, err);
+    });
+};
+const fecthType = async () => {
+  await http
+    .get(config.API.typeOc())
+    .then((res) => {
+      console.log(res);
+      optiontypeOc.value = res.data.result.map((e: any) => ({
+        id: e.organizationId,
+        name: e.organizationName,
+      }));
+      console.log(typeof optiontypeOc.value);
+      DataStore.optionsTypeOc = optiontypeOc.value;
+    })
+    .catch((err) => {
+      console.log(err);
+      // messageError($q, err);
+    })
+    .finally(() => {
+      loading.value = true;
     });
 };
 </script>
@@ -105,7 +127,7 @@ const fecthlistRound = async () => {
     </div>
   </q-card>
 
-  <q-card flat bordered class="col-12 q-mt-sm">
+  <q-card flat bordered class="col-12 q-mt-sm" v-if="loading">
     <div class="row col-12">
       <q-tabs
         v-model="tab"
@@ -116,25 +138,25 @@ const fecthlistRound = async () => {
         indicator-color="primary"
         align="left"
       >
-        <q-tab name="haveInsignia" label="ผู้ที่ได้รับพระราชทานเครื่องราชฯ" />
-        <q-tab name="personNotapply" label="คนที่ไม่ยื่นขอ" />
-        <q-tab name="personRemoved" label="คนที่ถูกลบออก" />
-        <q-tab name="nonInsignia" label="หน่วยงานที่ยังไม่ได้ส่งรายชื่อ" />
+        <q-tab name="pending" label="ผู้ที่ได้รับพระราชทานเครื่องราชฯ" />
+        <q-tab name="reject" label="คนที่ไม่ยื่นขอ" />
+        <q-tab name="delete" label="คนที่ถูกลบออก" />
+        <q-tab name="organization" label="หน่วยงานที่ยังไม่ได้ส่งรายชื่อ" />
       </q-tabs>
     </div>
     <q-separator />
     <q-tab-panels v-model="tab" animated>
-      <q-tab-panel name="haveInsignia">
-        <tab1 />
+      <q-tab-panel name="pending">
+        <tab1 :tab="tab" :roundId="round" />
       </q-tab-panel>
-      <q-tab-panel name="personNotapply">
-        <tab2 />
+      <q-tab-panel name="reject">
+        <tab2 :tab="tab" />
       </q-tab-panel>
-      <q-tab-panel name="personRemoved">
-        <tab3 />
+      <q-tab-panel name="delete">
+        <tab3 :tab="tab" />
       </q-tab-panel>
-      <q-tab-panel name="nonInsignia">
-        <tab4 />
+      <q-tab-panel name="organization">
+        <tab4 :tab="tab" />
       </q-tab-panel>
     </q-tab-panels>
   </q-card>
diff --git a/src/modules/07_insignia/store.ts b/src/modules/07_insignia/store.ts
index 2e0d140be..5f7bbf6ec 100644
--- a/src/modules/07_insignia/store.ts
+++ b/src/modules/07_insignia/store.ts
@@ -1,5 +1,9 @@
 import { defineStore } from "pinia";
+import { ref, } from "vue";
 
 export const useInsigniaDataStore = defineStore("insignia", () => {
-  return {};
+  let optionsTypeOc = ref<any>([]);
+  return {
+    optionsTypeOc
+  };
 });

From 095b9e45969d04e2ad5cc43a2377354b30c2839f Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Mon, 21 Aug 2023 12:20:28 +0700
Subject: [PATCH 2/4] Update CurrencyInput.vue

---
 .../06_retirement/components/CurrencyInput.vue    | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/modules/06_retirement/components/CurrencyInput.vue b/src/modules/06_retirement/components/CurrencyInput.vue
index 04a5f4cfa..795796c78 100644
--- a/src/modules/06_retirement/components/CurrencyInput.vue
+++ b/src/modules/06_retirement/components/CurrencyInput.vue
@@ -11,11 +11,13 @@
     lazy-rules
     :readonly="!edit"
     :borderless="!edit"
-    v-model="salary"
+    v-model="test"
     :label="`${'เงินเดือน'}`"
     hide-bottom-space
     type="text"
+    @update:modelValue="updateCoords(test)"
   />
+  {{ salary }}
 </template>
 <script>
 import { useCurrencyInput } from "vue-currency-input";
@@ -23,14 +25,23 @@ import { useCurrencyInput } from "vue-currency-input";
 export default {
   name: "CurrencyInput",
   props: {
+    salary: String,
     edit: Boolean,
     modelValue: Number,
     options: Object,
   },
+  emits: ["update:salary"],
   setup(props) {
     const { inputRef } = useCurrencyInput(props.options);
-
+    const test = "";
     return { inputRef };
   },
+  methods: {
+    updateCoords(title) {
+      console.log("asd");
+      this.$emit("update:salary", title); // previously was `this.$emit('input', title)`
+    },
+  },
+  //   watch(){}
 };
 </script>

From 98156c072b805c25687dff0dee66c2ee1c5bb38b Mon Sep 17 00:00:00 2001
From: Thanit Konmek <thanit@frappet.com>
Date: Mon, 21 Aug 2023 12:20:41 +0700
Subject: [PATCH 3/4] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=80=E0=B8=99=E0=B8=B9=20=E0=B8=9A=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B8=9C=E0=B8=A5=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=88=E0=B9=88=E0=B8=B2=E0=B8=A2=E0=B9=83?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=81=E0=B8=B3=E0=B8=81=E0=B8=B1=E0=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts            |   6 +
 .../04_registry/components/Profile.vue        | 549 +++++++++++++-----
 .../components/Receive/receiveDetail2.vue     |   2 +-
 3 files changed, 397 insertions(+), 160 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index b7d75e34f..d02ebb6fb 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -351,6 +351,12 @@ const menuList = readonly<any[]>([
             path: "insigniaRecord",
             role: "insignia",
           },
+          {
+            label: "บันทึกผลการจ่ายใบกำกับ",
+            path: "VatInsignia",
+            role: "insignia",
+          },
+
           {
             label: "จัดสรรเครื่องราชฯ",
             path: "insigniaAllocate",
diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue
index 2cde4cabd..760fb47bd 100644
--- a/src/modules/04_registry/components/Profile.vue
+++ b/src/modules/04_registry/components/Profile.vue
@@ -6,10 +6,17 @@
           v-model:statusEdit="statusEdit"
           :profileType="profileType"
         /> -->
-        <Information v-model:statusEdit="statusEdit" :fetchDataProfile="fetchData" />
+        <Information
+          v-model:statusEdit="statusEdit"
+          :fetchDataProfile="fetchData"
+        />
       </div>
       <div id="government" name="16" class="row col-12 q-mt-md">
-        <Government v-model:statusEdit="statusEdit" :profileType="profileType" :employeeClass="employeeClass" />
+        <Government
+          v-model:statusEdit="statusEdit"
+          :profileType="profileType"
+          :employeeClass="employeeClass"
+        />
       </div>
       <div id="address" name="17" class="row col-12 q-mt-md">
         <Address v-model:statusEdit="statusEdit" />
@@ -33,11 +40,20 @@
         <CoinedVue v-model:statusEdit="statusEdit" :profileType="profileType" />
       </div>
       <div id="assessment" name="6" class="row col-12 q-mt-md">
-        <AssessmentVue v-model:statusEdit="statusEdit" :profileType="profileType" />
+        <AssessmentVue
+          v-model:statusEdit="statusEdit"
+          :profileType="profileType"
+        />
       </div>
       <div id="position" name="7" class="row col-12 q-mt-md">
-        <SalaryVue v-model:statusEdit="statusEdit" v-if="profileType === 'officer'" />
-        <SalaryEmployeeTempVue v-model:statusEdit="statusEdit" v-else-if="employeeClass === 'temp'" />
+        <SalaryVue
+          v-model:statusEdit="statusEdit"
+          v-if="profileType === 'officer'"
+        />
+        <SalaryEmployeeTempVue
+          v-model:statusEdit="statusEdit"
+          v-else-if="employeeClass === 'temp'"
+        />
         <SalaryEmployeeVue v-model:statusEdit="statusEdit" v-else />
       </div>
       <div id="rule" name="8" class="row col-12 q-mt-md">
@@ -62,29 +78,70 @@
         <DocumentVue v-model:statusEdit="statusEdit" />
       </div>
     </div>
-    <q-page-sticky position="top" expand class="bg-grey-2 text-white" style="z-index: 99; padding: 0% 1% 0% 1%">
-      <div class="row col-12 q-gutter-sm q-pb-sm text-dark no-wrap items-center">
-        <q-btn flat round class="bg-teal-1 full-height" color="primary" icon="mdi-chevron-left" dense
-          @click="router.go(-1)">
+    <q-page-sticky
+      position="top"
+      expand
+      class="bg-grey-2 text-white"
+      style="z-index: 99; padding: 0% 1% 0% 1%"
+    >
+      <div
+        class="row col-12 q-gutter-sm q-pb-sm text-dark no-wrap items-center"
+      >
+        <q-btn
+          flat
+          round
+          class="bg-teal-1 full-height"
+          color="primary"
+          icon="mdi-chevron-left"
+          dense
+          @click="router.go(-1)"
+        >
         </q-btn>
-        <q-avatar v-if="imageUrl == null" size="65px" rounded class="containerimage">
-          <img src="@/assets/avatar_user.jpg" class="bg-grey-3" style="object-fit: cover" />
-          <div class="overlay absolute-bottom text-subtitle2 text-center cursor-pointer" @click="clickImage()">
+        <q-avatar
+          v-if="imageUrl == null"
+          size="65px"
+          rounded
+          class="containerimage"
+        >
+          <img
+            src="@/assets/avatar_user.jpg"
+            class="bg-grey-3"
+            style="object-fit: cover"
+          />
+          <div
+            class="overlay absolute-bottom text-subtitle2 text-center cursor-pointer"
+            @click="clickImage()"
+          >
             <q-icon name="mdi-camera" size="18px" color="blue">
               <q-tooltip>อัปเดตรูปภาพ</q-tooltip>
             </q-icon>
 
-            <input type="file" style="display: none" ref="inputImage" accept="image/*" @change="uploadImage" />
+            <input
+              type="file"
+              style="display: none"
+              ref="inputImage"
+              accept="image/*"
+              @change="uploadImage"
+            />
           </div>
         </q-avatar>
         <q-avatar v-else size="65px" rounded class="containerimage">
           <img :src="imageUrl" class="bg-grey-3" style="object-fit: cover" />
-          <div class="overlay absolute-bottom text-subtitle2 text-center cursor-pointer" @click="clickImage()">
+          <div
+            class="overlay absolute-bottom text-subtitle2 text-center cursor-pointer"
+            @click="clickImage()"
+          >
             <q-icon name="mdi-camera" size="18px" color="blue">
               <q-tooltip>อัปเดตรูปภาพ</q-tooltip>
             </q-icon>
 
-            <input type="file" style="display: none" ref="inputImage" accept="image/*" @change="uploadImage" />
+            <input
+              type="file"
+              style="display: none"
+              ref="inputImage"
+              accept="image/*"
+              @change="uploadImage"
+            />
           </div>
         </q-avatar>
         <div class="row items-center text-dark q-ml-md">
@@ -158,8 +215,15 @@
           </q-menu>
         </q-btn>
 
-        <q-btn round flat :color="reasonStatus ? 'primary' : 'pink-5'" @click="clickRetire()" :icon="reasonStatus ? 'mdi-home-import-outline' : 'mdi-home-export-outline'
-          ">
+        <q-btn
+          round
+          flat
+          :color="reasonStatus ? 'primary' : 'pink-5'"
+          @click="clickRetire()"
+          :icon="
+            reasonStatus ? 'mdi-home-import-outline' : 'mdi-home-export-outline'
+          "
+        >
           <q-tooltip>{{
             reasonStatus ? "การกลับเข้ารับราชการ" : "การออกจากราชการ"
           }}</q-tooltip>
@@ -173,7 +237,9 @@
                 <q-item-section class="text-blue">ก.พ.7/ก.ก.1</q-item-section>
               </q-item>
               <q-item clickable v-close-popup @click="clickKp7Short()">
-                <q-item-section class="text-primary">ประวัติแบบย่อ</q-item-section>
+                <q-item-section class="text-primary"
+                  >ประวัติแบบย่อ</q-item-section
+                >
               </q-item>
             </q-list>
           </q-menu>
@@ -185,8 +251,20 @@
     <q-card style="width: 90vw; max-width: 80vw">
       <q-card-section class="row items-center q-pb-xs col-12">
         <q-space />
-        <q-btn @click="downloadKP7()" unelevated class="btn_purple q-mr-sm" label="ดาวน์โหลด ก.พ.7/ก.ก.1"></q-btn>
-        <q-btn icon="close" unelevated round dense @click="closeKp7" style="color: #ff8080; background-color: #ffdede" />
+        <q-btn
+          @click="downloadKP7()"
+          unelevated
+          class="btn_purple q-mr-sm"
+          label="ดาวน์โหลด ก.พ.7/ก.ก.1"
+        ></q-btn>
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          @click="closeKp7"
+          style="color: #ff8080; background-color: #ffdede"
+        />
       </q-card-section>
       <q-card-section class="q-p-sm">
         <!-- <viewpdf
@@ -201,9 +279,20 @@
     <q-card style="width: 90vw; max-width: 80vw">
       <q-card-section class="row items-center q-pb-xs col-12">
         <q-space />
-        <q-btn @click="downloadKP7Short()" unelevated class="btn_purple q-mr-sm" label="ดาวน์โหลด ประวัติแบบย่อ"></q-btn>
-        <q-btn icon="close" unelevated round dense @click="closeKp7Short"
-          style="color: #ff8080; background-color: #ffdede" />
+        <q-btn
+          @click="downloadKP7Short()"
+          unelevated
+          class="btn_purple q-mr-sm"
+          label="ดาวน์โหลด ประวัติแบบย่อ"
+        ></q-btn>
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          @click="closeKp7Short"
+          style="color: #ff8080; background-color: #ffdede"
+        />
       </q-card-section>
       <q-card-section class="q-p-sm">
         <!-- <viewpdf
@@ -220,28 +309,50 @@
       <q-card-section class="q-py-sm row">
         <div class="text-h6">เลือกรูปภาพ</div>
         <q-space />
-        <q-btn icon="close" unelevated round dense @click="closeImage" style="color: #ff8080; background-color: #ffdede">
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          @click="closeImage"
+          style="color: #ff8080; background-color: #ffdede"
+        >
           <q-tooltip>ปิดหน้านี้</q-tooltip>
         </q-btn>
       </q-card-section>
       <q-separator />
       <q-card-section class="col-12 row">
-        <div class="row wrap items-start col-12 q-col-gutter-sm" style="height: 320px; overflow: auto">
+        <div
+          class="row wrap items-start col-12 q-col-gutter-sm"
+          style="height: 320px; overflow: auto"
+        >
           <div class="col-3" @click="addNewImage">
-            <div style="
+            <div
+              style="
                 height: 160px;
                 max-width: 15vw;
                 display: flex !important;
                 justify-content: center;
                 align-items: center;
-              " class="column rounded-borders cursor-pointer bg-active-image text-white">
+              "
+              class="column rounded-borders cursor-pointer bg-active-image text-white"
+            >
               <q-icon name="add" size="60px" color="white" />
               <strong>อัปโหลดรูปภาพ</strong>
             </div>
           </div>
-          <div v-for="n in images" :key="n" class="col-3" @click="imageActive(n)">
+          <div
+            v-for="n in images"
+            :key="n"
+            class="col-3"
+            @click="imageActive(n)"
+          >
             <div :class="getClass(n)">
-              <q-img v-if="n.avatar != null" :src="n.avatar" :class="imageClass(n)">
+              <q-img
+                v-if="n.avatar != null"
+                :src="n.avatar"
+                :class="imageClass(n)"
+              >
                 <!-- <div
                   class="absolute-top bg-transparent cursor-pointer text-right"
                   style="padding: 5px"
@@ -255,11 +366,21 @@
                     style="color: #ff8080"
                   />
                 </div> -->
-                <div class="absolute-bottom col-12 cursor-pointer flex justify-between items-center" style="padding: 5px">
+                <div
+                  class="absolute-bottom col-12 cursor-pointer flex justify-between items-center"
+                  style="padding: 5px"
+                >
                   {{ date2Thai(n.createdDate) }}
 
-                  <q-btn v-if="!n.isActive" icon="delete" unelevated dense @click="deletePhoto(n.id)" class="bg-white"
-                    style="color: #ff8080" />
+                  <q-btn
+                    v-if="!n.isActive"
+                    icon="delete"
+                    unelevated
+                    dense
+                    @click="deletePhoto(n.id)"
+                    class="bg-white"
+                    style="color: #ff8080"
+                  />
                 </div>
               </q-img>
             </div>
@@ -277,7 +398,14 @@
         >
           <q-tooltip>ลบรูปภาพ</q-tooltip>
         </q-btn> -->
-        <q-btn icon="check" dense flat round @click="selectAvatarHistory" color="positive">
+        <q-btn
+          icon="check"
+          dense
+          flat
+          round
+          @click="selectAvatarHistory"
+          color="positive"
+        >
           <q-tooltip>เลือกรูปภาพ</q-tooltip>
         </q-btn>
       </q-card-actions>
@@ -291,18 +419,38 @@
           <q-card-section class="q-py-sm row">
             <DialogHeader tittle="ถึงแก่กรรม" :close="closePassaway" />
             <div class="col-12 row q-pa-sm q-col-gutter-sm">
-              <q-file class="col-12 col-sm-6 col-md-5" outlined dense v-model="filePassaway" label="แนบใบมรณบัตร"
-                hide-bottom-space lazy-rules>
+              <q-file
+                class="col-12 col-sm-6 col-md-5"
+                outlined
+                dense
+                v-model="filePassaway"
+                label="แนบใบมรณบัตร"
+                hide-bottom-space
+                lazy-rules
+              >
                 <q-separator />
                 <template v-slot:prepend>
                   <q-icon name="attach_file" />
                 </template>
               </q-file>
-              <q-input class="col-12 col-sm-6 col-md-7" dense outlined v-model="deathCertificateNo"
-                label="เลขที่ใบมรณบัตร" />
+              <q-input
+                class="col-12 col-sm-6 col-md-7"
+                dense
+                outlined
+                v-model="deathCertificateNo"
+                label="เลขที่ใบมรณบัตร"
+              />
 
-              <datepicker class="col-12 col-sm-6 col-md-5" menu-class-name="modalfix" v-model="dateDeath" :locale="'th'"
-                autoApply borderless :enableTimePicker="false" week-start="0">
+              <datepicker
+                class="col-12 col-sm-6 col-md-5"
+                menu-class-name="modalfix"
+                v-model="dateDeath"
+                :locale="'th'"
+                autoApply
+                borderless
+                :enableTimePicker="false"
+                week-start="0"
+              >
                 <template #year="{ year }">
                   {{ year + 543 }}
                 </template>
@@ -310,32 +458,63 @@
                   {{ parseInt(value + 543) }}
                 </template>
                 <template #trigger>
-                  <q-input outlined dense class="full-width datepicker" :model-value="dateDeath != null ? date2Thai(dateDeath) : null
-                    " :label="`${'วันที่เสียชีวิต'}`" :rules="[
-    (val) => !!val || `${'กรุณาเลือกวันที่เสียชีวิต'}`,
-  ]">
+                  <q-input
+                    outlined
+                    dense
+                    class="full-width datepicker"
+                    :model-value="
+                      dateDeath != null ? date2Thai(dateDeath) : null
+                    "
+                    :label="`${'วันที่เสียชีวิต'}`"
+                    :rules="[
+                      (val) => !!val || `${'กรุณาเลือกวันที่เสียชีวิต'}`,
+                    ]"
+                  >
                     <template v-slot:prepend>
-                      <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
                       </q-icon>
                     </template>
                   </q-input>
                 </template>
               </datepicker>
 
-              <q-input class="col-12 col-sm-6 col-md-7" dense outlined v-model="placeDeathCertificate"
-                label="สถานที่ออกใบมรณบัตร" />
+              <q-input
+                class="col-12 col-sm-6 col-md-7"
+                dense
+                outlined
+                v-model="placeDeathCertificate"
+                label="สถานที่ออกใบมรณบัตร"
+              />
               <q-separator />
-              <q-input class="col-12" dense outlined v-model="reasonDeath" label="เหตุผลการเสีบชีวิต" type="textarea" />
+              <q-input
+                class="col-12"
+                dense
+                outlined
+                v-model="reasonDeath"
+                label="เหตุผลการเสีบชีวิต"
+                type="textarea"
+              />
             </div>
             <q-space />
           </q-card-section>
           <q-separator />
           <div class="flex justify-end q-pa-sm q-gutter-sm">
-            <q-btn unelevated label="บันทึก" color="public" @click="clickSaveDeceased" :disable="filePassaway === null ||
-              deathCertificateNo === '' ||
-              placeDeathCertificate === '' ||
-              reasonDeath === ''
-              ">
+            <q-btn
+              unelevated
+              label="บันทึก"
+              color="public"
+              @click="clickSaveDeceased"
+              :disable="
+                filePassaway === null ||
+                deathCertificateNo === '' ||
+                placeDeathCertificate === '' ||
+                reasonDeath === ''
+              "
+            >
               <q-tooltip>บันทึก</q-tooltip>
             </q-btn>
           </div>
@@ -353,34 +532,71 @@
   <q-dialog v-model="dialogLeave" persistent>
     <q-card style="width: 600px">
       <q-toolbar>
-        <q-toolbar-title class="text-subtitle2 text-bold">ประเภทการพ้นราชการ
+        <q-toolbar-title class="text-subtitle2 text-bold"
+          >ประเภทการพ้นราชการ
         </q-toolbar-title>
-        <q-btn icon="close" unelevated round dense @click="closeLeave"
-          style="color: #ff8080; background-color: #ffdede" />
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          @click="closeLeave"
+          style="color: #ff8080; background-color: #ffdede"
+        />
       </q-toolbar>
 
       <q-separator />
       <q-card-section class="q-p-sm">
-        <div class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs">
+        <div
+          class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+        >
           <div class="col-xs-6 col-sm-6 col-md-6">
-            <q-select class="full-width inputgreen cursor-pointer" outlined dense lazy-rules v-model="reason"
-              :rules="[(val) => !!val || `${'กรุณาเลือกประเภทการพ้นราชการ'}`]" hide-bottom-space
-              :label="`${'ประเภทการพ้นราชการ'}`" emit-value map-options option-label="name" :options="reasonOptions"
-              option-value="id" />
+            <q-select
+              class="full-width inputgreen cursor-pointer"
+              outlined
+              dense
+              lazy-rules
+              v-model="reason"
+              :rules="[(val) => !!val || `${'กรุณาเลือกประเภทการพ้นราชการ'}`]"
+              hide-bottom-space
+              :label="`${'ประเภทการพ้นราชการ'}`"
+              emit-value
+              map-options
+              option-label="name"
+              :options="reasonOptions"
+              option-value="id"
+            />
           </div>
           <div class="col-xs-6 col-sm-6 col-md-6">
-            <datepicker menu-class-name="modalfix" v-model="leaveDate" :locale="'th'" autoApply :enableTimePicker="false"
-              week-start="0">
+            <datepicker
+              menu-class-name="modalfix"
+              v-model="leaveDate"
+              :locale="'th'"
+              autoApply
+              :enableTimePicker="false"
+              week-start="0"
+            >
               <template #year="{ year }">{{ year + 543 }}</template>
               <template #year-overlay-value="{ value }">{{
                 parseInt(value + 543)
               }}</template>
               <template #trigger>
-                <q-input class="full-width inputgreen cursor-pointer" outlined dense lazy-rules
-                  :model-value="date2Thai(leaveDate)" :rules="[(val) => !!val || `${'กรุณาเลือกวันที่พ้นราชการ'}`]"
-                  hide-bottom-space :label="`${'วันที่พ้นราชการ'}`">
+                <q-input
+                  class="full-width inputgreen cursor-pointer"
+                  outlined
+                  dense
+                  lazy-rules
+                  :model-value="date2Thai(leaveDate)"
+                  :rules="[(val) => !!val || `${'กรุณาเลือกวันที่พ้นราชการ'}`]"
+                  hide-bottom-space
+                  :label="`${'วันที่พ้นราชการ'}`"
+                >
                   <template v-slot:prepend>
-                    <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
+                    <q-icon
+                      name="event"
+                      class="cursor-pointer"
+                      style="color: var(--q-primary)"
+                    >
                     </q-icon>
                   </template>
                 </q-input>
@@ -388,30 +604,64 @@
             </datepicker>
           </div>
           <div class="col-xs-6 col-sm-6 col-md-6">
-            <q-input class="full-width inputgreen cursor-pointer" outlined dense lazy-rules autogrow v-model="leaveDetail"
+            <q-input
+              class="full-width inputgreen cursor-pointer"
+              outlined
+              dense
+              lazy-rules
+              autogrow
+              v-model="leaveDetail"
               :rules="[
                 (val) =>
                   !!val || `${'กรุณากรอกสาเหตุ/เหตุผลของการพ้นจากราชการ'}`,
-              ]" hide-bottom-space :label="`${'สาเหตุ/เหตุผลของการพ้นจากราชการ'}`" />
+              ]"
+              hide-bottom-space
+              :label="`${'สาเหตุ/เหตุผลของการพ้นจากราชการ'}`"
+            />
           </div>
           <div class="col-xs-6 col-sm-6 col-md-6">
-            <q-input class="full-width inputgreen cursor-pointer" outlined dense lazy-rules autogrow
-              v-model="leaveNumberOrder" :rules="[(val) => !!val || `${'กรุณากรอกคำสั่ง/เอกสารอ้างอิง'}`]"
-              hide-bottom-space :label="`${'คำสั่ง/เอกสารอ้างอิง'}`" />
+            <q-input
+              class="full-width inputgreen cursor-pointer"
+              outlined
+              dense
+              lazy-rules
+              autogrow
+              v-model="leaveNumberOrder"
+              :rules="[(val) => !!val || `${'กรุณากรอกคำสั่ง/เอกสารอ้างอิง'}`]"
+              hide-bottom-space
+              :label="`${'คำสั่ง/เอกสารอ้างอิง'}`"
+            />
           </div>
           <div class="col-xs-6 col-sm-6 col-md-6">
-            <datepicker menu-class-name="modalfix" v-model="leaveDateOrder" :locale="'th'" autoApply
-              :enableTimePicker="false" week-start="0">
+            <datepicker
+              menu-class-name="modalfix"
+              v-model="leaveDateOrder"
+              :locale="'th'"
+              autoApply
+              :enableTimePicker="false"
+              week-start="0"
+            >
               <template #year="{ year }">{{ year + 543 }}</template>
               <template #year-overlay-value="{ value }">{{
                 parseInt(value + 543)
               }}</template>
               <template #trigger>
-                <q-input class="full-width inputgreen cursor-pointer" outlined dense lazy-rules
-                  :model-value="date2Thai(leaveDateOrder)" :rules="[(val) => !!val || `${'กรุณาเลือกวันที่ออกคำสั่ง'}`]"
-                  hide-bottom-space :label="`${'วันที่ออกคำสั่ง'}`">
+                <q-input
+                  class="full-width inputgreen cursor-pointer"
+                  outlined
+                  dense
+                  lazy-rules
+                  :model-value="date2Thai(leaveDateOrder)"
+                  :rules="[(val) => !!val || `${'กรุณาเลือกวันที่ออกคำสั่ง'}`]"
+                  hide-bottom-space
+                  :label="`${'วันที่ออกคำสั่ง'}`"
+                >
                   <template v-slot:prepend>
-                    <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
+                    <q-icon
+                      name="event"
+                      class="cursor-pointer"
+                      style="color: var(--q-primary)"
+                    >
                     </q-icon>
                   </template>
                 </q-input>
@@ -422,7 +672,13 @@
       </q-card-section>
       <q-separator />
       <q-card-actions align="right">
-        <q-btn flat round color="public" @click="Retire" icon="mdi-content-save-outline">
+        <q-btn
+          flat
+          round
+          color="public"
+          @click="Retire"
+          icon="mdi-content-save-outline"
+        >
           <q-tooltip>บันทึก</q-tooltip>
         </q-btn>
       </q-card-actions>
@@ -478,7 +734,7 @@ const {
   success,
   showLoader,
   hideLoader,
-  dialogConfirm
+  dialogConfirm,
 } = mixin;
 const route = useRoute();
 const router = useRouter();
@@ -552,7 +808,7 @@ const reasonOptions = ref<DataOption[]>([
 ]);
 
 onMounted(async () => {
-  await checkProfileData();
+  //   await checkProfileData();
   await fetchData();
   await changeTab("information");
 });
@@ -637,7 +893,7 @@ const uploadImage = async (e: any) => {
     showLoader();
     await http
       .post(config.API.profileAvatarId(profileId.value), formData)
-      .then((res) => { })
+      .then((res) => {})
       .catch((e) => {
         messageError($q, e);
       })
@@ -762,96 +1018,72 @@ const closeKp7Short = () => {
 };
 
 const helpPost = () => {
-  dialogConfirm(
-    $q,
-    async () => {
-      const formData = new FormData();
-      formData.append("id", profileId.value);
-      await http.post(config.API.placemenHelpGov, formData);
-    },
-  );
-}
+  dialogConfirm($q, async () => {
+    const formData = new FormData();
+    formData.append("id", profileId.value);
+    await http.post(config.API.placemenHelpGov, formData);
+  });
+};
 
 const repatriationPost = async () => {
-  dialogConfirm(
-    $q,
-    async () => {
-      const formData = new FormData();
-      formData.append("id", profileId.value);
-      await http.post(config.API.placemenRepatriation, formData);
-    },
-  );
-}
+  dialogConfirm($q, async () => {
+    const formData = new FormData();
+    formData.append("id", profileId.value);
+    await http.post(config.API.placemenRepatriation, formData);
+  });
+};
 
 const appointPost = async () => {
-  dialogConfirm(
-    $q,
-    async () => {
-      const formData = new FormData();
-      formData.append("id", profileId.value);
-      await http.post(config.API.placemenAppointment, formData);
-    },
-  );
-}
+  dialogConfirm($q, async () => {
+    const formData = new FormData();
+    formData.append("id", profileId.value);
+    await http.post(config.API.placemenAppointment, formData);
+  });
+};
 
 const relocationPost = async () => {
-  dialogConfirm(
-    $q,
-    async () => {
-      const formData = new FormData();
-      formData.append("id", profileId.value);
-      await http.post(config.API.placemenRelocation, formData);
-    },
-  );
-}
+  dialogConfirm($q, async () => {
+    const formData = new FormData();
+    formData.append("id", profileId.value);
+    await http.post(config.API.placemenRelocation, formData);
+  });
+};
 
 const outPost = async () => {
-  dialogConfirm(
-    $q,
-    async () => {
-      const formData = new FormData();
-      formData.append("id", profileId.value);
-      await http.post(config.API.retirementOut, formData);
-    },
-  );
-}
+  dialogConfirm($q, async () => {
+    const formData = new FormData();
+    formData.append("id", profileId.value);
+    await http.post(config.API.retirementOut, formData);
+  });
+};
 
 const dischargePost = async () => {
-  dialogConfirm(
-    $q,
-    async () => {
-      const formData = new FormData();
-      formData.append("id", profileId.value);
-      await http.post(config.API.retirementDischarge, formData);
-    },
-  );
-}
+  dialogConfirm($q, async () => {
+    const formData = new FormData();
+    formData.append("id", profileId.value);
+    await http.post(config.API.retirementDischarge, formData);
+  });
+};
 
 const expulsionPost = async () => {
-  dialogConfirm(
-    $q,
-    async () => {
-      const formData = new FormData();
-      formData.append("id", profileId.value);
-      await http.post(config.API.retirementExpulsion, formData);
-    },
-  );
-}
+  dialogConfirm($q, async () => {
+    const formData = new FormData();
+    formData.append("id", profileId.value);
+    await http.post(config.API.retirementExpulsion, formData);
+  });
+};
 
 const otherPost = async () => {
-  dialogConfirm(
-    $q,
-    async () => {
-      const formData = new FormData();
-      formData.append("id", profileId.value);
-      await http.post(config.API.placemenOther, formData);
-    },
-  );
-}
+  dialogConfirm($q, async () => {
+    const formData = new FormData();
+    formData.append("id", profileId.value);
+    await http.post(config.API.placemenOther, formData);
+  });
+};
 
-const downloadKP7 = () => { };
+const downloadKP7 = () => {};
 
-const downloadKP7Short = () => { };
+const downloadKP7Short = () => {};
 
 const clickKp7 = async () => {
   window.open(config.API.profileReportId(profileId.value));
@@ -1094,7 +1326,6 @@ const clickSaveDeceased = async () => {
         .then(() => {
           success($q, "บันทึกข้อมูลสำเร็จ");
           router.push("/deceased");
-
         })
         .catch((e) => {
           console.log(e);
@@ -1102,10 +1333,10 @@ const clickSaveDeceased = async () => {
         })
         .finally(() => {
           hideLoader();
-        })
+        });
     })
-    .onCancel(() => { })
-    .onDismiss(() => { });
+    .onCancel(() => {})
+    .onDismiss(() => {});
 };
 </script>
 <style>
diff --git a/src/modules/05_placement/components/Receive/receiveDetail2.vue b/src/modules/05_placement/components/Receive/receiveDetail2.vue
index 9bae15e65..2e6f388cf 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail2.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail2.vue
@@ -25,7 +25,7 @@
         icon-right="mdi-open-in-new"
         class="q-px-sm"
         label="ดูข้อมูลทะเบียนประวัติ"
-        @click="router.push(`/registry/${profileId}`)"
+        @click="router.push(`/registry/${paramsId}`)"
       />
     </div>
     <div class="col-12"><q-separator /></div>

From c9f4033afe79a1e7dbc0676ba5c31839b37e021f Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Mon, 21 Aug 2023 12:33:44 +0700
Subject: [PATCH 4/4] =?UTF-8?q?-=20fix=20bug=20api=20=E0=B8=97=E0=B8=94?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99=20-=20fi?=
 =?UTF-8?q?x=20status=20=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/05_placement/api.probation.ts         |   6 +-
 .../probation/FormEvaluation/FormReport.vue   | 262 ++++--------------
 .../FormEvaluation/FormSaveResult.vue         |   5 +-
 .../probation/FormEvaluation/Template1.vue    |  37 +--
 .../probation/FormEvaluation/Template2.vue    |   4 +-
 .../FormEvaluation/Template2Format2.vue       |   2 +-
 .../probation/FormEvaluation/Template3.vue    |  14 +-
 .../components/resign/ResignByid.vue          |   2 +-
 8 files changed, 72 insertions(+), 260 deletions(-)

diff --git a/src/api/05_placement/api.probation.ts b/src/api/05_placement/api.probation.ts
index 6cf5144e4..db4aadfa1 100644
--- a/src/api/05_placement/api.probation.ts
+++ b/src/api/05_placement/api.probation.ts
@@ -41,17 +41,17 @@ export default {
   //แบบประเมินผล (ผู้บังคับบัญชา)
   evaluateCreate: (id: string) => `${evaluate}/evaluate/create?assign_id=${id}`,
   evaluatecommader: (id: string, no: string) => `${evaluate}/evaluate?assign_id=${id}&evaluate_no=${no}`,
-  createformCommader: (id: string) => `${evaluate}/evaluate?id=${id}`,
+  createformCommader: (id: string) => `${evaluate}/evaluate?assign_id=${id}`,
 
   //แบบประเมินผล (คณะกรรมการ)
   evaluateChairman: (id: string) => `${evaluate}/evaluate-chairman/create?assign_id=${id}`,
   evaluateRoundChairman: (id: string, no: string) => `${evaluate}/evaluate-chairman?assign_id=${id}&evaluate_no=${no}`,
-  createformChairman: (id: string) => `${evaluate}/evaluate-chairman?id=${id}`,
+  createformChairman: (id: string) => `${evaluate}/evaluate-chairman?assign_id=${id}`,
 
   //แบบรายงาน
   evaluateReportcreate: (id: string) => `${evaluate}/evaluate-result/create?assign_id=${id}`,
   evaluateReport: (id: string) => `${evaluate}/evaluate-result?assign_id=${id}`,
-  createformReport: (id: string) => `${evaluate}/evaluate-result?id=${id}`,
+  createformReport: (id: string) => `${evaluate}/evaluate-result?assign_id=${id}`,
 
 
 
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index 13621e6ba..d42e1c3a0 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -26,7 +26,7 @@ const assign = ref<any>([]);
 const mentors = ref<any>([]);
 const commander = ref<any>([]);
 const status = ref<boolean>(true);
-const evaluate = ref<any>([]);
+// const evaluate = ref<any>([]);
 
 onMounted(() => {
   fecthAssign(assignId.value);
@@ -68,7 +68,7 @@ const director1_dated = ref<any>("");
 const director2_dated = ref<any>("");
 const fecthResult = async (id: string) => {
   await http
-    .get(config.API.evaluateReport(id))
+    .get(config.API.createformReport(id))
     .then((res: any) => {
       let data = res.data.data.evaluate;
       console.log(data);
@@ -124,7 +124,7 @@ const postData = async () => {
     director2_dated: director2_dated.value,
   };
 
-  console.log("postData===>", data);
+  // console.log("postData===>", data);
   await http
     .post(config.API.createformReport(assignId.value), data)
     .then(() => {
@@ -146,15 +146,8 @@ const postData = async () => {
       <div class="row col-12">
         <div class="col-12 row q-col-gutter-md">
           <div class="col-xs-12 col-sm-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="date_start"
-              :locale="'th'"
-              autoApply
-              borderless
-              :enableTimePicker="false"
-              week-start="0"
-            >
+            <datepicker menu-class-name="modalfix" v-model="date_start" :locale="'th'" autoApply borderless
+              :enableTimePicker="false" week-start="0">
               <template #year="{ year }">
                 {{ year + 543 }}
               </template>
@@ -162,22 +155,10 @@ const postData = async () => {
                 {{ parseInt(value + 543) }}
               </template>
               <template #trigger>
-                <q-input
-                  outlined
-                  dense
-                  class="full-width datepicker"
-                  :model-value="
-                    date_start != null ? date2Thai(date_start) : null
-                  "
-                  :label="`${'ระหว่างวันที่'}`"
-                  :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]"
-                >
+                <q-input outlined dense class="full-width datepicker" :model-value="date_start != null ? date2Thai(date_start) : null
+                  " :label="`${'ระหว่างวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]">
                   <template v-slot:prepend>
-                    <q-icon
-                      name="event"
-                      class="cursor-pointer"
-                      style="color: var(--q-primary)"
-                    >
+                    <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
                     </q-icon>
                   </template>
                 </q-input>
@@ -185,15 +166,8 @@ const postData = async () => {
             </datepicker>
           </div>
           <div class="col-xs-12 col-sm-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="date_finish"
-              :locale="'th'"
-              autoApply
-              borderless
-              :enableTimePicker="false"
-              week-start="0"
-            >
+            <datepicker menu-class-name="modalfix" v-model="date_finish" :locale="'th'" autoApply borderless
+              :enableTimePicker="false" week-start="0">
               <template #year="{ year }">
                 {{ year + 543 }}
               </template>
@@ -201,22 +175,10 @@ const postData = async () => {
                 {{ parseInt(value + 543) }}
               </template>
               <template #trigger>
-                <q-input
-                  outlined
-                  dense
-                  class="full-width datepicker"
-                  :model-value="
-                    date_finish != null ? date2Thai(date_finish) : null
-                  "
-                  :label="`${'ถึงวันที่'}`"
-                  :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]"
-                >
+                <q-input outlined dense class="full-width datepicker" :model-value="date_finish != null ? date2Thai(date_finish) : null
+                  " :label="`${'ถึงวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]">
                   <template v-slot:prepend>
-                    <q-icon
-                      name="event"
-                      class="cursor-pointer"
-                      style="color: var(--q-primary)"
-                    >
+                    <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
                     </q-icon>
                   </template>
                 </q-input>
@@ -228,63 +190,29 @@ const postData = async () => {
 
       <div class="col-12 row q-mt-xs">
         <div class="col-xs-12 col-sm-6">
-          <q-select
-            :rules="[
-              (val) =>
-                !!val || 'กรุณาเลือกการพัฒนาในระหว่างทดลองปฏิบัติหน้าที่ราชการ',
-            ]"
-            hide-bottom-space
-            :options="options"
-            class="col-xs-12 col-sm-6"
-            dense
-            borderless
-            emit-value
-            map-options
-            option-label="label"
-            option-value="value"
-            outlined
-            v-model="develop"
-            label="การพัฒนาในระหว่างทดลองปฏิบัติหน้าที่ราชการ"
-          />
+          <q-select :rules="[
+            (val) =>
+              !!val || 'กรุณาเลือกการพัฒนาในระหว่างทดลองปฏิบัติหน้าที่ราชการ',
+          ]" hide-bottom-space :options="options" class="col-xs-12 col-sm-6" dense borderless emit-value map-options
+            option-label="label" option-value="value" outlined v-model="develop"
+            label="การพัฒนาในระหว่างทดลองปฏิบัติหน้าที่ราชการ" />
         </div>
       </div>
       <div class="col-12 row q-mt-lg">
         <div class="col-xs-12 col-sm-6">
-          <q-select
-            :rules="[
-              (val) =>
-                !!val || 'กรุณาเลือกผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ',
-            ]"
-            hide-bottom-space
-            :options="optionsResult"
-            class="col-xs-12 col-sm-6"
-            dense
-            borderless
-            emit-value
-            map-options
-            option-label="label"
-            option-value="value"
-            outlined
-            v-model="result"
-            label="ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ"
-          />
+          <q-select :rules="[
+            (val) =>
+              !!val || 'กรุณาเลือกผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ',
+          ]" hide-bottom-space :options="optionsResult" class="col-xs-12 col-sm-6" dense borderless emit-value
+            map-options option-label="label" option-value="value" outlined v-model="result"
+            label="ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ" />
         </div>
       </div>
 
       <div class="col-12 row q-mt-lg">
         <div class="col-12">
-          <q-input
-            hide-bottom-space
-            :readonly="edit"
-            dense
-            borderless
-            :outlined="!edit"
-            class="bg-white"
-            type="textarea"
-            v-model="reson"
-            label="เหตุผล"
-            :rules="[(val) => !!val || 'กรุณาระบุเหตุผล']"
-          />
+          <q-input hide-bottom-space :readonly="edit" dense borderless :outlined="!edit" class="bg-white" type="textarea"
+            v-model="reson" label="เหตุผล" :rules="[(val) => !!val || 'กรุณาระบุเหตุผล']" />
         </div>
       </div>
 
@@ -298,26 +226,11 @@ const postData = async () => {
             ประธานคณะกรรมการประเมินผลการปฏิบัติหน้าที่ราชการ
           </div>
           <div class="col-12 row q-col-gutter-md">
-            <q-select
-              class="col-xs-12 col-sm-8"
-              dense
-              v-model="director_id"
-              outlined
-              :options="commander"
-              label=""
-              option-label="name"
-              disable
-            />
+            <q-select class="col-xs-12 col-sm-8" dense v-model="director_id" outlined :options="commander" label=""
+              option-label="name" disable />
             <div class="col-xs-12 col-sm-4">
-              <datepicker
-                menu-class-name="modalfix"
-                v-model="chairman_dated"
-                :locale="'th'"
-                autoApply
-                borderless
-                :enableTimePicker="false"
-                week-start="0"
-              >
+              <datepicker menu-class-name="modalfix" v-model="chairman_dated" :locale="'th'" autoApply borderless
+                :enableTimePicker="false" week-start="0">
                 <template #year="{ year }">
                   {{ year + 543 }}
                 </template>
@@ -325,22 +238,10 @@ const postData = async () => {
                   {{ parseInt(value + 543) }}
                 </template>
                 <template #trigger>
-                  <q-input
-                    outlined
-                    dense
-                    class="full-width datepicker col-3"
-                    :model-value="
-                      chairman_dated != null ? date2Thai(chairman_dated) : null
-                    "
-                    :label="`${'ลงวันที่'}`"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
-                  >
+                  <q-input outlined dense class="full-width datepicker col-3" :model-value="chairman_dated != null ? date2Thai(chairman_dated) : null
+                    " :label="`${'ลงวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]">
                     <template v-slot:prepend>
-                      <q-icon
-                        name="event"
-                        class="cursor-pointer"
-                        style="color: var(--q-primary)"
-                      >
+                      <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
                       </q-icon>
                     </template>
                   </q-input>
@@ -356,25 +257,11 @@ const postData = async () => {
             <!-- ความเห็นของผู้มีอำนาจสั่งบรรจุตามมาตรา 52 -->
           </div>
           <div class="col-12 row q-col-gutter-md">
-            <q-select
-              class="col-xs-12 col-sm-8"
-              dense
-              v-model="director_id2"
-              outlined
-              :options="optionDirector"
-              label=""
-              option-label="name"
-            />
+            <q-select class="col-xs-12 col-sm-8" dense v-model="director_id2" outlined :options="optionDirector" label=""
+              option-label="name" />
             <div class="col-xs-12 col-sm-4">
-              <datepicker
-                menu-class-name="modalfix"
-                v-model="director1_dated"
-                :locale="'th'"
-                autoApply
-                borderless
-                :enableTimePicker="false"
-                week-start="0"
-              >
+              <datepicker menu-class-name="modalfix" v-model="director1_dated" :locale="'th'" autoApply borderless
+                :enableTimePicker="false" week-start="0">
                 <template #year="{ year }">
                   {{ year + 543 }}
                 </template>
@@ -382,24 +269,12 @@ const postData = async () => {
                   {{ parseInt(value + 543) }}
                 </template>
                 <template #trigger>
-                  <q-input
-                    outlined
-                    dense
-                    class="full-width datepicker col-3"
-                    :model-value="
-                      director1_dated != null
-                        ? date2Thai(director1_dated)
-                        : null
-                    "
-                    :label="`${'ลงวันที่'}`"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
-                  >
+                  <q-input outlined dense class="full-width datepicker col-3" :model-value="director1_dated != null
+                      ? date2Thai(director1_dated)
+                      : null
+                    " :label="`${'ลงวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]">
                     <template v-slot:prepend>
-                      <q-icon
-                        name="event"
-                        class="cursor-pointer"
-                        style="color: var(--q-primary)"
-                      >
+                      <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
                       </q-icon>
                     </template>
                   </q-input>
@@ -415,25 +290,11 @@ const postData = async () => {
             <!-- ผู้มีอำนาจสั่งบรรจุตามมาตรา 52 -->
           </div>
           <div class="col-12 row q-col-gutter-md">
-            <q-select
-              class="col-xs-12 col-sm-8"
-              dense
-              v-model="director_id3"
-              outlined
-              :options="optionDirector"
-              label=""
-              option-label="name"
-            />
+            <q-select class="col-xs-12 col-sm-8" dense v-model="director_id3" outlined :options="optionDirector" label=""
+              option-label="name" />
             <div class="col-xs-12 col-sm-4">
-              <datepicker
-                menu-class-name="modalfix"
-                v-model="director2_dated"
-                :locale="'th'"
-                autoApply
-                borderless
-                :enableTimePicker="false"
-                week-start="0"
-              >
+              <datepicker menu-class-name="modalfix" v-model="director2_dated" :locale="'th'" autoApply borderless
+                :enableTimePicker="false" week-start="0">
                 <template #year="{ year }">
                   {{ year + 543 }}
                 </template>
@@ -441,24 +302,12 @@ const postData = async () => {
                   {{ parseInt(value + 543) }}
                 </template>
                 <template #trigger>
-                  <q-input
-                    outlined
-                    dense
-                    class="full-width datepicker col-3"
-                    :model-value="
-                      director2_dated != null
-                        ? date2Thai(director2_dated)
-                        : null
-                    "
-                    :label="`${'ลงวันที่'}`"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
-                  >
+                  <q-input outlined dense class="full-width datepicker col-3" :model-value="director2_dated != null
+                      ? date2Thai(director2_dated)
+                      : null
+                    " :label="`${'ลงวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]">
                     <template v-slot:prepend>
-                      <q-icon
-                        name="event"
-                        class="cursor-pointer"
-                        style="color: var(--q-primary)"
-                      >
+                      <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
                       </q-icon>
                     </template>
                   </q-input>
@@ -471,12 +320,7 @@ const postData = async () => {
 
       <q-toolbar class="text-primary">
         <q-space />
-        <q-btn
-          label="บันทึก"
-          color="secondary"
-          @click="savaForm"
-          v-if="status"
-        />
+        <q-btn label="บันทึก" color="secondary" @click="savaForm" v-if="status" />
       </q-toolbar>
     </q-form>
   </div>
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
index 6ae8a75d0..a8f697e29 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
@@ -41,10 +41,11 @@ const props = defineProps({
 });
 
 onMounted(async () => {
-  // console.log("tab===>", props.tab);
+  console.log("form tab===>", props.tab);
 
   if (props.tab !== undefined) {
     round.value = props.tab.charAt(4);
+    console.log("round===>", round.value);
 
     // await fecthFormRound(assignId.value, round.value);
   }
@@ -55,7 +56,7 @@ const fecthFormdata = async (id: string) => {
   await http
     .get(config.API.formevaluateRecord(id))
     .then(async (res: any) => {
-      console.log(res);
+      // console.log(res);
       evaluate_no.value = res.data.data.evaluate_no;
       start_date.value = res.data.data.start_date;
       date_finish.value = res.data.data.end_date;
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
index 94cd50612..1a9de9f4d 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
@@ -48,7 +48,7 @@ const fecthAssign = async (id: string) => {
       // console.log(tabs.value);
     })
     .catch((e: any) => {
-      console.log(e);
+      // console.log(e);
       messageError($q, e);
     })
     .finally(() => {
@@ -75,40 +75,7 @@ const addData = () => {
     :loop="tabs.length"
     v-if="tabs.length > 0"
   />
-  <!-- <q-header class="bg-grey-1">
-    <div class="bg-grey-1">
-      <div class="col-12 row q-gutter-xs-md items-center">
-        <q-tabs dense v-model="tabHead" active-class="text-primary text-weight-medium" indicator-color="grey-1"
-          class="text-grey-7">
-          <q-tab v-for="tabData in tabs" :key="tabData.no" :name="tabData.no" :label="'ครั้งที่' + tabData.no"
-            @click="changeTab('save' + tabData.no)">
-            <q-btn size="12px" flat dense icon="mdi-download" :disable="tabHead !== tabData.no"
-              :color="tabHead !== tabData.no ? 'grey' : 'add'">
-              <q-tooltip>ดาวน์โหลด</q-tooltip>
-              <q-menu>
-                <q-list style="min-width: 150px">
-                  <q-item clickable v-close-popup>
-                    <q-item-section avatar><q-icon color="red" name="mdi-file-pdf" /></q-item-section>
-                    <q-item-section>ไฟล์ .PDF</q-item-section>
-                  </q-item>
-                  <q-item clickable v-close-popup>
-                    <q-item-section avatar><q-icon color="blue" name="mdi-file-word" /></q-item-section>
-                    <q-item-section>ไฟล์ .docx</q-item-section>
-                  </q-item>
-                </q-list>
-              </q-menu>
-            </q-btn>
-          </q-tab>
-        </q-tabs>
-        <div>
-          <q-btn color="blue" flat dense icon="mdi-plus" @click="nextPage">
-            <q-tooltip> เพิ่ม </q-tooltip>
-          </q-btn>
-        </div>
-      </div>
-      <q-separator />
-    </div>
-  </q-header> -->
+
   <q-page-container>
     <q-tab-panels v-model="tab" animated>
       <q-tab-panel
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
index 2726711d9..39f3a9380 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
@@ -41,14 +41,14 @@ onMounted(() => {
 const fecthAssign = async (id: string) => {
   showLoader();
   await http
-    .get(config.API.evaluateCreate(id))
+    .get(config.API.createformCommader(id))
     .then((res: any) => {
       if (res.data.data.evaluate_no > 0) {
         tabs.value = res.data.data.evaluate;
       }
     })
     .catch((e: any) => {
-      console.log(e);
+      // console.log(e);
       messageError($q, e);
     })
     .finally(() => {
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
index b98b81ea4..cb01dfab0 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
@@ -37,7 +37,7 @@ onMounted(() => {
 const fecthAssign = async (id: string) => {
   showLoader();
   await http
-    .get(config.API.evaluateChairman(id))
+    .get(config.API.createformChairman(id))
     .then((res: any) => {
       if (res.data.data.evaluate_no > 0) {
         tabs.value = res.data.data.evaluate;
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue
index fb54fdd4d..f788247ab 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import { ref, defineAsyncComponent } from "vue";
-const tab = ref<string>("save1");
-const changeTab = (tabVal: string) => {
-  tab.value = tabVal
-}
+// const tab = ref<string>("save1");
+// const changeTab = (tabVal: string) => {
+//   tab.value = tabVal
+// }
 
-const Header = defineAsyncComponent(
-  () => import("@/modules/05_placement/components/probation/FormEvaluation/Header.vue")
-);
+// const Header = defineAsyncComponent(
+//   () => import("@/modules/05_placement/components/probation/FormEvaluation/Header.vue")
+// );
 const FormReport = defineAsyncComponent(
   () => import("@/modules/05_placement/components/probation/FormEvaluation/FormReport.vue")
 )
diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index a4a441b9a..3428c5fb5 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -75,7 +75,7 @@
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
       <div class="q-pl-sm text-weight-bold text-dark">ข้อมูลการลาออก</div>
       <q-space />
-      <div class="q-gutter-x-sm" v-if="dataDetail.status === 'PENDING'">
+      <div class="q-gutter-x-sm" v-if="dataDetail.status === 'WAITTING'">
         <q-btn
           outline
           color="primary"