From fdda661a3fc74952758d7d1a8f2b40a6e419abc7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 6 Feb 2024 16:53:53 +0700
Subject: [PATCH 1/6] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20Tree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogMovePos.vue              |  33 +-
 .../components/listView.vue                   |   4 +-
 .../components/mainTree.vue                   | 297 +++++++++---------
 3 files changed, 182 insertions(+), 152 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogMovePos.vue b/src/modules/02_organizationalNew/components/DialogMovePos.vue
index 792d871c5..d09b60813 100644
--- a/src/modules/02_organizationalNew/components/DialogMovePos.vue
+++ b/src/modules/02_organizationalNew/components/DialogMovePos.vue
@@ -10,6 +10,7 @@ import type {
   PosMaster2,
 } from "@/modules/02_organizationalNew/interface/response/organizational";
 import type { MovePos } from "@/modules/02_organizationalNew/interface/request/organizational";
+import type { DataTree } from "@/modules/02_organizationalNew/interface/index/organizational";
 
 import HeaderDialog from "@/components/DialogHeader.vue";
 
@@ -61,8 +62,9 @@ function resetFilter() {
   filterRef.value.focus();
 }
 
-function updateSelected(orgLevel: number) {
-  levelTree.value = orgLevel;
+function updateSelected(data: DataTree) {
+  levelTree.value = data.orgLevel;
+  selectedTree.value = data.orgTreeId;
 }
 
 const isDisable = computed(() => {
@@ -115,6 +117,10 @@ watch(
     if (modal.value && props.type === "SINGER") {
       const data = rows.value.filter((e: PosMaster2) => e.id === props.rowId);
       selectedFilter.value = data;
+      selectedTree.value = "";
+    } else {
+      selectedFilter.value = [];
+      selectedTree.value = "";
     }
   }
 );
@@ -225,13 +231,16 @@ watch(
               :filter="filterTree"
               no-results-label="ไม่พบข้อมูลที่ค้นหา"
               no-nodes-label="ไม่มีข้อมูล"
-              v-model:selected="selectedTree"
             >
               <template v-slot:default-header="prop">
                 <!--แสดงชื่อแผนก พิมพ์ตัวหนา คลิกแล้วกาง/หุบ Tree-->
-                <div
-                  class="row items-center q-px-xs q-pt-xs q-gutter-sm"
-                  @click="updateSelected(prop.node.orgLevel)"
+
+                <q-item
+                  clickable
+                  :active="selectedTree == prop.node.orgTreeId"
+                  @click.stop="updateSelected(prop.node)"
+                  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">
@@ -246,7 +255,7 @@ watch(
                       }}
                     </div>
                   </div>
-                </div>
+                </q-item>
               </template>
             </q-tree>
           </q-card>
@@ -271,4 +280,12 @@ watch(
   </q-dialog>
 </template>
 
-<style scoped></style>
+<style scoped>
+.my-list-link {
+  color: rgb(118, 168, 222);
+  border-radius: 5px;
+  background: #a3d3fb48 !important;
+  font-weight: 600;
+  border: 1px solid rgba(175, 185, 196, 0.217);
+}
+</style>
diff --git a/src/modules/02_organizationalNew/components/listView.vue b/src/modules/02_organizationalNew/components/listView.vue
index 365ad22db..e87fb1c29 100644
--- a/src/modules/02_organizationalNew/components/listView.vue
+++ b/src/modules/02_organizationalNew/components/listView.vue
@@ -59,8 +59,8 @@ async function fetchDataTree(id: string) {
     .then((res) => {
       const data = res.data.result;
       nodeTree.value = data;
-      selected.value = "";
-      nodeId.value = "";
+      // selected.value = "";
+      // nodeId.value = "";
     })
     .catch((err) => {
       messageError($q, err);
diff --git a/src/modules/02_organizationalNew/components/mainTree.vue b/src/modules/02_organizationalNew/components/mainTree.vue
index 156b02ce6..d82a32bd8 100644
--- a/src/modules/02_organizationalNew/components/mainTree.vue
+++ b/src/modules/02_organizationalNew/components/mainTree.vue
@@ -99,20 +99,21 @@ const orgId = ref<string>("");
 function updateSelected(data: DataTree) {
   store.treeId = data.orgTreeId;
   store.level = data.orgLevel;
-  if (data.orgTreeId === nodeId.value) {
-    nodeId.value = "";
-  } else {
-    nodeId.value = data.orgTreeId ? data.orgTreeId : "";
-    data.orgTreeId &&
-      props.fetchDataTable?.(data.orgTreeId, data.orgLevel, true);
-    store.getSumPosition({
-      totalPosition: data.totalPosition,
-      totalPositionCurrentUse: data.totalPositionCurrentUse,
-      totalPositionCurrentVacant: data.totalPositionCurrentVacant,
-      totalPositionNextUse: data.totalPositionNextUse,
-      totalPositionNextVacant: data.totalPositionNextVacant,
-    });
-  }
+  // if (data.orgTreeId === nodeId.value) {
+  //   nodeId.value = "";
+  // } else {
+  nodeId.value = data.orgTreeId ? data.orgTreeId : "111";
+
+  data.orgTreeId && props.fetchDataTable?.(data.orgTreeId, data.orgLevel, true);
+  store.getSumPosition({
+    totalPosition: data.totalPosition,
+    totalPositionCurrentUse: data.totalPositionCurrentUse,
+    totalPositionCurrentVacant: data.totalPositionCurrentVacant,
+    totalPositionNextUse: data.totalPositionNextUse,
+    totalPositionNextVacant: data.totalPositionNextVacant,
+  });
+
+  // }
 }
 
 const breakLoop = ref<boolean>(false);
@@ -349,6 +350,8 @@ watch(
     nodes.value = nodeTEST.value;
   }
 );
+
+const modaeMenu = ref<boolean>(false);
 </script>
 
 <template>
@@ -389,7 +392,6 @@ watch(
           class="q-pa-sm q-gutter-sm"
           dense
           default-expand-all
-          selected-color="primary"
           :nodes="lazy"
           node-key="orgTreeId"
           label-key="orgTreeName"
@@ -397,16 +399,15 @@ watch(
           :no-results-label="notFound"
           :no-nodes-label="noData"
           v-model:expanded="expanded"
-          v-model:selected="selected"
         >
           <template v-slot:default-header="prop">
-            <!-- {{ prop.node.orgTreeName }} -->
-
-            <div
-              class="row items-center q-px-xs q-pt-xs q-gutter-sm"
-              @click="updateSelected(prop.node)"
+            <q-item
+              clickable
+              :active="nodeId == prop.node.orgTreeId"
+              @click.stop="updateSelected(prop.node)"
+              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"
             >
-              <!--แสดงชื่อแผนก พิมพ์ตัวหนา คลิกแล้วกาง/หุบ Tree-->
               <div>
                 <div class="text-weight-medium">
                   {{ prop.node.orgTreeName }}
@@ -420,132 +421,136 @@ watch(
                   }}
                 </div>
               </div>
-            </div>
 
-            <!-- v-if="store.typeOrganizational === 'draft' && !store.isPublic" -->
-            <q-btn
-              v-if="store.typeOrganizational === 'draft'"
-              flat
-              dense
-              icon="mdi-dots-vertical"
-              class="q-ml-xs"
-              color="grey-13"
-              size="12px"
-              round
-            >
-              <q-menu>
-                <q-list
-                  dense
-                  v-for="(item, index) in prop.node.orgLevel === 4
-                    ? listAdd.slice(1, 6)
-                    : listAdd"
-                  :key="index"
-                  style="min-width: 100px"
-                >
-                  <q-item
-                    clickable
-                    v-close-popup
-                    @click="
-                      item.type === 'EDIT'
-                        ? onClickEdit(prop.node)
-                        : item.type === 'ADD'
-                        ? onClickAgency(prop.node.orgLevel + 1, prop.node)
-                        : item.type === 'DETAIL'
-                        ? onClickDetail(prop.node.orgTreeId, prop.node.orgLevel)
-                        : item.type === 'DEL'
-                        ? onClickDel(
-                            prop.node.orgLevel,
-                            prop.node.orgTreeId,
-                            prop.node.orgRootId
-                          )
-                        : item.type === 'SORT'
-                        ? onClickSort(prop.node.orgRootId, prop.node.orgLevel)
-                        : item.type === 'HISTORY'
-                        ? onClickHistory(
-                            prop.node.orgLevel,
-                            prop.node.orgTreeId
-                          )
-                        : null
-                    "
+              <q-btn
+                v-if="store.typeOrganizational === 'draft'"
+                flat
+                dense
+                icon="mdi-dots-vertical"
+                class="q-ml-xs"
+                color="grey-13"
+                size="12px"
+                round
+              >
+                <q-menu>
+                  <q-list
+                    dense
+                    v-for="(item, index) in prop.node.orgLevel === 4
+                      ? listAdd.slice(1, 6)
+                      : listAdd"
+                    :key="index"
+                    style="min-width: 100px"
                   >
-                    <q-item-section avatar style="min-width: 20px">
-                      <q-icon
-                        size="17px"
-                        :color="item.color"
-                        :name="item.icon"
-                      />
-                    </q-item-section>
-                    <div v-if="prop.node.orgLevel === 0">
-                      <q-item-section
-                        v-if="
-                          item.type === 'EDIT' ||
-                          item.type === 'DEL' ||
-                          item.type === 'HISTORY' ||
-                          item.type === 'SORT'
-                        "
-                      >
-                        {{ item.label }}หน่วยงาน
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click="
+                        item.type === 'EDIT'
+                          ? onClickEdit(prop.node)
+                          : item.type === 'ADD'
+                          ? onClickAgency(prop.node.orgLevel + 1, prop.node)
+                          : item.type === 'DETAIL'
+                          ? onClickDetail(
+                              prop.node.orgTreeId,
+                              prop.node.orgLevel
+                            )
+                          : item.type === 'DEL'
+                          ? onClickDel(
+                              prop.node.orgLevel,
+                              prop.node.orgTreeId,
+                              prop.node.orgRootId
+                            )
+                          : item.type === 'SORT'
+                          ? onClickSort(prop.node.orgRootId, prop.node.orgLevel)
+                          : item.type === 'HISTORY'
+                          ? onClickHistory(
+                              prop.node.orgLevel,
+                              prop.node.orgTreeId
+                            )
+                          : null
+                      "
+                    >
+                      <q-item-section avatar style="min-width: 20px">
+                        <q-icon
+                          size="17px"
+                          :color="item.color"
+                          :name="item.icon"
+                        />
                       </q-item-section>
-                      <q-item-section v-else-if="item.type === 'ADD'">
-                        {{ item.label }}ส่วนราชการ
-                      </q-item-section>
-                      <q-item-section v-else> {{ item.label }} </q-item-section>
-                    </div>
+                      <div v-if="prop.node.orgLevel === 0">
+                        <q-item-section
+                          v-if="
+                            item.type === 'EDIT' ||
+                            item.type === 'DEL' ||
+                            item.type === 'HISTORY' ||
+                            item.type === 'SORT'
+                          "
+                        >
+                          {{ item.label }}หน่วยงาน
+                        </q-item-section>
+                        <q-item-section v-else-if="item.type === 'ADD'">
+                          {{ item.label }}ส่วนราชการ
+                        </q-item-section>
+                        <q-item-section v-else>
+                          {{ item.label }}
+                        </q-item-section>
+                      </div>
 
-                    <div v-else>
-                      <q-item-section
-                        v-if="
-                          item.type === 'ADD' ||
-                          item.type === 'EDIT' ||
-                          item.type === 'DEL' ||
-                          item.type === 'HISTORY' ||
-                          item.type === 'SORT'
-                        "
-                        >{{ item.label }}ส่วนราชการ</q-item-section
-                      >
-                      <q-item-section v-else>{{ item.label }}</q-item-section>
-                    </div>
-                  </q-item>
-                </q-list>
-              </q-menu>
-            </q-btn>
+                      <div v-else>
+                        <q-item-section
+                          v-if="
+                            item.type === 'ADD' ||
+                            item.type === 'EDIT' ||
+                            item.type === 'DEL' ||
+                            item.type === 'HISTORY' ||
+                            item.type === 'SORT'
+                          "
+                          >{{ item.label }}ส่วนราชการ</q-item-section
+                        >
+                        <q-item-section v-else>{{ item.label }}</q-item-section>
+                      </div>
+                    </q-item>
+                  </q-list>
+                </q-menu>
+              </q-btn>
 
-            <q-btn
-              v-else
-              flat
-              dense
-              icon="mdi-dots-vertical"
-              class="q-pa-none q-ml-xs"
-              color="grey-13"
-              size="12px"
-              round
-            >
-              <q-menu>
-                <q-list
-                  dense
-                  v-for="(item, index) in listAdd.slice(5, 6)"
-                  :key="index"
-                  style="min-width: 100px"
-                >
-                  <q-item
-                    clickable
-                    v-close-popup
-                    @click="
-                      onClickDetail(prop.node.orgTreeId, prop.node.orgLevel)
-                    "
+              <q-btn
+                v-else
+                flat
+                dense
+                icon="mdi-dots-vertical"
+                class="q-pa-none q-ml-xs"
+                color="grey-13"
+                size="12px"
+                round
+              >
+                <q-menu>
+                  <q-list
+                    dense
+                    v-for="(item, index) in listAdd.slice(5, 6)"
+                    :key="index"
+                    style="min-width: 100px"
                   >
-                    <q-item-section avatar style="min-width: 20px">
-                      <q-icon
-                        size="17px"
-                        :color="item.color"
-                        :name="item.icon"
-                      />
-                    </q-item-section>
-                    <q-item-section>{{ item.label }}</q-item-section>
-                  </q-item>
-                </q-list>
-              </q-menu>
-            </q-btn>
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click="
+                        onClickDetail(prop.node.orgTreeId, prop.node.orgLevel)
+                      "
+                    >
+                      <q-item-section avatar style="min-width: 20px">
+                        <q-icon
+                          size="17px"
+                          :color="item.color"
+                          :name="item.icon"
+                        />
+                      </q-item-section>
+                      <q-item-section>{{ item.label }}</q-item-section>
+                    </q-item>
+                  </q-list>
+                </q-menu>
+              </q-btn>
+            </q-item>
           </template>
         </q-tree>
       </div>
@@ -590,4 +595,12 @@ watch(
   border: 1px solid #e6e6e7;
   border-radius: 10px;
 }
+
+.my-list-link {
+  color: rgb(118, 168, 222);
+  border-radius: 5px;
+  background: #a3d3fb48 !important;
+  font-weight: 600;
+  border: 1px solid rgba(175, 185, 196, 0.217);
+}
 </style>

From d06b0520ba858aca7a082b0212445e8c5fc74f70 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 6 Feb 2024 16:54:16 +0700
Subject: [PATCH 2/6] no message

---
 src/modules/02_organizationalNew/components/listView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/listView.vue b/src/modules/02_organizationalNew/components/listView.vue
index e87fb1c29..365ad22db 100644
--- a/src/modules/02_organizationalNew/components/listView.vue
+++ b/src/modules/02_organizationalNew/components/listView.vue
@@ -59,8 +59,8 @@ async function fetchDataTree(id: string) {
     .then((res) => {
       const data = res.data.result;
       nodeTree.value = data;
-      // selected.value = "";
-      // nodeId.value = "";
+      selected.value = "";
+      nodeId.value = "";
     })
     .catch((err) => {
       messageError($q, err);

From 9e27068e1ebbfc24cab693ebdb08bc8dd6158c75 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 6 Feb 2024 17:07:22 +0700
Subject: [PATCH 3/6] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=89?=
 =?UTF-8?q?=E0=B8=A1=20validate=20=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81=E0=B8=95=E0=B8=B3=E0=B9=81?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogFormPosition.vue                  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
index 1bc99c156..2a2ce85a9 100644
--- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
@@ -46,6 +46,7 @@ const {
   messageError,
   success,
   dialogRemove,
+  dialogMessageNotify,
 } = mixin;
 const selected = ref<any>([]);
 const search = ref<string>("");
@@ -309,7 +310,11 @@ function validateForm() {
     }
   }
   if (hasError.every((result) => result === true)) {
-    onSubmit();
+    if (rows.value.length !== 0) {
+      onSubmit();
+    } else {
+      dialogMessageNotify($q, "กรุณาเลือกตำแหน่งอย่างน้อย 1 ตำแหน่ง");
+    }
   } else {
   }
 }
@@ -428,8 +433,6 @@ function onSubmitSelectEdit() {
   );
 }
 
-
-
 /** input ค้นหา */
 const searchRef = ref<any>(null);
 async function searchInput() {
@@ -724,7 +727,6 @@ async function clearFormPositionSelect() {
                         :options="optionFilter"
                         emit-value
                         dense
-                  
                         map-options
                         outlined
                         option-label="name"

From 25a8fb9aa22ecd1d2819a076de4d34eeeac7b83e Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Tue, 6 Feb 2024 17:21:46 +0700
Subject: [PATCH 4/6] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20dialog=20?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B9=82=E0=B8=84?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?=
 =?UTF-8?q?=E0=B9=83=E0=B8=AB=E0=B8=A1=E0=B9=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogNewStructure.vue         | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogNewStructure.vue b/src/modules/02_organizationalNew/components/DialogNewStructure.vue
index 4e5556634..68d7cf8a2 100644
--- a/src/modules/02_organizationalNew/components/DialogNewStructure.vue
+++ b/src/modules/02_organizationalNew/components/DialogNewStructure.vue
@@ -130,16 +130,20 @@ async function fetchOrgRevision() {
   showLoader();
   await http
     .get(config.API.organizationHistoryNew)
-    .then((res) => {
+    .then(async (res) => {
       const data = res.data.result.filter(
         (e: HistoryType) => e.orgRevisionIsDraft === false
       );
       if (data) {
-        const listOption = data.map((e: HistoryType) => ({
-          id: e.orgRevisionId,
-          name: e.orgRevisionName,
-        }));
-        orgRevisionOpMain.value = listOption;
+        // const listOption = data.map((e: HistoryType) => ({
+        //   id: e.orgRevisionId,
+        //   name: e.orgRevisionName,
+        // }));
+        // orgRevisionOpMain.value = listOption;
+        const currentStr = await data.find(
+          (x: any) => x.orgRevisionIsCurrent === true
+        );
+        formData.orgRevisionId = currentStr ? currentStr.orgRevisionId : null;
       }
     })
     .catch((err) => {
@@ -150,19 +154,19 @@ async function fetchOrgRevision() {
     });
 }
 
-function filterSelector(val: any, update: Function, refData: string) {
-  switch (refData) {
-    case "orgRevisionId":
-      update(() => {
-        orgRevisionOp.value = orgRevisionOpMain.value.filter(
-          (v: DataOption) => v.name.indexOf(val) > -1
-        );
-      });
-      break;
-    default:
-      break;
-  }
-}
+// function filterSelector(val: any, update: Function, refData: string) {
+//   switch (refData) {
+//     case "orgRevisionId":
+//       update(() => {
+//         orgRevisionOp.value = orgRevisionOpMain.value.filter(
+//           (v: DataOption) => v.name.indexOf(val) > -1
+//         );
+//       });
+//       break;
+//     default:
+//       break;
+//   }
+// }
 
 watch(
   () => modal.value,
@@ -213,7 +217,7 @@ watch(
                   lazy-rules
                 />
               </div>
-              <div class="col-6" v-if="type !== 'NEW'">
+              <!-- <div class="col-6" v-if="type !== 'NEW'">
                 <q-select
                   for="#orgRevisionId"
                   ref="orgRevisionIdRef"
@@ -242,7 +246,7 @@ watch(
                     </q-item>
                   </template>
                 </q-select>
-              </div>
+              </div> -->
             </div>
           </q-card-section>
           <q-separator />

From 4b07d2d3d51d1d938c3c7a1bcb0f57229c260973 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Wed, 7 Feb 2024 08:05:41 +0700
Subject: [PATCH 5/6] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=84=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/04_registry/components/Assessment.vue   | 11 +++++------
 src/modules/04_registry/components/Coin.vue         |  1 +
 src/modules/04_registry/components/Discipline.vue   | 11 +++++------
 src/modules/04_registry/components/Education.vue    |  1 +
 .../04_registry/components/Information/top.vue      |  4 ++--
 src/modules/04_registry/components/Insignia.vue     |  1 +
 src/modules/04_registry/components/Leave.vue        |  7 ++++---
 src/modules/04_registry/components/Other.vue        |  1 +
 src/modules/04_registry/components/Record.vue       | 13 +++++++------
 src/modules/04_registry/components/Salary.vue       |  1 +
 .../04_registry/components/SalaryEmployee.vue       |  1 +
 .../04_registry/components/SalaryEmployeeTemp.vue   |  1 +
 src/modules/04_registry/components/Talent.vue       | 12 +++++-------
 src/modules/04_registry/components/Train.vue        |  1 +
 src/modules/04_registry/components/Work.vue         | 12 +++++-------
 15 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/modules/04_registry/components/Assessment.vue b/src/modules/04_registry/components/Assessment.vue
index 37902f56a..83b48252b 100644
--- a/src/modules/04_registry/components/Assessment.vue
+++ b/src/modules/04_registry/components/Assessment.vue
@@ -44,8 +44,8 @@
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
               >
-            <q-tooltip>ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ</q-tooltip>
-            </q-btn>
+                <q-tooltip>ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ</q-tooltip>
+              </q-btn>
             </q-td>
           </q-tr>
         </template>
@@ -62,9 +62,7 @@
         />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
             <div class="col-xs-12 col-sm-12 col-md-12">
               <datepicker
                 menu-class-name="modalfix"
@@ -626,7 +624,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        store.isLoad++
+        store.isLoad++;
       });
   }
 };
@@ -903,6 +901,7 @@ const clickEditRow = () => {
 const clickHistory = async (row: RequestItemsObject) => {
   tittleHistory.value = "ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ";
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileAssessmentHisId(row.id))
diff --git a/src/modules/04_registry/components/Coin.vue b/src/modules/04_registry/components/Coin.vue
index 0d995b9de..bb063ca96 100644
--- a/src/modules/04_registry/components/Coin.vue
+++ b/src/modules/04_registry/components/Coin.vue
@@ -781,6 +781,7 @@ const clickHistory = async (row: RequestItemsObject) => {
       ? "ประวัติแก้ไขประกาศลูกจ้างดีเด่น"
       : "ประวัติแก้ไขประกาศเกียรติคุณ";
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileHonorHisId(row.id))
diff --git a/src/modules/04_registry/components/Discipline.vue b/src/modules/04_registry/components/Discipline.vue
index b6611bebe..f2838566e 100644
--- a/src/modules/04_registry/components/Discipline.vue
+++ b/src/modules/04_registry/components/Discipline.vue
@@ -43,8 +43,8 @@
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
               >
-            <q-tooltip>ประวัติแก้ไขวินัย</q-tooltip>
-            </q-btn>
+                <q-tooltip>ประวัติแก้ไขวินัย</q-tooltip>
+              </q-btn>
             </q-td>
           </q-tr>
         </template>
@@ -58,9 +58,7 @@
         <DialogHeader tittle="วินัย" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
-            class="row col-12  q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
@@ -617,7 +615,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        store.isLoad++
+        store.isLoad++;
       });
   }
 };
@@ -885,6 +883,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileDisHisId(row.id))
diff --git a/src/modules/04_registry/components/Education.vue b/src/modules/04_registry/components/Education.vue
index 44d19632c..ba45619ec 100644
--- a/src/modules/04_registry/components/Education.vue
+++ b/src/modules/04_registry/components/Education.vue
@@ -1495,6 +1495,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileEduHisId(row.id))
diff --git a/src/modules/04_registry/components/Information/top.vue b/src/modules/04_registry/components/Information/top.vue
index 416a8f049..8f92674b7 100644
--- a/src/modules/04_registry/components/Information/top.vue
+++ b/src/modules/04_registry/components/Information/top.vue
@@ -62,9 +62,9 @@
       >
         <q-tooltip>เพิ่มข้อมูล</q-tooltip>
       </q-btn>
-      <q-btn size="12px" flat round color="add" @click="add" :icon="iconAdd">
+      <!-- <q-btn size="12px" flat round color="add" @click="add" :icon="iconAdd">
         <q-tooltip>สรุปวันลา</q-tooltip>
-      </q-btn>
+      </q-btn> -->
     </div>
 
     <div class="q-pl-sm" v-else>
diff --git a/src/modules/04_registry/components/Insignia.vue b/src/modules/04_registry/components/Insignia.vue
index 08f8a0d9b..addb42c3f 100644
--- a/src/modules/04_registry/components/Insignia.vue
+++ b/src/modules/04_registry/components/Insignia.vue
@@ -1279,6 +1279,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileInsignHisId(row.id))
diff --git a/src/modules/04_registry/components/Leave.vue b/src/modules/04_registry/components/Leave.vue
index fc95812fd..16400f334 100644
--- a/src/modules/04_registry/components/Leave.vue
+++ b/src/modules/04_registry/components/Leave.vue
@@ -152,7 +152,7 @@
                 </template>
               </datepicker>
             </div>
-            <div class="col-xs-3 col-sm-3 col-md-3">
+            <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
                 :class="getClass(edit)"
                 :outlined="edit"
@@ -168,7 +168,7 @@
                 @update:modelValue="clickEditRow"
               />
             </div>
-            <div class="col-xs-3 col-sm-3 col-md-3">
+            <!-- <div class="col-xs-3 col-sm-3 col-md-3">
               <q-input
                 :class="getClass(false)"
                 :outlined="true"
@@ -184,7 +184,7 @@
                 :label="`${'จำนวนวันที่ลามาแล้ว'}`"
                 @update:modelValue="clickEditRow"
               />
-            </div>
+            </div> -->
             <div class="col-xs-6 col-sm-6 col-md-6">
               <selector
                 :class="getClass(edit)"
@@ -776,6 +776,7 @@ const filterSelector = (val: any, update: Function, filtername: string) => {
 
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileLeaveHisId(row.id))
diff --git a/src/modules/04_registry/components/Other.vue b/src/modules/04_registry/components/Other.vue
index 8144ca9f6..33bf1d312 100644
--- a/src/modules/04_registry/components/Other.vue
+++ b/src/modules/04_registry/components/Other.vue
@@ -570,6 +570,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileOtherHisId(row.id))
diff --git a/src/modules/04_registry/components/Record.vue b/src/modules/04_registry/components/Record.vue
index b03a39e61..1ef12886e 100644
--- a/src/modules/04_registry/components/Record.vue
+++ b/src/modules/04_registry/components/Record.vue
@@ -43,8 +43,10 @@
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
               >
-            <q-tooltip>ประวัติแก้ไขวันที่มิได้ปฏิบัติหน้าที่อยู่ในเขตที่ได้มีประกาศใช้กฎอัยการศึก</q-tooltip>
-            </q-btn>
+                <q-tooltip
+                  >ประวัติแก้ไขวันที่มิได้ปฏิบัติหน้าที่อยู่ในเขตที่ได้มีประกาศใช้กฎอัยการศึก</q-tooltip
+                >
+              </q-btn>
             </q-td>
           </q-tr>
         </template>
@@ -61,9 +63,7 @@
         />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
@@ -507,7 +507,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        store.isLoad++
+        store.isLoad++;
       });
   }
 };
