Merge branch 'develop' into dev

* develop:
  fix: convertCommandCodeName columns commandCode
  test
  fix:default profileAvatar
  fix:show btn delete avatar active
  fix: approveCheck
  fix: statusCheck PENDING
  fix(leave):approveCheck logic for commander approval status

src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue

@@ -210,7 +210,7 @@ const baseColumns = ref<QTableColumn[]>([
     sortable: true,
     field: "commandCode",
     format(val, row) {
-      return row.commandName;
+      return store.convertCommandCodeName(row.commandCode);
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",

src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue

@@ -215,7 +215,7 @@ const baseColumns = ref<QTableColumn[]>([
     sortable: true,
     field: "commandCode",
     format(val, row) {
-      return row.commandName;
+      return store.convertCommandCodeName(row.commandCode);
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",

src/modules/04_registryPerson/views/detailView.vue

@@ -695,7 +695,7 @@ function closeImage() {
  * ฟังก์ชันยืนยันการลบรูป
  * @param id  รูปภาพ
  */
-function deletePhoto(id: string) {
+function deletePhoto(id: string, isActive: boolean) {
   dialogRemove(
     $q,
     async () => {
@@ -706,6 +706,10 @@ function deletePhoto(id: string) {
         .delete(config.API.orgProfileAvatarbyType(empType.value) + `/${id}`)
         .then(async () => {
           await getImage();
+          if (isActive) {
+            activeImage.value = null;
+            await fetchDataPersonal();
+          }
         })
         .catch((e) => {
           messageError($q, e);
@@ -821,7 +825,6 @@ onMounted(async () => {
               'SYS_PLACEMENT_OTHER',
               'SYS_TRANSFER_REQ',
               'SYS_RESIGN',
-          
             ])) ||
           leaveType === 'DISCIPLINE_TEMP_SUSPEND' ||
           leaveType === 'RETIRE_RESIGN' ||
@@ -873,7 +876,7 @@ onMounted(async () => {
             'SYS_PROMOTION_EMP',
             'SYS_PASSAWAY',
             'SYS_DISMISS_EMP',
-            'SYS_RESIGN_EMP'
+            'SYS_RESIGN_EMP',
           ])
         "
         size="md"
@@ -1211,18 +1214,21 @@ onMounted(async () => {
                 >
                   {{ date2Thai(n.createdAt) }}
 
+                  <!-- v-if="!n.isActive" -->
                   <q-btn
-                    v-if="!n.isActive"
                     icon="delete"
                     unelevated
                     dense
-                    @click="deletePhoto(n.id)"
+                    @click="deletePhoto(n.id, n.isActive)"
                     class="bg-white"
                     style="color: #ff8080"
                   >
                     <q-tooltip>ลบรูปภาพ</q-tooltip>
                   </q-btn>
                 </div>
+                <div class="absolute-top-right" v-if="n.isActive">
+                  <q-icon name="star" color="yellow" size="24px" />
+                </div>
               </q-img>
             </div>
           </div>
@@ -1230,7 +1236,12 @@ onMounted(async () => {
       </q-card-section>
       <q-separator />
       <q-card-actions align="right">
-        <q-btn @click="selectAvatarHistory" color="public" label="เลือกรูปภาพ">
+        <q-btn
+          @click="selectAvatarHistory"
+          color="public"
+          label="เลือกรูปภาพ"
+          :disable="images.length == 0"
+        >
           <q-tooltip>เลือกรูปภาพ</q-tooltip>
         </q-btn>
       </q-card-actions>

src/modules/04_registryPerson/views/listView.vue

@@ -745,6 +745,8 @@ onMounted(async () => {
         />
       </div>
     </q-card-section>
+
+    
   </q-card>
 
   <!-- แสดง dialog เลือกหน่วยงาน/ส่วนราชการ -->

src/modules/09_leave/components/05_Leave/DetailLeavePage.vue

@@ -166,10 +166,10 @@ const commanderList = computed(() => {
 
 // เช็คว่าผู้ใช้มีสิทธิ์อนุมัติหรือไม่
 const approveCheck = computed(() => {
+  const commanders = rows.value?.commanders;
   return (
-    rows.value?.commanders?.every(
-      (commander) => commander.approveStatus === "APPROVE"
-    ) ?? false
+    commanders?.every((commander) => commander.approveStatus === "APPROVE") ??
+    false
   );
 });
 
@@ -1073,7 +1073,8 @@ onMounted(async () => {
                       rows &&
                       rows.approvers[0]?.profileId == keycloakId &&
                       rows.approvers[0]?.approveStatus == 'PENDING' &&
-                      approveCheck
+                      approveCheck &&
+                      statusCheck === 'PENDING'
                     "
                   >
                     <q-btn