From 1a4b9d487524a27b5372f0679d392f2ecfb0f9f7 Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Wed, 3 Jul 2024 10:48:04 +0700
Subject: [PATCH 01/13] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=20path=20manual?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app.config.ts b/src/app.config.ts
index b5852275b..b169f9a9a 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -137,7 +137,7 @@ const API = {
   ...file,
 };
 
-const path = "http://localhost:3008";
+const path = "http://chamomind.ddns.net:20006";
 
 const generatePopupPath = (routeName: any) => {
   if (routeName.includes("metadata")) {
@@ -218,7 +218,7 @@ const manualConfig = {
   KPIIndicatorByRole: `${path}/manual/chapter-3-admin-evaluate`,
   KPICompetencyAdd: `${path}/manual/chapter-3-admin-evaluate`,
   KPICompetencyByid: `${path}/manual/chapter-3-admin-evaluate`,
-  organizationNew: `${path}/manual/chapter-4-admin-organization`,
+  organizationalNew: `${path}/manual/chapter-4-admin-organization`,
   organization: `${path}/manual/chapter-7-admin-registry`,
   registry: `${path}/manual/chapter-7-admin-registry`,
   registryDetail: `${path}/manual/chapter-7-admin-registry`,

From 4842a8de5fb2d240daed29bbdc1a8008af46243a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 11:56:38 +0700
Subject: [PATCH 02/13] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=20=3D>=20fix=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/15_development/views/MainPage.vue | 231 ++++++++----------
 1 file changed, 107 insertions(+), 124 deletions(-)

diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index ef0f52f6c..08cc9a588 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -168,7 +168,6 @@ function onDownload() {
 /** function ปิด Dialog เพิ่มโครงการ/หลักสูตรการฝึกอบรม*/
 function closeDialog() {
   modal.value = false;
-
   formProject.year = null;
   formProject.projectName = "";
   formProject.orgRevisionId = "";
@@ -213,7 +212,6 @@ function fetchActive() {
  * @param id โครงสร้างปจุบัน
  */
 function fetchTree(id: string) {
-  showLoader();
   http
     .get(config.API.orgByid(id.toString()))
     .then((res) => {
@@ -223,8 +221,6 @@ function fetchTree(id: string) {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
       hideLoader();
     });
 }
@@ -338,135 +334,122 @@ onMounted(() => {
     </div>
     <div class="col-xs-12 col-sm-9 q-pa-md row">
       <div class="col-12">
-        <q-toolbar style="padding: 0">
-          <div class="row items-center q-gutter-sm">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="formQuery.year"
-              :locale="'th'"
-              autoApply
-              year-picker
-              :enableTimePicker="false"
-              style="width: 150px"
-              @update:model-value="fetchListProjectNew"
-            >
-              <template #year="{ year }">{{ year + 543 }}</template>
-              <template #year-overlay-value="{ value }">{{
-                parseInt(value + 543)
-              }}</template>
-              <template #trigger>
-                <q-input
-                  dense
-                  lazy-rules
-                  outlined
-                  :model-value="
-                    formQuery.year === 0
-                      ? 'ทั้งหมด'
-                      : Number(formQuery.year) + 543
-                  "
-                  :label="`${'ปีงบประมาณ'}`"
-                >
-                  <template v-if="formQuery.year" v-slot:append>
-                    <q-icon
-                      name="cancel"
-                      @click.stop.prevent="
-                        (formQuery.year = 0), fetchListProjectNew()
-                      "
-                      class="cursor-pointer"
-                    />
-                  </template>
-                  <template v-slot:prepend>
-                    <q-icon
-                      name="event"
-                      class="cursor-pointer"
-                      style="color: var(--q-primary)"
-                    >
-                    </q-icon>
-                  </template>
-                </q-input>
-              </template>
-            </datepicker>
-            <q-select
-              dense
-              outlined
-              v-model="formQuery.status"
-              :options="statusOpt"
-              label="สถานะโครงการ"
-              option-label="name"
-              option-value="id"
-              emit-value
-              map-options
-              @update:model-value="fetchListProjectNew"
-            />
-            <q-toolbar-title>
-              <q-btn
-                flat
-                round
-                dense
-                icon="add"
-                color="primary"
-                @click="onAdd()"
-              >
-                <q-tooltip>เพิ่ม</q-tooltip>
-              </q-btn>
-            </q-toolbar-title>
-          </div>
-          <q-space />
-          <div class="row q-gutter-sm">
-            <div>
-              <q-btn
-                flat
-                round
-                dense
-                icon="mdi-arrow-down-bold-circle-outline"
-                color="blue"
-                @click="onDownload"
-              >
-                <q-tooltip>ดาวน์โหลด</q-tooltip>
-              </q-btn>
-            </div>
-            <div>
+        <q-toolbar class="row col-8 q-pa-none q-gutter-x-sm" style="padding: 0">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="formQuery.year"
+            :locale="'th'"
+            autoApply
+            year-picker
+            :enableTimePicker="false"
+            style="width: 150px"
+            @update:model-value="fetchListProjectNew"
+          >
+            <template #year="{ year }">{{ year + 543 }}</template>
+            <template #year-overlay-value="{ value }">{{
+              parseInt(value + 543)
+            }}</template>
+            <template #trigger>
               <q-input
-                standout
                 dense
-                v-model="formQuery.keyword"
-                ref="filterRef"
+                lazy-rules
                 outlined
-                placeholder="ค้นหา"
-                @keyup.enter="fetchListProjectNew"
+                :model-value="
+                  formQuery.year === 0
+                    ? 'ทั้งหมด'
+                    : Number(formQuery.year) + 543
+                "
+                :label="`${'ปีงบประมาณ'}`"
               >
-                <template v-slot:append>
-                  <q-icon v-if="formQuery.keyword == ''" name="search" />
+                <template v-if="formQuery.year" v-slot:append>
                   <q-icon
-                    v-if="formQuery.keyword !== ''"
-                    name="clear"
-                    class="cursor-pointer"
-                    @click="
-                      (formQuery.keyword = ''),
-                        fetchListProject(),
-                        (formQuery.page = 1)
+                    name="cancel"
+                    @click.stop.prevent="
+                      (formQuery.year = 0), fetchListProjectNew()
                     "
+                    class="cursor-pointer"
                   />
                 </template>
+                <template v-slot:prepend>
+                  <q-icon
+                    name="event"
+                    class="cursor-pointer"
+                    style="color: var(--q-primary)"
+                  >
+                  </q-icon>
+                </template>
               </q-input>
-            </div>
-            <div>
-              <q-select
-                v-model="visibleColumns"
-                multiple
-                outlined
-                dense
-                options-dense
-                :display-value="$q.lang.table.columns"
-                emit-value
-                map-options
-                :options="columns"
-                option-value="name"
-                options-cover
-                style="min-width: 150px"
+            </template>
+          </datepicker>
+          <q-select
+            dense
+            outlined
+            v-model="formQuery.status"
+            :options="statusOpt"
+            label="สถานะโครงการ"
+            option-label="name"
+            option-value="id"
+            emit-value
+            map-options
+            @update:model-value="fetchListProjectNew"
+          />
+          <q-toolbar-title>
+            <q-btn flat round dense icon="add" color="primary" @click="onAdd()">
+              <q-tooltip>เพิ่ม</q-tooltip>
+            </q-btn>
+          </q-toolbar-title>
+
+          <q-space />
+
+          <q-btn
+            flat
+            round
+            dense
+            icon="mdi-arrow-down-bold-circle-outline"
+            color="blue"
+            @click="onDownload"
+          >
+            <q-tooltip>ดาวน์โหลด</q-tooltip>
+          </q-btn>
+
+          <q-input
+            standout
+            dense
+            v-model="formQuery.keyword"
+            ref="filterRef"
+            outlined
+            placeholder="ค้นหา"
+            @keyup.enter="fetchListProjectNew"
+          >
+            <template v-slot:append>
+              <q-icon v-if="formQuery.keyword == ''" name="search" />
+              <q-icon
+                v-if="formQuery.keyword !== ''"
+                name="clear"
+                class="cursor-pointer"
+                @click="
+                  (formQuery.keyword = ''),
+                    fetchListProject(),
+                    (formQuery.page = 1)
+                "
               />
-            </div>
-          </div>
+            </template>
+          </q-input>
+
+          <q-select
+            v-model="visibleColumns"
+            multiple
+            outlined
+            dense
+            options-dense
+            :display-value="$q.lang.table.columns"
+            emit-value
+            map-options
+            :options="columns"
+            option-value="name"
+            options-cover
+            style="min-width: 150px"
+          />
         </q-toolbar>
 
         <div class="col-12">
@@ -673,7 +656,7 @@ onMounted(() => {
 
 .tree-container {
   overflow: auto;
-  height: 80vh;
+  height: 75vh;
   border: 1px solid #e6e6e7;
   border-radius: 10px;
 }

From 7a3e91603974b2ce21832bf94b2f405da67d2ffd Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 13:20:18 +0700
Subject: [PATCH 03/13] fix bug

---
 .../PersonalInformation/04_FamilyNew.vue      |  1 -
 .../15_development/views/EmployeeHistory.vue  | 27 +++++++++++++++----
 src/modules/15_development/views/History.vue  | 26 ++++++++++++++----
 src/modules/15_development/views/MainPage.vue |  4 +--
 4 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue
index b36510356..65139cc94 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue
@@ -786,7 +786,6 @@ onMounted(() => {
   <q-dialog v-model="modal" class="dialog" persistent>
     <q-card style="min-width: 80%">
       <q-form @submit.prevent greedy @validation-success="onSubmit(typeForm)">
-        {{ typeForm }} {{ isEdit }}
         <DialogHeader
           :tittle="
             isEdit
diff --git a/src/modules/15_development/views/EmployeeHistory.vue b/src/modules/15_development/views/EmployeeHistory.vue
index 8a55aaaf4..8d5e59ff8 100644
--- a/src/modules/15_development/views/EmployeeHistory.vue
+++ b/src/modules/15_development/views/EmployeeHistory.vue
@@ -36,7 +36,7 @@ const pagination = ref({
 });
 
 const rows = ref<any[]>([]);
-const agencyOp = ref<[]>([]);
+const agencyOp = ref<any[]>([]);
 const itemMenu = ref<ItemsMenu[]>([
   {
     label: "ไฟล์ .xlsx",
@@ -136,11 +136,18 @@ function fetchListOrg() {
   showLoader();
   http
     .get(config.API.developmentHistoryListOrg("employee", formFilter.year))
-    .then((res) => {
+    .then(async (res) => {
       formFilter.root = null;
       rows.value = [];
-      agencyOp.value = res.data.result;
-      getData();
+      const option = [{ name: "ทั้งหมด", id: null }];
+      const optionNew = await res.data.result.map((e: string) => ({
+        name: e,
+        id: e,
+      }));
+      option.push(...optionNew);
+      agencyOp.value = option;
+      // agencyOp.value = res.data.result;
+      await getData();
     })
     .catch((err) => {
       messageError($q, err);
@@ -296,7 +303,17 @@ onMounted(() => {
           option-label="name"
           @update:model-value="(formFilter.page = 1), getData()"
           style="min-width: 150px"
-        />
+          map-options
+          emit-value
+        >
+          <template v-if="formFilter.root" v-slot:append>
+            <q-icon
+              name="cancel"
+              @click.stop.prevent="(formFilter.root = null), fetchListOrg()"
+              class="cursor-pointer"
+            />
+          </template>
+        </q-select>
 
         <!-- <q-btn flat round dense icon="add" color="primary" @click="onAdd()">
           <q-tooltip>เพิ่ม</q-tooltip>
diff --git a/src/modules/15_development/views/History.vue b/src/modules/15_development/views/History.vue
index 75a360c4a..0d7b43f3f 100644
--- a/src/modules/15_development/views/History.vue
+++ b/src/modules/15_development/views/History.vue
@@ -38,7 +38,7 @@ const router = useRouter();
 const store = useDevelopmentDataStore();
 const $q = useQuasar();
 const { showLoader, hideLoader, messageError } = useCounterMixin();
-const agencyOp = ref<[]>([]);
+const agencyOp = ref<any[]>([]);
 const rows = ref<any[]>([]);
 
 const visibleColumns = ref<string[]>([
@@ -149,12 +149,19 @@ function fetchListOrg() {
   showLoader();
   http
     .get(config.API.developmentHistoryListOrg("officer", formFilter.year))
-    .then((res) => {
+    .then(async (res) => {
+      console.log(res);
       formFilter.root = null;
       formFilter.page = 1;
       rows.value = [];
-      agencyOp.value = res.data.result;
-      getData();
+      const option = [{ name: "ทั้งหมด", id: null }];
+      const optionNew = await res.data.result.map((e: string) => ({
+        name: e,
+        id: e,
+      }));
+      option.push(...optionNew);
+      agencyOp.value = option;
+      await getData();
     })
     .catch((err) => {
       messageError($q, err);
@@ -313,7 +320,16 @@ onMounted(() => {
           option-label="name"
           @update:model-value="(formFilter.page = 1), getData()"
           style="min-width: 150px"
-        />
+          map-options
+          emit-value
+        >
+          <template v-if="formFilter.root" v-slot:append>
+            <q-icon
+              name="cancel"
+              @click.stop.prevent="(formFilter.root = null), fetchListOrg()"
+              class="cursor-pointer"
+            /> </template
+        ></q-select>
       </q-toolbar>
       <q-toolbar class="col-4 q-pa-none q-gutter-x-sm">
         <q-space />
diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index 08cc9a588..2ec86f7e7 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -401,7 +401,7 @@ onMounted(() => {
 
           <q-space />
 
-          <q-btn
+          <!-- <q-btn
             flat
             round
             dense
@@ -410,7 +410,7 @@ onMounted(() => {
             @click="onDownload"
           >
             <q-tooltip>ดาวน์โหลด</q-tooltip>
-          </q-btn>
+          </q-btn> -->
 
           <q-input
             standout

From a3154508d0cf937ea772db0d2e670c4f325d2302 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Wed, 3 Jul 2024 14:02:37 +0700
Subject: [PATCH 04/13] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3/=E0=B8=AB=E0=B8=A5=E0=B8=B1=E0=B8=81=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=95=E0=B8=A3=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9D?=
 =?UTF-8?q?=E0=B8=B6=E0=B8=81=E0=B8=AD=E0=B8=9A=E0=B8=A3=E0=B8=A1=20?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=B4=E0=B8=94dialog=20=E0=B9=80=E0=B9=80=E0=B8=A5?=
 =?UTF-8?q?=E0=B9=89=E0=B8=A7=20=E0=B8=94=E0=B8=B6=E0=B8=87=E0=B8=82?=
 =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=81=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B8=A1=E0=B8=B2=20=E0=B8=96=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A1=E0=B8=B5=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80?=
 =?UTF-8?q?=E0=B9=80=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82=E0=B9=80=E0=B9=80?=
 =?UTF-8?q?=E0=B8=95=E0=B9=88=E0=B9=84=E0=B8=A1=E0=B9=88=20=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/14_KPI/components/Tab/Topic/02_Competency.vue | 4 ++--
 src/modules/15_development/components/Target.vue          | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue b/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
index 1dcad6a59..6e1e753d8 100644
--- a/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
+++ b/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
@@ -136,7 +136,7 @@ function getData(type: any) {
     .then(async (res) => {
       const data = res.data.result.data;
       rows.value[type] = data;
-      lists.value = await lists.value.filter((x: any) => x.type != type);
+      lists.value = lists.value.filter((x: any) => x.type != type);
       lists.value.push({ type: type, data });
     })
     .catch((e) => {
@@ -349,7 +349,7 @@ onMounted(() => {
         <d-table
           ref="table"
           :columns="columns"
-          :rows="rows[item.id]"
+          :rows="rows.length !== 0 ? rows[item.id]:[]"
           row-key="id"
           flat
           bordered
diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue
index 8d01b5644..5456cf4db 100644
--- a/src/modules/15_development/components/Target.vue
+++ b/src/modules/15_development/components/Target.vue
@@ -409,6 +409,8 @@ function onClickCloseDialog() {
   groupTargetData.targetData = [{}];
   modalRelate.value = false;
   cleanFormData();
+  fetchType();
+  fetchData(projectId.value);
 }
 
 /**
@@ -533,7 +535,7 @@ onMounted(() => {
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
+            <q-tr :props="props" class="cursor-pointer vertical-top">
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 <div v-if="col.name === 'posTypePlannedId'">
                   <div

From d8eef40faf9c71a8c1615a9c0d81907fe9a98097 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 14:46:44 +0700
Subject: [PATCH 05/13] fix bug

---
 .../15_development/components/Target.vue      | 241 +++++++++---------
 .../15_development/views/Scholarship.vue      |   6 +-
 2 files changed, 131 insertions(+), 116 deletions(-)

diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue
index 8d01b5644..7c1a10af0 100644
--- a/src/modules/15_development/components/Target.vue
+++ b/src/modules/15_development/components/Target.vue
@@ -29,7 +29,14 @@ const route = useRoute();
 const projectId = ref<string>(route.params.id.toLocaleString());
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { dialogRemove, showLoader, hideLoader, messageError, success } = mixin;
+const {
+  dialogRemove,
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+  dialogConfirm,
+} = mixin;
 const groupTargetData: any = reactive({
   targetData: [{}],
 });
@@ -269,123 +276,127 @@ function onClickOpenDialog(type: string, target: string) {
 }
 
 /** เพิ่ม/แก้ไขกลุ่มเป้าหมาย */
-async function onSubmitGroup() {
-  if (isTarget.value === "planned") {
-    await http
-      .put(
-        config.API.developmentMainTab(
-          isEdit.value ? "tab2_1_edit" : "tab2_1_add",
-          isEdit.value ? editId.value : projectId.value
-        ),
-        {
-          groupTarget: formGroupTarget.groupTarget,
-          groupTargetSub: formGroupTarget.groupTargetSub,
-          positions:
-            formGroupTarget.groupTarget !== "OUTSIDERS"
-              ? formGroupTarget.positions.map((v) => ({
-                  position: v.position ? v.position : "",
-                  posTypePlannedId: v.posTypeId ? v.posTypeId : "",
-                  posLevelPlannedId: v.posLevelId ? v.posLevelId : "",
-                }))
-              : [],
-          type:
-            formGroupTarget.groupTarget === "OUTSIDERS"
-              ? formGroupTarget.type
-              : "",
-          amount: formGroupTarget.amount,
-        }
-      )
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      });
-  } else {
-    await http
-      .put(
-        config.API.developmentMainTab(
-          isEdit.value ? "tab2_3_edit" : "tab2_3_add",
-          isEdit.value ? editId.value : projectId.value
-        ),
-        {
-          groupTarget: formGroupTarget.groupTarget,
-          groupTargetSub: formGroupTarget.groupTargetSub,
-          position: formGroupTarget.position,
-          posTypeActualId: formGroupTarget.posType,
-          posLevelActualId: formGroupTarget.posLevel,
-          type: formGroupTarget.type,
-          amount: formGroupTarget.amount,
-        }
-      )
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      });
-  }
-  setTimeout(() => {
-    fetchData(projectId.value);
-    onClickCloseDialog();
-  }, 100);
+function onSubmitGroup() {
+  dialogConfirm($q, async () => {
+    if (isTarget.value === "planned") {
+      await http
+        .put(
+          config.API.developmentMainTab(
+            isEdit.value ? "tab2_1_edit" : "tab2_1_add",
+            isEdit.value ? editId.value : projectId.value
+          ),
+          {
+            groupTarget: formGroupTarget.groupTarget,
+            groupTargetSub: formGroupTarget.groupTargetSub,
+            positions:
+              formGroupTarget.groupTarget !== "OUTSIDERS"
+                ? formGroupTarget.positions.map((v) => ({
+                    position: v.position ? v.position : "",
+                    posTypePlannedId: v.posTypeId ? v.posTypeId : "",
+                    posLevelPlannedId: v.posLevelId ? v.posLevelId : "",
+                  }))
+                : [],
+            type:
+              formGroupTarget.groupTarget === "OUTSIDERS"
+                ? formGroupTarget.type
+                : "",
+            amount: formGroupTarget.amount,
+          }
+        )
+        .then(() => {
+          success($q, "บันทึกข้อมูลสำเร็จ");
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    } else {
+      await http
+        .put(
+          config.API.developmentMainTab(
+            isEdit.value ? "tab2_3_edit" : "tab2_3_add",
+            isEdit.value ? editId.value : projectId.value
+          ),
+          {
+            groupTarget: formGroupTarget.groupTarget,
+            groupTargetSub: formGroupTarget.groupTargetSub,
+            position: formGroupTarget.position,
+            posTypeActualId: formGroupTarget.posType,
+            posLevelActualId: formGroupTarget.posLevel,
+            type: formGroupTarget.type,
+            amount: formGroupTarget.amount,
+          }
+        )
+        .then(() => {
+          success($q, "บันทึกข้อมูลสำเร็จ");
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    }
+    setTimeout(() => {
+      fetchData(projectId.value);
+      onClickCloseDialog();
+    }, 100);
+  });
 }
 
 /**  เพิ่มผู้เกี่ยวข้อง */
-async function onSubmitRelate() {
-  if (isTarget.value === "planned") {
-    await http
-      .put(
-        config.API.developmentMainTab(
-          isEdit.value ? "tab2_2_edit" : "tab2_2_add",
-          isEdit.value ? editId.value : projectId.value
-        ),
-        {
-          groupTarget: formGroupRelate.relate,
-          amount: formGroupRelate.amount,
-        }
-      )
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      });
-  } else {
-    await http
-      .put(
-        config.API.developmentMainTab(
-          isEdit.value ? "tab2_4_edit" : "tab2_4_add",
-          isEdit.value ? editId.value : projectId.value
-        ),
-        {
-          groupTarget: formGroupRelate.relate,
-          amount: formGroupRelate.amount,
-        }
-      )
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      });
-  }
-  setTimeout(() => {
-    fetchData(projectId.value);
-    onClickCloseDialog();
-  }, 100);
+function onSubmitRelate() {
+  dialogConfirm($q, async () => {
+    if (isTarget.value === "planned") {
+      await http
+        .put(
+          config.API.developmentMainTab(
+            isEdit.value ? "tab2_2_edit" : "tab2_2_add",
+            isEdit.value ? editId.value : projectId.value
+          ),
+          {
+            groupTarget: formGroupRelate.relate,
+            amount: formGroupRelate.amount,
+          }
+        )
+        .then(() => {
+          success($q, "บันทึกข้อมูลสำเร็จ");
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    } else {
+      await http
+        .put(
+          config.API.developmentMainTab(
+            isEdit.value ? "tab2_4_edit" : "tab2_4_add",
+            isEdit.value ? editId.value : projectId.value
+          ),
+          {
+            groupTarget: formGroupRelate.relate,
+            amount: formGroupRelate.amount,
+          }
+        )
+        .then(() => {
+          success($q, "บันทึกข้อมูลสำเร็จ");
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    }
+    setTimeout(() => {
+      fetchData(projectId.value);
+      onClickCloseDialog();
+    }, 100);
+  });
 }
 
 /** clear form */
diff --git a/src/modules/15_development/views/Scholarship.vue b/src/modules/15_development/views/Scholarship.vue
index 1886f754b..de08d05ec 100644
--- a/src/modules/15_development/views/Scholarship.vue
+++ b/src/modules/15_development/views/Scholarship.vue
@@ -270,7 +270,11 @@ onMounted(() => {
           label="เลือกประเภททุน"
           @update:model-value="fetchNewList"
           class="select_ellipsis"
-        />
+        >
+          <q-tooltip>{{
+            scholarshipTypeOp.find((e) => e.id === formQuery.type)?.name
+          }}</q-tooltip>
+        </q-select>
       </div>
 
       <q-btn

From 4dffaa5f0b6c28740af14500fff7dd45a393c8d6 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Wed, 3 Jul 2024 14:47:53 +0700
Subject: [PATCH 06/13] =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=87=20null=20?=
 =?UTF-8?q?=E0=B9=80=E0=B9=80=E0=B8=97=E0=B8=99=20=E0=B8=A7=E0=B9=88?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProjectDetail.vue              | 579 +++++++++---------
 1 file changed, 301 insertions(+), 278 deletions(-)

diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue
index 3049f8b1e..837b8ceca 100644
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@@ -156,7 +156,30 @@ async function onSubmit() {
   dialogConfirm($q, async () => {
     showLoader();
     await http
-      .put(config.API.developmentMainTab("tab3", projectId.value), formData)
+      .put(config.API.developmentMainTab("tab3", projectId.value), {
+        developmentProjectTypes: formData.developmentProjectTypes,
+        projectModal: formData.projectModal,
+        isBackPlanned: formData.isBackPlanned,
+        isHoldPlanned: formData.isHoldPlanned,
+        projectDayBackPlanned: formData.isBackPlanned ? formData.projectDayBackPlanned:null,
+        projectDayHoldPlanned: formData.projectDayHoldPlanned,
+        projectNigthHoldPlanned: formData.projectNigthHoldPlanned,
+        developmentProjectTechniquePlanneds:
+          formData.developmentProjectTechniquePlanneds,
+        isBackActual: formData.isBackActual,
+        isHoldActual: formData.isHoldActual,
+        projectDayBackActual: formData.projectDayBackActual,
+        projectDayHoldActual: formData.projectDayHoldActual,
+        projectNigthHoldActual: formData.projectNigthHoldActual,
+        developmentProjectTechniqueActuals:
+          formData.developmentProjectTechniqueActuals,
+        projectModalActual: formData.projectModalActual,
+        projectModalPlanned: formData.projectModalPlanned,
+        strategyChildPlannedId: formData.strategyChildPlannedId,
+        strategyChildPlannedNode: formData.strategyChildPlannedNode,
+        strategyChildActualId: formData.strategyChildActualId,
+        strategyChildActualNode: formData.strategyChildActualNode,
+      })
       .then(() => {
         success($q, "บันทึกข้อมูลสำเร็จ");
         fetchData();
@@ -210,322 +233,322 @@ onMounted(() => {
       </div>
 
 
-    <q-card bordered class="col-12 q-my-sm">
-      <div
-        class="col-xs-12 col-sm-12 text-weight-medium bg-grey-3 q-py-xs q-px-md"
-      >
-        ความสอดคล้องหรือเชื่อมโยงกับยุทธศาสตร์/แผน
-      </div>
-      <q-separator />
+      <q-card bordered class="col-12 q-my-sm">
+        <div
+          class="col-xs-12 col-sm-12 text-weight-medium bg-grey-3 q-py-xs q-px-md"
+        >
+          ความสอดคล้องหรือเชื่อมโยงกับยุทธศาสตร์/แผน
+        </div>
+        <q-separator />
 
-      <q-card-section>
-        <div class="row col-12 q-col-gutter-sm">
-          <div class="col-6">
-            <q-card bordered class="col-12">
-              <div
-                class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
-              >
-                ยุทธศาสตร์/แผน
-              </div>
-              <q-separator />
+        <q-card-section>
+          <div class="row col-12 q-col-gutter-sm">
+            <div class="col-6">
+              <q-card bordered class="col-12">
+                <div
+                  class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
+                >
+                  ยุทธศาสตร์/แผน
+                </div>
+                <q-separator />
 
-              <q-card-section class="q-pa-sm">
-                <q-input
-                  dense
-                  outlined
-                  v-model="filter"
-                  label="ค้นหา"
-                  class="inputgreen"
-                >
-                  <template v-slot:append>
-                    <q-icon
-                      v-if="filter !== ''"
-                      name="clear"
-                      class="cursor-pointer"
-                      @click="filter = ''"
-                    />
-                    <q-icon v-else name="search" color="grey-5" />
-                  </template>
-                </q-input>
-                <q-tree
-                  dense
-                  :nodes="nodes"
-                  selected-color="primary"
-                  node-key="id"
-                  label-key="name"
-                  :filter="filter"
-                  :no-results-label="notFound"
-                  :no-nodes-label="noData"
-                  v-model:expanded="expanded"
-                >
-                  <template v-slot:default-header="prop">
-                    <q-item
-                      clickable
-                      @click.stop="updateSelected(prop.node, '1')"
+                <q-card-section class="q-pa-sm">
+                  <q-input
+                    dense
+                    outlined
+                    v-model="filter"
+                    label="ค้นหา"
+                    class="inputgreen"
+                  >
+                    <template v-slot:append>
+                      <q-icon
+                        v-if="filter !== ''"
+                        name="clear"
+                        class="cursor-pointer"
+                        @click="filter = ''"
+                      />
+                      <q-icon v-else name="search" color="grey-5" />
+                    </template>
+                  </q-input>
+                  <q-tree
+                    dense
+                    :nodes="nodes"
+                    selected-color="primary"
+                    node-key="id"
+                    label-key="name"
+                    :filter="filter"
+                    :no-results-label="notFound"
+                    :no-nodes-label="noData"
+                    v-model:expanded="expanded"
+                  >
+                    <template v-slot:default-header="prop">
+                      <q-item
+                        clickable
+                        @click.stop="updateSelected(prop.node, '1')"
                       :active="formData.strategyChildPlannedId == prop.node.id"
-                      active-class="my-list-link text-primary text-weight-medium"
-                      class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
-                    >
-                      <div>
-                        <div class="text-weight-medium">
-                          {{ prop.node.name }}
+                        active-class="my-list-link text-primary text-weight-medium"
+                        class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
+                      >
+                        <div>
+                          <div class="text-weight-medium">
+                            {{ prop.node.name }}
+                          </div>
                         </div>
-                      </div>
-                    </q-item>
-                  </template>
-                </q-tree>
-              </q-card-section>
-            </q-card>
-          </div>
-          <div class="col-6">
-            <q-card bordered class="col-12">
-              <div
-                class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
-              >
-                ยุทธศาสตร์/แผน
-              </div>
-              <q-separator />
+                      </q-item>
+                    </template>
+                  </q-tree>
+                </q-card-section>
+              </q-card>
+            </div>
+            <div class="col-6">
+              <q-card bordered class="col-12">
+                <div
+                  class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
+                >
+                  ยุทธศาสตร์/แผน
+                </div>
+                <q-separator />
 
-              <q-card-section class="q-pa-sm">
-                <q-input
-                  dense
-                  outlined
-                  v-model="filter2"
-                  label="ค้นหา"
-                  class="inputgreen"
-                >
-                  <template v-slot:append>
-                    <q-icon
-                      v-if="filter2 !== ''"
-                      name="clear"
-                      class="cursor-pointer"
-                      @click="filter2 = ''"
-                    />
-                    <q-icon v-else name="search" color="grey-5" />
-                  </template>
-                </q-input>
-                <q-tree
-                  dense
-                  :nodes="nodes"
-                  node-key="id"
-                  label-key="name"
-                  :filter="filter2"
-                  :no-results-label="notFound"
-                  :no-nodes-label="noData"
-                  v-model:expanded="expanded2"
-                >
-                  <template v-slot:default-header="prop">
-                    <q-item
-                      clickable
-                      @click.stop="updateSelected(prop.node, '2')"
-                      :active="formData.strategyChildActualId == prop.node.id"
-                      active-class="my-list-link text-primary text-weight-medium"
-                      class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
-                    >
-                      <div>
-                        <div class="text-weight-medium">
-                          {{ prop.node.name }}
+                <q-card-section class="q-pa-sm">
+                  <q-input
+                    dense
+                    outlined
+                    v-model="filter2"
+                    label="ค้นหา"
+                    class="inputgreen"
+                  >
+                    <template v-slot:append>
+                      <q-icon
+                        v-if="filter2 !== ''"
+                        name="clear"
+                        class="cursor-pointer"
+                        @click="filter2 = ''"
+                      />
+                      <q-icon v-else name="search" color="grey-5" />
+                    </template>
+                  </q-input>
+                  <q-tree
+                    dense
+                    :nodes="nodes"
+                    node-key="id"
+                    label-key="name"
+                    :filter="filter2"
+                    :no-results-label="notFound"
+                    :no-nodes-label="noData"
+                    v-model:expanded="expanded2"
+                  >
+                    <template v-slot:default-header="prop">
+                      <q-item
+                        clickable
+                        @click.stop="updateSelected(prop.node, '2')"
+                        :active="formData.strategyChildActualId == prop.node.id"
+                        active-class="my-list-link text-primary text-weight-medium"
+                        class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
+                      >
+                        <div>
+                          <div class="text-weight-medium">
+                            {{ prop.node.name }}
+                          </div>
                         </div>
-                      </div>
-                    </q-item>
-                  </template>
-                </q-tree>
-              </q-card-section>
-            </q-card>
+                      </q-item>
+                    </template>
+                  </q-tree>
+                </q-card-section>
+              </q-card>
+            </div>
           </div>
+        </q-card-section>
+      </q-card>
+
+      <q-card bordered class="col-12 q-my-sm">
+        <div
+          class="col-xs-12 col-sm-12 text-weight-medium bg-grey-3 q-py-xs q-px-md"
+        >
+          รูปแบบโครงการ
         </div>
-      </q-card-section>
-    </q-card>
+        <q-separator />
 
-    <q-card bordered class="col-12 q-my-sm">
-      <div
-        class="col-xs-12 col-sm-12 text-weight-medium bg-grey-3 q-py-xs q-px-md"
-      >
-        รูปแบบโครงการ
-      </div>
-      <q-separator />
+        <q-card-section>
+          <div class="row col-12 q-col-gutter-sm">
+            <div class="col-6 q-col-gutter-sm">
+              <div class="col-12 text-bold">รูปแบบโครงการตามแผน</div>
 
-      <q-card-section>
-        <div class="row col-12 q-col-gutter-sm">
-          <div class="col-6 q-col-gutter-sm">
-            <div class="col-12 text-bold">รูปแบบโครงการตามแผน</div>
+              <div class="row col-12 q-col-gutter-sm">
+                <div class="col-12 col-md-3">
+                  <q-checkbox
+                    :disable="store.projectStatus === 'FINISH'"
+                    keep-color
+                    color="primary"
+                    dense
+                    value="GO_BLACK"
+                    label="ไป-กลับ"
+                    v-model="formData.isBackPlanned"
+                  ></q-checkbox>
+                </div>
+                <div class="col-12 col-md-4">
+                  <q-input
+                    :readonly="store.projectStatus === 'FINISH'"
+                    dense
+                    outlined
+                    v-model="formData.projectDayBackPlanned"
+                    label="จำนวน (วัน)"
+                    mask="#"
+                    reverse-fill-mask
+                    class="inputgreen"
+                  />
+                </div>
+              </div>
+              <div class="row col-12 q-col-gutter-sm">
+                <div class="col-12 col-md-3">
+                  <q-checkbox
+                    :disable="store.projectStatus === 'FINISH'"
+                    keep-color
+                    color="primary"
+                    dense
+                    value="HOLD"
+                    label="พักค้าง"
+                    v-model="formData.isHoldPlanned"
+                  ></q-checkbox>
+                </div>
+                <div class="col-12 col-md-4">
+                  <q-input
+                    :readonly="store.projectStatus === 'FINISH'"
+                    dense
+                    outlined
+                    v-model="formData.projectDayHoldPlanned"
+                    label="จำนวน (วัน)"
+                    mask="#"
+                    reverse-fill-mask
+                    class="inputgreen"
+                  />
+                </div>
+                <div class="col-12 col-md-4">
+                  <q-input
+                    :readonly="store.projectStatus === 'FINISH'"
+                    dense
+                    outlined
+                    v-model="formData.projectNigthHoldPlanned"
+                    label="จำนวน (คืน)"
+                    mask="#"
+                    class="inputgreen"
+                    reverse-fill-mask
+                  />
+                </div>
+              </div>
 
-            <div class="row col-12 q-col-gutter-sm">
-              <div class="col-12 col-md-3">
-                <q-checkbox
+              <div class="col-12 q-py-md">
+                <q-label class="q-mb-sm">เทคนิควิธีการที่ใช้ในการพัฒนา</q-label>
+                <q-option-group
                   :disable="store.projectStatus === 'FINISH'"
                   keep-color
                   color="primary"
                   dense
-                  value="GO_BLACK"
-                  label="ไป-กลับ"
-                  v-model="formData.isBackPlanned"
-                ></q-checkbox>
-              </div>
-              <div class="col-12 col-md-4">
-                <q-input
-                  :readonly="store.projectStatus === 'FINISH'"
-                  dense
-                  outlined
-                  v-model="formData.projectDayBackPlanned"
-                  label="จำนวน (วัน)"
-                  mask="#"
-                  reverse-fill-mask
-                  class="inputgreen"
+                  v-model="formData.developmentProjectTechniquePlanneds"
+                  :options="projectTechniquesOp"
+                  type="checkbox"
                 />
               </div>
-            </div>
-            <div class="row col-12 q-col-gutter-sm">
-              <div class="col-12 col-md-3">
-                <q-checkbox
+
+              <div class="col-12 col-sm-6 col-md-4">
+                <q-input
                   :disable="store.projectStatus === 'FINISH'"
-                  keep-color
-                  color="primary"
-                  dense
-                  value="HOLD"
-                  label="พักค้าง"
-                  v-model="formData.isHoldPlanned"
-                ></q-checkbox>
-              </div>
-              <div class="col-12 col-md-4">
-                <q-input
-                  :readonly="store.projectStatus === 'FINISH'"
                   dense
                   outlined
-                  v-model="formData.projectDayHoldPlanned"
-                  label="จำนวน (วัน)"
+                  v-model="formData.projectModalPlanned"
+                  label="จำนวน (รุ่น)"
                   mask="#"
                   reverse-fill-mask
                   class="inputgreen"
                 />
               </div>
-              <div class="col-12 col-md-4">
-                <q-input
-                  :readonly="store.projectStatus === 'FINISH'"
-                  dense
-                  outlined
-                  v-model="formData.projectNigthHoldPlanned"
-                  label="จำนวน (คืน)"
-                  mask="#"
-                  class="inputgreen"
-                  reverse-fill-mask
-                />
+            </div>
+
+            <div
+              v-if="store.projectStatus === 'FINISH'"
+              class="col-6 q-col-gutter-sm"
+            >
+              <div class="col-12 text-bold">รูปแบบโครงการตามจริง</div>
+
+              <div class="row col-12 q-col-gutter-sm">
+                <div class="col-md-3">
+                  <q-checkbox
+                    keep-color
+                    color="primary"
+                    dense
+                    value="GO_BLACK"
+                    label="ไป-กลับ"
+                    v-model="formData.isBackActual"
+                  ></q-checkbox>
+                </div>
+                <div class="col-12 col-md-4">
+                  <q-input
+                    dense
+                    outlined
+                    v-model="formData.projectDayBackActual"
+                    label="จำนวน (วัน)"
+                    mask="#"
+                    reverse-fill-mask
+                  />
+                </div>
               </div>
-            </div>
-
-            <div class="col-12 q-py-md">
-              <q-label class="q-mb-sm">เทคนิควิธีการที่ใช้ในการพัฒนา</q-label>
-              <q-option-group
-                :disable="store.projectStatus === 'FINISH'"
-                keep-color
-                color="primary"
-                dense
-                v-model="formData.developmentProjectTechniquePlanneds"
-                :options="projectTechniquesOp"
-                type="checkbox"
-              />
-            </div>
-
-            <div class="col-12 col-sm-6 col-md-4">
-              <q-input
-                :disable="store.projectStatus === 'FINISH'"
-                dense
-                outlined
-                v-model="formData.projectModalPlanned"
-                label="จำนวน (รุ่น)"
-                mask="#"
-                reverse-fill-mask
-                class="inputgreen"
-              />
-            </div>
-          </div>
-
-          <div
-            v-if="store.projectStatus === 'FINISH'"
-            class="col-6 q-col-gutter-sm"
-          >
-            <div class="col-12 text-bold">รูปแบบโครงการตามจริง</div>
-
-            <div class="row col-12 q-col-gutter-sm">
-              <div class="col-md-3">
-                <q-checkbox
+              <div class="row col-12 q-col-gutter-sm">
+                <div class="col-12 col-md-3">
+                  <q-checkbox
+                    keep-color
+                    color="primary"
+                    dense
+                    value="HOLD"
+                    label="พักค้าง"
+                    v-model="formData.isHoldActual"
+                  ></q-checkbox>
+                </div>
+                <div class="col-12 col-md-4">
+                  <q-input
+                    dense
+                    outlined
+                    v-model="formData.projectDayHoldActual"
+                    label="จำนวน (วัน)"
+                    mask="#"
+                    reverse-fill-mask
+                  />
+                </div>
+                <div class="col-12 col-md-4">
+                  <q-input
+                    dense
+                    outlined
+                    v-model="formData.projectNigthHoldActual"
+                    label="จำนวน (คืน)"
+                    mask="#"
+                    reverse-fill-mask
+                  />
+                </div>
+              </div>
+              <div class="col-12 q-py-md">
+                <q-label class="q-mb-sm">เทคนิควิธีการที่ใช้ในการพัฒนา</q-label>
+                <q-option-group
                   keep-color
                   color="primary"
                   dense
-                  value="GO_BLACK"
-                  label="ไป-กลับ"
-                  v-model="formData.isBackActual"
-                ></q-checkbox>
+                  v-model="formData.developmentProjectTechniqueActuals"
+                  :options="projectTechniquesOp"
+                  type="checkbox"
+                />
               </div>
-              <div class="col-12 col-md-4">
+              <div class="col-12 col-sm-6 col-md-4">
                 <q-input
                   dense
                   outlined
-                  v-model="formData.projectDayBackActual"
-                  label="จำนวน (วัน)"
+                  v-model="formData.projectModalActual"
+                  label="จำนวน (รุ่น)"
                   mask="#"
                   reverse-fill-mask
                 />
               </div>
             </div>
-            <div class="row col-12 q-col-gutter-sm">
-              <div class="col-12 col-md-3">
-                <q-checkbox
-                  keep-color
-                  color="primary"
-                  dense
-                  value="HOLD"
-                  label="พักค้าง"
-                  v-model="formData.isHoldActual"
-                ></q-checkbox>
-              </div>
-              <div class="col-12 col-md-4">
-                <q-input
-                  dense
-                  outlined
-                  v-model="formData.projectDayHoldActual"
-                  label="จำนวน (วัน)"
-                  mask="#"
-                  reverse-fill-mask
-                />
-              </div>
-              <div class="col-12 col-md-4">
-                <q-input
-                  dense
-                  outlined
-                  v-model="formData.projectNigthHoldActual"
-                  label="จำนวน (คืน)"
-                  mask="#"
-                  reverse-fill-mask
-                />
-              </div>
-            </div>
-            <div class="col-12 q-py-md">
-              <q-label class="q-mb-sm">เทคนิควิธีการที่ใช้ในการพัฒนา</q-label>
-              <q-option-group
-                keep-color
-                color="primary"
-                dense
-                v-model="formData.developmentProjectTechniqueActuals"
-                :options="projectTechniquesOp"
-                type="checkbox"
-              />
-            </div>
-            <div class="col-12 col-sm-6 col-md-4">
-              <q-input
-                dense
-                outlined
-                v-model="formData.projectModalActual"
-                label="จำนวน (รุ่น)"
-                mask="#"
-                reverse-fill-mask
-              />
-            </div>
           </div>
-        </div>
-      </q-card-section>
-    </q-card>
-  </div>
+        </q-card-section>
+      </q-card>
+    </div>
     <q-separator />
     <div class="text-right q-pa-sm">
       <q-btn

From 9a6d1b139fa957365733af50cec9f51b4d349e3e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 15:26:26 +0700
Subject: [PATCH 07/13] =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B8=A3=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=B2=20=3D>=20fix=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/02_qualify/manageDetail.vue         | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
index c97f9ce9c..b120d1a79 100644
--- a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
@@ -493,31 +493,33 @@ const fetchData = async (loading: boolean = true) => {
     )
     .then(async (res) => {
       const data = res.data.result;
-      total.value = data.total;
-      maxPage.value = await Math.ceil(data.total / pageSize.value);
-      maxPage.value = maxPage.value < 1 ? 1 : maxPage.value;
+      if (data.data) {
+        total.value = data.total;
+        maxPage.value = await Math.ceil(data.total / pageSize.value);
+        maxPage.value = maxPage.value < 1 ? 1 : maxPage.value;
 
-      rows.value = [];
-      data.data.map((r: any) => {
-        rows.value.push({
-          id: r.id,
-          fullname: `${r.prefixName}${r.firstName} ${r.lastName}`,
-          avatar: r.profileImg != null ? r.profileImg.detail : "",
-          citizenId: r.citizenId,
-          number: r.number,
-          registerDate: date2Thai(r.registerDate, false, true),
-          examIdenNumber: r.examIdenNumber,
-          seatNumber: r.seatNumber,
-          resultC: r.resultC,
-          resultB: r.resultB,
-          pass: r.pass,
-          email: r.email,
-          status: r.status,
-          position: `${r.positionName}${r.positionLevelName}`,
-          positionLevel: r.positionLevelName,
-          check: false,
+        rows.value = [];
+        data.data.map((r: any) => {
+          rows.value.push({
+            id: r.id,
+            fullname: `${r.prefixName}${r.firstName} ${r.lastName}`,
+            avatar: r.profileImg != null ? r.profileImg.detail : "",
+            citizenId: r.citizenId,
+            number: r.number,
+            registerDate: date2Thai(r.registerDate, false, true),
+            examIdenNumber: r.examIdenNumber,
+            seatNumber: r.seatNumber,
+            resultC: r.resultC,
+            resultB: r.resultB,
+            pass: r.pass,
+            email: r.email,
+            status: r.status,
+            position: `${r.positionName}${r.positionLevelName}`,
+            positionLevel: r.positionLevelName,
+            check: false,
+          });
         });
-      });
+      }
     })
     .catch((e) => {
       messageError($q, e);

From 5785ae6418d340e5e2b52e54ab2f982f16d2c578 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 16:09:25 +0700
Subject: [PATCH 08/13] =?UTF-8?q?KPI=20=3D>=20status=20=E0=B8=9C=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/14_KPI/store.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/modules/14_KPI/store.ts b/src/modules/14_KPI/store.ts
index 51dc1e937..8dbb5fb82 100644
--- a/src/modules/14_KPI/store.ts
+++ b/src/modules/14_KPI/store.ts
@@ -144,6 +144,16 @@ export const useKpiDataStore = defineStore("KPIDataAdmin", () => {
         return "ผ่านการประเมิน";
       case "NOTPASSED":
         return "ไม่ผ่านการประเมิน";
+      case "EXCELLENT":
+        return "ดีเด่น";
+      case "VERY_GOOD":
+        return "ดีมาก";
+      case "GOOD":
+        return "ดี";
+      case "FAIR":
+        return "พอใช้ ";
+      case "IMPROVEMENT":
+        return "ต้องปรับปรุง";
       default:
         break;
     }

From ca213d6c76416be364ad4d62458164663a506cdc Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 16:20:20 +0700
Subject: [PATCH 09/13] fix bug

---
 src/modules/15_development/views/MainPage.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index 2ec86f7e7..65b54bc4e 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -175,18 +175,21 @@ function closeDialog() {
 }
 
 /** dialog submit */
-function onSubmit() {
+async function onSubmit() {
   if (formProject.nodeId) {
-    http
+    await showLoader();
+    await http
       .post(config.API.developmentMain, formProject)
       .then((res) => {
-        closeDialog();
         router.push(`/development/${res.data.result}`);
       })
       .catch((e) => {
         messageError($q, e);
       })
-      .finally(() => {});
+      .finally(async () => {
+        await closeDialog();
+        await hideLoader();
+      });
   } else {
     dialogMessageNotify($q, "กรุณาเลือกหน่วยงานที่รับผิดชอบ");
   }

From efc6b4db9841e27cbfba01b850299866d6887426 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 16:28:40 +0700
Subject: [PATCH 10/13] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=20=3D>=20=E0=B9=80=E0=B8=9E=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A1=20Dialogconfrim?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/15_development/views/MainPage.vue | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index 65b54bc4e..c16fa86d8 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -28,8 +28,13 @@ import { useCounterMixin } from "@/stores/mixin";
 /** use*/
 const $q = useQuasar();
 const router = useRouter();
-const { showLoader, hideLoader, messageError, dialogMessageNotify } =
-  useCounterMixin();
+const {
+  showLoader,
+  hideLoader,
+  messageError,
+  dialogMessageNotify,
+  dialogConfirm,
+} = useCounterMixin();
 
 const node = ref<any>([]);
 const expanded = ref<string[]>([]);
@@ -177,19 +182,21 @@ function closeDialog() {
 /** dialog submit */
 async function onSubmit() {
   if (formProject.nodeId) {
-    await showLoader();
-    await http
-      .post(config.API.developmentMain, formProject)
-      .then((res) => {
-        router.push(`/development/${res.data.result}`);
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(async () => {
-        await closeDialog();
-        await hideLoader();
-      });
+    dialogConfirm($q, async () => {
+      await showLoader();
+      await http
+        .post(config.API.developmentMain, formProject)
+        .then(async (res) => {
+          await closeDialog();
+          await router.push(`/development/${res.data.result}`);
+        })
+        .catch((e) => {
+          messageError($q, e);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    });
   } else {
     dialogMessageNotify($q, "กรุณาเลือกหน่วยงานที่รับผิดชอบ");
   }
@@ -513,7 +520,7 @@ onMounted(() => {
 
   <q-dialog persistent v-model="modal">
     <q-card flat bordered style="min-width: 60vw">
-      <q-form greedy @submit.prevent @validation-success="onSubmit">
+      <q-form greedy @submit.prevent @validation-success="onSubmit()">
         <DialogHeader
           tittle="เพิ่มโครงการ/หลักสูตรการฝึกอบรม"
           :close="closeDialog"

From 04385785f07c6dca6d62231a0ac8804aa9227db6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 18:14:44 +0700
Subject: [PATCH 11/13] =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=20=3D>=20?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3=E0=B8=B2=E0=B9=80=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/13_salary/views/salaryEmployeeRate.vue |  9 ++++++---
 src/modules/13_salary/views/salaryRate.vue         | 10 +++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/modules/13_salary/views/salaryEmployeeRate.vue b/src/modules/13_salary/views/salaryEmployeeRate.vue
index 2b710dd65..5b6631117 100644
--- a/src/modules/13_salary/views/salaryEmployeeRate.vue
+++ b/src/modules/13_salary/views/salaryEmployeeRate.vue
@@ -107,15 +107,18 @@ const pagination = ref({
   rowsPerPage: formFilter.pageSize,
 });
 const isActive = ref<boolean>(false);
+const group = ref<string>("");
 
 function fetchDataDetail() {
   http
     .get(config.API.salaryEmployeeChartByid(salaryEmployeeId.value))
     .then((res) => {
       isActive.value = res.data.result.isActive;
+      group.value = `กลุ่มที่ ${res.data.result.group}`;
     })
-    .catch((e) => {})
-    .finally(() => {});
+    .catch((e) => {
+      messageError($q, e);
+    });
 }
 
 function fetchSalalyEmployeeRate() {
@@ -240,7 +243,7 @@ onMounted(() => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราค่าจ้าง
+      อัตราค่าจ้าง {{ group }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">
diff --git a/src/modules/13_salary/views/salaryRate.vue b/src/modules/13_salary/views/salaryRate.vue
index f83272217..eeaf18461 100644
--- a/src/modules/13_salary/views/salaryRate.vue
+++ b/src/modules/13_salary/views/salaryRate.vue
@@ -34,6 +34,8 @@ const {
 } = useCounterMixin();
 
 const isActive = ref<boolean>(false);
+const posType = ref<string>("");
+
 const salaryId = ref<string>(route.params.id.toString());
 
 /** modalDialog*/
@@ -209,9 +211,11 @@ function fetchList() {
     .get(config.API.salaryChartByid(salaryId.value))
     .then((res) => {
       isActive.value = res.data.result.isActive;
+      posType.value = `${res.data.result.posTypeName}(${res.data.result.posLevelName})`;
     })
-    .catch((e) => {})
-    .finally(() => {});
+    .catch((e) => {
+      messageError($q, e);
+    });
 }
 onMounted(async () => {
   await fetchList();
@@ -236,7 +240,7 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราเงินเดือน
+      อัตราเงินเดือน {{ posType }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">

From af8937c29fb55bf1763f591093a787bba7ba72f6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 18:16:33 +0700
Subject: [PATCH 12/13] fix

---
 src/modules/13_salary/views/salaryEmployeeRate.vue | 2 +-
 src/modules/13_salary/views/salaryRate.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/13_salary/views/salaryEmployeeRate.vue b/src/modules/13_salary/views/salaryEmployeeRate.vue
index 5b6631117..95b393422 100644
--- a/src/modules/13_salary/views/salaryEmployeeRate.vue
+++ b/src/modules/13_salary/views/salaryEmployeeRate.vue
@@ -243,7 +243,7 @@ onMounted(() => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราค่าจ้าง {{ group }}
+      อัตราค่าจ้าง ของ{{ group }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">
diff --git a/src/modules/13_salary/views/salaryRate.vue b/src/modules/13_salary/views/salaryRate.vue
index eeaf18461..af6a9f1f9 100644
--- a/src/modules/13_salary/views/salaryRate.vue
+++ b/src/modules/13_salary/views/salaryRate.vue
@@ -240,7 +240,7 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราเงินเดือน {{ posType }}
+      อัตราเงินเดือน ของ{{ posType }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">

From ef6b015113bb80c43a3dbb6f60d9d10e1fc62caa Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 3 Jul 2024 22:52:40 +0700
Subject: [PATCH 13/13] fixing report probation

---
 .../probation/FormEvaluation/FormReport.vue          |  9 +++++++--
 .../probation/FormEvaluation/Template1.vue           | 12 ++++++------
 .../probation/FormEvaluation/Template1Commader.vue   | 10 ++++------
 .../probation/FormEvaluation/Template2.vue           |  8 +++-----
 .../probation/FormEvaluation/Template2Format2.vue    |  8 +++-----
 5 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index dc1b27742..23ce76382 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -5,6 +5,8 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useRoute, useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import { useProbationDataStore } from "@/modules/05_placement/storeProbation";
+const probationStore = useProbationDataStore();
 
 const $q = useQuasar();
 const myForm = ref<any>(null);
@@ -39,7 +41,7 @@ const reson52 = ref<string>("");
 const chairman_dated = ref<Date>();
 const director1_dated = ref<any>("");
 const director2_dated = ref<any>("");
-const fullname = ref<string>("");
+// const fullname = ref<string>("");
 const director_id = ref<any>(null);
 const director_id2 = ref<any>(null);
 const director_id3 = ref<any>(null);
@@ -158,7 +160,10 @@ async function clickdownloadFile(type: string) {
       responseType: "blob",
     })
     .then((res) => {
-      downloadFile(res, `แบบรายงานการประเมินฯ_${fullname.value}.${type}`);
+      downloadFile(
+        res,
+        `แบบรายงานการประเมินฯ_${probationStore.person.name}.${type}`
+      );
     })
     .catch(async (e) => {
       messageError($q, JSON.parse(await e.response.data.text()));
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
index 6f8d0988b..acfbe8b3d 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
@@ -29,7 +29,7 @@ const mixin = useCounterMixin();
 const { showLoader, hideLoader, messageError } = mixin;
 const assignId = ref<string>(route.params.form.toString());
 const personalId = ref<string>(route.params.personalId.toString());
-const fullname = ref<string>("");
+// const fullname = ref<string>("");
 const tab = ref<string>("save1");
 const dataArrayNumber = ref<number>();
 const dataRole = ref<string>("mentor");
@@ -43,9 +43,9 @@ async function fecthAssign(id: string) {
     .get(config.API.formevaluate(id))
     .then(async (res: any) => {
       await fecthdataAssign(res.data.data);
-      fullname.value = res.data.data.experimentee
-        ? res.data.data.experimentee.name
-        : "";
+      // fullname.value = res.data.data.experimentee
+      //   ? res.data.data.experimentee.name
+      //   : "";
       dataArrayNumber.value = 1;
     })
     .catch((e: any) => {
@@ -91,7 +91,7 @@ async function FileDownload(type: string) {
       .then(async (res) => {
         downloadFile(
           res,
-          `แบบบันทึกผล(ผู้ดูเเล)_${fullname.value}_ครั้งที่${numTab.no}.${type}`
+          `แบบบันทึกผล(ผู้ดูเเล)_${probationStore.person.name}_ครั้งที่${numTab.no}.${type}`
         );
       })
       .catch(async (e) => {
@@ -110,7 +110,7 @@ async function FileDownload(type: string) {
       .then(async (res) => {
         downloadFile(
           res,
-          `แบบบันทึกผล(ผู้บังคับบัญชา)_${fullname.value}_ครั้งที่${numTab.no}.${type}`
+          `แบบบันทึกผล(ผู้บังคับบัญชา)_${probationStore.person.name}_ครั้งที่${numTab.no}.${type}`
         );
       })
       .catch(async (e) => {
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
index 41ee396bc..5a37fbae6 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
@@ -29,7 +29,7 @@ const mixin = useCounterMixin();
 const { showLoader, hideLoader, messageError } = mixin;
 const assignId = ref<string>(route.params.form.toString());
 const personalId = ref<string>(route.params.personalId.toString());
-const fullname = ref<string>("");
+// const fullname = ref<string>("");
 const tab = ref<string>("save1");
 const dataArrayNumber = ref<number>();
 const dataRole = ref<string>("mentor");
@@ -48,9 +48,7 @@ async function fecthAssign(id: string) {
     .get(config.API.formevaluateCommander(id))
     .then(async (res: any) => {
       await fecthdataAssign(res.data.data);
-      fullname.value = res.data.data.experimentee
-        ? res.data.data.experimentee.name
-        : "";
+      // fullname.value = res.data.person ? res.data.person.name : "";
       dataArrayNumber.value = 1;
     })
     .catch((e: any) => {
@@ -99,7 +97,7 @@ async function FileDownload(type: string) {
       .then(async (res) => {
         downloadFile(
           res,
-          `แบบบันทึกผล(ผู้บังคับบัญชา)_${fullname.value}_ครั้งที่${numTab.no}.${type}`
+          `แบบบันทึกผล(ผู้บังคับบัญชา)_${probationStore.person.name}_ครั้งที่${numTab.no}.${type}`
         );
       })
       .catch(async (e) => {
@@ -118,7 +116,7 @@ async function FileDownload(type: string) {
       .then(async (res) => {
         downloadFile(
           res,
-          `แบบบันทึกผล(ผู้บังคับบัญชา)_${fullname.value}_ครั้งที่${numTab.no}.${type}`
+          `แบบบันทึกผล(ผู้บังคับบัญชา)_${probationStore.person.name}_ครั้งที่${numTab.no}.${type}`
         );
       })
       .catch(async (e) => {
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
index ba36db23a..124e59ddc 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
@@ -29,7 +29,7 @@ const probationStore = useProbationDataStore();
 const { fecthdataAssign } = probationStore;
 const assignId = ref<string>(route.params.form.toString());
 const personalId = ref<string>(route.params.personalId.toString());
-const fullname = ref<string>("");
+// const fullname = ref<string>("");
 const tab = ref<string>("save1");
 const tabs = ref<any>([]);
 const dataArrayNumber = ref<number>(1);
@@ -60,9 +60,7 @@ async function fecthAssign(id: string) {
       await fecthdataAssign(res.data.data);
       evaluate.value = probationStore.evaluate;
       tabs.value = evaluate.value;
-      fullname.value = res.data.data.experimentee
-        ? res.data.data.experimentee.name
-        : "";
+      // fullname.value = res.data.data.person ? res.data.data.person.name : "";
       dataArrayNumber.value = 1;
     })
     .catch((e: any) => {
@@ -98,7 +96,7 @@ async function FileDownload(type: string) {
     .then(async (res) => {
       downloadFile(
         res,
-        `แบบประเมินผล(ผู้บังคับบัญชา)_${fullname.value}_ครั้งที่${numTab.no}.${type}`
+        `แบบประเมินผล(ผู้บังคับบัญชา)_${probationStore.person.name}_ครั้งที่${numTab.no}.${type}`
       );
     })
     .catch(async (e) => {
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
index 989e24a4e..8deccf166 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
@@ -30,7 +30,7 @@ const { showLoader, hideLoader, messageError, success } = mixin;
 const assignId = ref<string>(route.params.form.toString());
 const personalId = ref<string>(route.params.personalId.toString());
 
-const fullname = ref<string>("");
+// const fullname = ref<string>("");
 const tab = ref<string>("save1");
 const tabs = ref<any>([]);
 const dataArrayNumber = ref<number>(1);
@@ -47,9 +47,7 @@ const fecthAssign = async (id: string) => {
     .then(async (res: any) => {
       await fecthdataAssign(res.data.data);
       evaluate.value = probationStore.evaluate;
-      fullname.value = res.data.data.experimentee
-        ? res.data.data.experimentee.name
-        : "";
+      // fullname.value = res.data.data.person ? res.data.data.person.name : "";
       tabs.value = evaluate.value;
       dataArrayNumber.value = 1;
     })
@@ -80,7 +78,7 @@ const FileDownload = async (type: string) => {
     .then(async (res) => {
       downloadFile(
         res,
-        `แบบประเมินผล(คณะกรรมการ)_${fullname.value}_ครั้งที่${numTab.no}.${type}`
+        `แบบประเมินผล(คณะกรรมการ)_${probationStore.person.name}_ครั้งที่${numTab.no}.${type}`
       );
     })
     .catch(async (e) => {