@@ -770,6 +770,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileNopaidHisId(row.id))
diff --git a/src/modules/04_registry/components/Salary.vue b/src/modules/04_registry/components/Salary.vue
index 36c830603..fafd041d7 100644
--- a/src/modules/04_registry/components/Salary.vue
+++ b/src/modules/04_registry/components/Salary.vue
@@ -2249,6 +2249,7 @@ const clickEditRowRef = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileSalaryHisId(row.id))
diff --git a/src/modules/04_registry/components/SalaryEmployee.vue b/src/modules/04_registry/components/SalaryEmployee.vue
index 6b8b38ba7..d4ed7f39b 100644
--- a/src/modules/04_registry/components/SalaryEmployee.vue
+++ b/src/modules/04_registry/components/SalaryEmployee.vue
@@ -1989,6 +1989,7 @@ const clickEditRowRef = () => {
  */
 const clickHistory = async (row: RequestItemsEmployee) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileSalaryEmployeeHisId(row.id))
diff --git a/src/modules/04_registry/components/SalaryEmployeeTemp.vue b/src/modules/04_registry/components/SalaryEmployeeTemp.vue
index f5f303b8d..d0d760dc6 100644
--- a/src/modules/04_registry/components/SalaryEmployeeTemp.vue
+++ b/src/modules/04_registry/components/SalaryEmployeeTemp.vue
@@ -2017,6 +2017,7 @@ const clickEditRowRef = () => {
  */
 const clickHistory = async (row: RequestItemsEmployee) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileSalaryEmployeeHisId(row.id))
diff --git a/src/modules/04_registry/components/Talent.vue b/src/modules/04_registry/components/Talent.vue
index 1a0550239..59be110a5 100644
--- a/src/modules/04_registry/components/Talent.vue
+++ b/src/modules/04_registry/components/Talent.vue
@@ -37,9 +37,8 @@
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
               >
-            <q-tooltip>ประวัติแก้ไขความสามารถพิเศษ
-</q-tooltip>
-            </q-btn>
+                <q-tooltip>ประวัติแก้ไขความสามารถพิเศษ </q-tooltip>
+              </q-btn>
             </q-td>
           </q-tr>
         </template>
@@ -53,9 +52,7 @@
         <DialogHeader tittle="ความสามารถพิเศษ" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
             <div class="col-6">
               <q-input
                 :class="getClass(edit)"
@@ -380,7 +377,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        store.isLoad++
+        store.isLoad++;
       });
   }
 };
@@ -636,6 +633,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileAbiliHisId(row.id))
diff --git a/src/modules/04_registry/components/Train.vue b/src/modules/04_registry/components/Train.vue
index afb78c4d6..b91b5678b 100644
--- a/src/modules/04_registry/components/Train.vue
+++ b/src/modules/04_registry/components/Train.vue
@@ -1069,6 +1069,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileTrainHisId(row.id))
diff --git a/src/modules/04_registry/components/Work.vue b/src/modules/04_registry/components/Work.vue
index b3e6032bb..c32d4d136 100644
--- a/src/modules/04_registry/components/Work.vue
+++ b/src/modules/04_registry/components/Work.vue
@@ -47,9 +47,8 @@
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
               >
-            <q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ
-</q-tooltip>
-            </q-btn>
+                <q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ </q-tooltip>
+              </q-btn>
             </q-td>
           </q-tr>
         </template>
@@ -63,9 +62,7 @@
         <DialogHeader tittle="ปฏิบัติราชการพิเศษ" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
@@ -583,7 +580,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        store.isLoad++
+        store.isLoad++;
       });
   }
 };
@@ -851,6 +848,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileDutyHisId(row.id))

From 954f90a81a79852604324c7fc420f8874c8e6efa Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Wed, 7 Feb 2024 08:55:52 +0700
Subject: [PATCH 6/6] =?UTF-8?q?=E0=B9=80=E0=B8=8A=E0=B9=87=E0=B8=84?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=9E=E0=B9=84=E0=B8=9F=E0=B8=A5=E0=B9=8C?=
 =?UTF-8?q?=E0=B8=81=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B8=9A=E0=B8=B1=E0=B8=99?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/04_registry/components/Information/OldName.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/04_registry/components/Information/OldName.vue b/src/modules/04_registry/components/Information/OldName.vue
index d34e79d24..098456670 100644
--- a/src/modules/04_registry/components/Information/OldName.vue
+++ b/src/modules/04_registry/components/Information/OldName.vue
@@ -68,9 +68,7 @@
         <DialogHeader tittle="เปลี่ยนชื่อ-นามสกุล" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
             <div class="col-xs-6 col-sm-6 col-md-6">
               <selector
                 :hide-dropdown-icon="!edit"
@@ -632,6 +630,7 @@ const clickNext = async () => {
  * กดดูข้อมูลต่อไป
  */
 const getData = () => {
+  fileUpload.value = [];
   const row = rows.value[rowIndex.value];
   prefixId.value = row.prefixId;
   firstName.value = row.firstName;
@@ -669,6 +668,7 @@ const clickEdit = () => {
  * กดปุ่มเพิ่มด้านบน table
  */
 const clickAdd = async () => {
+  fileUpload.value = [];
   editRow.value = false;
   await addData();
 };