ปุ่ม import

0cc7a97a · Nattana Chaiyamat · ccdcd2f3 · 0cc7a97a · 0cc7a97a · 0cc7a97a
Commit 0cc7a97a authored Mar 19, 2025 by Nattana Chaiyamat
41 changed files
--- a/src/app/components/company-components/account-settings/manage-user/manage-user.component.html
+++ b/src/app/components/company-components/account-settings/manage-user/manage-user.component.html
@@ -11,12 +11,12 @@
                </div>
            </div>
        </div>
-        <div class="px-1">
+        <!-- <div class="px-1">
            <button type="button" class="ti-btn ti-btn-soft-warning h-20px m-0 shadow-md">
                <i class="ti ti-book fs-l"></i>
                Help
            </button>
-        </div>
+        </div> -->
    </div>
 </div>


--- a/src/app/components/company-components/account-settings/role-permission-config/role-permission-config.component.html
+++ b/src/app/components/company-components/account-settings/role-permission-config/role-permission-config.component.html
@@ -247,7 +247,12 @@
                            ยืนยันการบันทึกข้อมูลหรือไม่!
                        </ng-container>
                        <ng-container *ngIf="currentModal == 'delete'">
-                            ยืนยันการลบข้อมูลหรือไม่!
+                            <ng-container *ngIf="numDataListChecked">
+                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>!
                        </ng-container>
                    </p>
                    <div class="flex justify-end mt-2rem mb-1rem">
@@ -271,7 +276,7 @@
                            </button>
                            <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
                                data-hs-overlay="#role-permission-config-alert-modal"
-                                (click)="updateConfigPermission('delete')">
+                                (click)="updateConfigPermission('delete')"  *ngIf="numDataListChecked">
                                ลบข้อมูล
                            </a>
                        </ng-container>

--- a/src/app/components/company-components/account-settings/set-a-password/set-a-password.component.html
+++ b/src/app/components/company-components/account-settings/set-a-password/set-a-password.component.html
@@ -11,12 +11,12 @@
                </div>
            </div>
        </div>
-        <div class="px-1">
+        <!-- <div class="px-1">
            <button type="button" class="ti-btn ti-btn-soft-warning h-20px m-0 shadow-md">
                <i class="ti ti-book fs-l"></i>
                Help
            </button>
-        </div>
+        </div> -->
    </div>
 </div>


--- a/src/app/components/company-components/account-settings/user-settings/user-settings.component.html
+++ b/src/app/components/company-components/account-settings/user-settings/user-settings.component.html
@@ -58,12 +58,12 @@
                    Delete
                </button>
            </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                <button type="button" class="ti-btn ti-btn-soft-warning h-20px m-0 shadow-md">
                    <i class="ti ti-book fs-l"></i>
                    Help
                </button>
-            </div>
+            </div> -->
        </div>
    </div>
 </div>
@@ -762,7 +762,12 @@
                        ยืนยันการบันทึกข้อมูลหรือไม่!
                    </ng-container>
                    <ng-container *ngIf="currentModal == 'delete'||currentModal == 'deleteGroup'">
-                        ยืนยันการลบข้อมูลหรือไม่!
+                        <ng-container *ngIf="numDataListChecked">
+                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>!
                    </ng-container>
                </p>
                <div class="flex justify-end mt-2rem mb-1rem">
@@ -784,7 +789,7 @@
                            ย้อนกลับ
                        </button>
                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-                            data-hs-overlay="#user-setting-alert-modal" (click)="updateUser('delete')">
+                            data-hs-overlay="#user-setting-alert-modal" (click)="updateUser('delete')"  *ngIf="numDataListChecked">
                            ลบข้อมูล
                        </a>
                    </ng-container>

--- a/src/app/components/company-components/company-registration/branch-business-unit/department-list/department-list.component.html
+++ b/src/app/components/company-components/company-registration/branch-business-unit/department-list/department-list.component.html
@@ -516,7 +516,12 @@
            </div>
            <div class="ti-modal-body ">
                <p class="mt-1 text-gray-800 dark:text-white/70">
-                    ยืนยันการลบข้อมูลหรือไม่!
+                    <ng-container *ngIf="numDataListChecked">
+                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>!
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -525,8 +530,8 @@
                        data-hs-overlay="#department-list-alert-delete-modal">
                        ย้อนกลับ
                    </button>
-                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#department-list-alert-delete-modal" (click)="deleteBu2()">
+                    <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
+                        data-hs-overlay="#department-list-alert-delete-modal" (click)="deleteBu2()"  *ngIf="numDataListChecked">
                        ลบข้อมูล
                    </a>
                </div>

--- a/src/app/components/company-components/company-registration/branch-business-unit/department-register/department-register.component.html
+++ b/src/app/components/company-components/company-registration/branch-business-unit/department-register/department-register.component.html
@@ -318,7 +318,12 @@
            </div>
            <div class="ti-modal-body ">
                <p class="mt-1 text-gray-800 dark:text-white/70">
+                    <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -327,8 +332,8 @@
                        data-hs-overlay="#department-register-delete-alert-modal">
                        ย้อนกลับ
                    </button>
-                    <button type="button" class="ti-btn ti-btn-success" (click)="deleteBu1()"
-                        data-hs-overlay="#department-register-delete-alert-modal">
+                    <button type="button" class="ti-btn ti-btn-danger" (click)="deleteBu1()"
+                        data-hs-overlay="#department-register-delete-alert-modal"  *ngIf="numDataListChecked">
                        ลบข้อมูล
                    </button>
                </div>

--- a/src/app/components/company-components/company-registration/branch-business-unit/section-registration/section-registration.component.html
+++ b/src/app/components/company-components/company-registration/branch-business-unit/section-registration/section-registration.component.html
@@ -534,7 +534,12 @@
            </div>
            <div class="ti-modal-body ">
                <p class="mt-1 text-gray-800 dark:text-white/70">
-                    ยืนยันการลบข้อมูลหรือไม่!
+                    <ng-container *ngIf="numDataListChecked">
+                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>!
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -543,8 +548,8 @@
                        data-hs-overlay="#section-registration-alert-delete-modal">
                        ย้อนกลับ
                    </button>
-                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#section-registration-alert-delete-modal" (click)="deleteBu3()">
+                    <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
+                        data-hs-overlay="#section-registration-alert-delete-modal" (click)="deleteBu3()"  *ngIf="numDataListChecked">
                        ลบข้อมูล
                    </a>
                </div>

--- a/src/app/components/company-components/company-registration/branch-business-unit/sub-department-four/sub-department-four.component.html
+++ b/src/app/components/company-components/company-registration/branch-business-unit/sub-department-four/sub-department-four.component.html
@@ -533,7 +533,12 @@
            </div>
            <div class="ti-modal-body ">
                <p class="mt-1 text-gray-800 dark:text-white/70">
+                    <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -542,8 +547,8 @@
                        data-hs-overlay="#sub-department-four-alert-delete-modal">
                        ย้อนกลับ
                    </button>
-                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#sub-department-four-alert-delete-modal" (click)="deleteBu7();">
+                    <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
+                        data-hs-overlay="#sub-department-four-alert-delete-modal" (click)="deleteBu7();"  *ngIf="numDataListChecked">
                        ลบข้อมูล
                    </a>
                </div>

--- a/src/app/components/company-components/company-registration/branch-business-unit/sub-department-one/sub-department-one.component.html
+++ b/src/app/components/company-components/company-registration/branch-business-unit/sub-department-one/sub-department-one.component.html
@@ -541,7 +541,12 @@
            </div>
            <div class="ti-modal-body ">
                <p class="mt-1 text-gray-800 dark:text-white/70">
+                    <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -550,8 +555,8 @@
                        data-hs-overlay="#sub-department-one-alert-delete-modal">
                        ย้อนกลับ
                    </button>
-                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#sub-department-one-alert-delete-modal" (click)="deleteBu4();">
+                    <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
+                        data-hs-overlay="#sub-department-one-alert-delete-modal" (click)="deleteBu4();"  *ngIf="numDataListChecked">
                        ลบข้อมูล
                    </a>
                </div>

--- a/src/app/components/company-components/company-registration/branch-business-unit/sub-department-three/sub-department-three.component.html
+++ b/src/app/components/company-components/company-registration/branch-business-unit/sub-department-three/sub-department-three.component.html
@@ -558,7 +558,12 @@
            </div>
            <div class="ti-modal-body ">
                <p class="mt-1 text-gray-800 dark:text-white/70">
+                    <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -567,8 +572,8 @@
                        data-hs-overlay="#sub-department-three-alert-delete-modal">
                        ย้อนกลับ
                    </button>
-                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#sub-department-three-alert-delete-modal" (click)="deleteBu6()">
+                    <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
+                        data-hs-overlay="#sub-department-three-alert-delete-modal" (click)="deleteBu6()"  *ngIf="numDataListChecked">
                        ลบข้อมูล
                    </a>
                </div>

--- a/src/app/components/company-components/company-registration/branch-business-unit/sub-department-two/sub-department-two.component.html
+++ b/src/app/components/company-components/company-registration/branch-business-unit/sub-department-two/sub-department-two.component.html
@@ -555,7 +555,12 @@
            </div>
            <div class="ti-modal-body ">
                <p class="mt-1 text-gray-800 dark:text-white/70">
+                    <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -564,8 +569,8 @@
                        data-hs-overlay="#sub-department-two-alert-delete-modal">
                        ย้อนกลับ
                    </button>
-                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#sub-department-two-alert-delete-modal" (click)="deleteBu5()">
+                    <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
+                        data-hs-overlay="#sub-department-two-alert-delete-modal" (click)="deleteBu5()"  *ngIf="numDataListChecked">
                        ลบข้อมูล
                    </a>
                </div>

--- a/src/app/components/company-components/company-registration/company-registration-page/company-registration-page.component.html
+++ b/src/app/components/company-components/company-registration/company-registration-page/company-registration-page.component.html
@@ -231,8 +231,13 @@
                        ยืนยันการบันทึกข้อมูลหรือไม่
                    </ng-container>
                    <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+                        <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+                    </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -253,7 +258,7 @@
                            data-hs-overlay="#company-registration-page-alert-modal">
                            ย้อนกลับ
                        </button>
-                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
+                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);" *ngIf="numDataListChecked"
                            data-hs-overlay="#company-registration-page-alert-modal" (click)="deleteCompany()">
                            ลบข้อมูล
                        </a>

--- a/src/app/components/company-components/day-type-registry/day-type-registry.component.html
+++ b/src/app/components/company-components/day-type-registry/day-type-registry.component.html
@@ -82,13 +82,13 @@
                                    Delete
                                </button>
                            </div>
-                            <div class="px-1">
+                            <!-- <div class="px-1">
                                <button href="javascript:void(0);"
                                    class="ti-btn ti-btn-soft-warning h-20px m-0 shadow-md">
                                    <i class="ti ti-book fs-l"></i>
                                    Help
                                </button>
-                            </div>
+                            </div> -->
                        </div>
                    </div>
                </div>
@@ -333,8 +333,13 @@
                        ยืนยันการบันทึกข้อมูลหรือไม่
                    </ng-container>
                    <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+                        <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+                    </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -356,7 +361,7 @@
                            ย้อนกลับ
                        </button>
                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-                            data-hs-overlay="#day-type-registry-alert-modal" (click)="deleteEventgrp()">
+                            data-hs-overlay="#day-type-registry-alert-modal" (click)="deleteEventgrp()"  *ngIf="numDataListChecked">
                            ลบข้อมูล
                        </a>
                    </ng-container>

--- a/src/app/components/company-components/employee-registration/sub-employee-registration/sub-employee-registration.component.html
+++ b/src/app/components/company-components/employee-registration/sub-employee-registration/sub-employee-registration.component.html
@@ -674,7 +674,12 @@
      </div>
      <div class="ti-modal-body ">
        <p class="mt-1 text-gray-800 dark:text-white/70">
-          ยืนยันการลบข้อมูลหรือไม่!
+          <ng-container *ngIf="numDataListChecked">
+                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>!
        </p>

        <div class="flex justify-end mt-2rem mb-1rem">
@@ -684,7 +689,7 @@
            ย้อนกลับ
          </button>
          <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-            data-hs-overlay="#sub-employee-registration-alert-delete-modal" (click)="updateEmployeeList(modalType)">
+            data-hs-overlay="#sub-employee-registration-alert-delete-modal" (click)="updateEmployeeList(modalType)"  *ngIf="numDataListChecked">
            ลบข้อมูล
          </a>
        </div>

--- a/src/app/components/company-components/job-description/employee-categories/employee-categories.component.html
+++ b/src/app/components/company-components/job-description/employee-categories/employee-categories.component.html
@@ -229,8 +229,13 @@
                        ยืนยันการบันทึกข้อมูลหรือไม่
                    </ng-container>
                    <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+                        <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+                    </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -252,7 +257,7 @@
                            ย้อนกลับ
                        </button>
                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-                            data-hs-overlay="#employee-categories-page-alert-modal" (click)="deleteEmp_type()">
+                            data-hs-overlay="#employee-categories-page-alert-modal" (click)="deleteEmp_type()"  *ngIf="numDataListChecked">
                            ลบข้อมูล
                        </a>
                    </ng-container>

--- a/src/app/components/company-components/job-description/employee-group-unit/employee-group-unit.component.html
+++ b/src/app/components/company-components/job-description/employee-group-unit/employee-group-unit.component.html
@@ -226,8 +226,13 @@
                        ยืนยันการบันทึกข้อมูลหรือไม่
                    </ng-container>
                    <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+                        <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+                    </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -250,7 +255,7 @@
                        </button>
                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
                            data-hs-overlay="#employee-group-unit-component-page-alert-modal"
-                            (click)="deleteEmp_group()">
+                            (click)="deleteEmp_group()"  *ngIf="numDataListChecked">
                            ลบข้อมูล
                        </a>
                    </ng-container>

--- a/src/app/components/company-components/job-description/employee-level/employee-level.component.html
+++ b/src/app/components/company-components/job-description/employee-level/employee-level.component.html
@@ -259,8 +259,13 @@
            ยืนยันการบันทึกข้อมูลหรือไม่
          </ng-container>
          <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+            <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+          </ng-container>
        </p>

        <div class="flex justify-end mt-2rem mb-1rem">
@@ -282,7 +287,7 @@
              ย้อนกลับ
            </button>
            <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-              data-hs-overlay="#employee-level-page-alert-modal" (click)="deletePL()">
+              data-hs-overlay="#employee-level-page-alert-modal" (click)="deletePL()"  *ngIf="numDataListChecked">
              ลบข้อมูล
            </a>
          </ng-container>

--- a/src/app/components/company-components/job-description/position/position-unit.component.html
+++ b/src/app/components/company-components/job-description/position/position-unit.component.html
@@ -227,8 +227,13 @@
                        ยืนยันการบันทึกข้อมูลหรือไม่
                    </ng-container>
                    <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+                        <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+                    </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -250,7 +255,7 @@
                            ย้อนกลับ
                        </button>
                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-                            data-hs-overlay="#position-unit-component-page-alert-modal" (click)="deletePosition()">
+                            data-hs-overlay="#position-unit-component-page-alert-modal" (click)="deletePosition()"  *ngIf="numDataListChecked">
                            ลบข้อมูล
                        </a>
                    </ng-container>

--- a/src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.html
+++ b/src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.html
@@ -466,7 +466,12 @@
            </div>
            <div class="ti-modal-body ">
                <p class="mt-1 text-gray-800 dark:text-white/70">
-                    ยืนยันการลบข้อมูลหรือไม่!
+                    <ng-container *ngIf="numDataListChecked">
+                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>!
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -476,7 +481,7 @@
                        ย้อนกลับ
                    </button>
                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#edit-group-competencies-alert-delete-modal"
+                        data-hs-overlay="#edit-group-competencies-alert-delete-modal"  *ngIf="numDataListChecked"
                        (click)="deleteGroupAssessmentById()">
                        ลบข้อมูล
                    </a>

--- a/src/app/components/competency-assessment/course-registration/development-course/development-course.component.html
+++ b/src/app/components/competency-assessment/course-registration/development-course/development-course.component.html
@@ -310,7 +310,12 @@
                </p>
                <p class="mt-1 text-gray-800 dark:text-white/70"
                    *ngIf="currentModal=='delete'||currentModal=='deleteGroup'">
+                    <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem" *ngIf="currentModal=='add'||currentModal=='edit'">
@@ -332,7 +337,7 @@
                        ย้อนกลับ
                    </button>
                    <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-                        data-hs-overlay="#development-course-alert-modal" (click)="updateCompetencyCourse('delete')">
+                        data-hs-overlay="#development-course-alert-modal" (click)="updateCompetencyCourse('delete')"  *ngIf="numDataListChecked">
                        ลบข้อมูล
                    </a>
                </div>

--- a/src/app/components/competency-assessment/evaluation-cycle-manager/define-document-form/define-document-form.component.html
+++ b/src/app/components/competency-assessment/evaluation-cycle-manager/define-document-form/define-document-form.component.html
@@ -274,7 +274,12 @@
            </div>
            <div class="ti-modal-body ">
                <p class="mt-1 text-gray-800 dark:text-white/70">
+                    <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                </p>
                <div class="flex justify-end mt-2rem mb-1rem">
                    <button type="button"
@@ -284,7 +289,7 @@
                    </button>
                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
                        data-hs-overlay="#define-document-form-delete-modal"
-                        (click)="showSuccessDelete()">
+                        (click)="showSuccessDelete()"  *ngIf="numDataListChecked">
                        ลบข้อมูล
                    </a>
                </div>

--- a/src/app/components/competency-assessment/evaluation-cycle-manager/evaluation-cycle/evaluation-cycle.component.html
+++ b/src/app/components/competency-assessment/evaluation-cycle-manager/evaluation-cycle/evaluation-cycle.component.html
@@ -377,8 +377,13 @@
            ยืนยันการบันทึกข้อมูลหรือไม่
          </ng-container>
          <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+            <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+          </ng-container>
          <ng-container *ngIf="modalStatus=='createForm'">
            คุณต้องการสร้างแบบฟอร์มการประเมินใหม่หรือไม่
          </ng-container>
@@ -403,7 +408,7 @@
              ย้อนกลับ
            </button>
            <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-              data-hs-overlay="#evaluation-cycle-page-alert-modal" (click)="deleteevaluation_cycle()">
+              data-hs-overlay="#evaluation-cycle-page-alert-modal" (click)="deleteevaluation_cycle()"  *ngIf="numDataListChecked">
              ลบข้อมูล
            </a>
          </ng-container>

--- a/src/app/components/competency-assessment/grade-registration/grade-management/grade-management.component.html
+++ b/src/app/components/competency-assessment/grade-registration/grade-management/grade-management.component.html
@@ -148,7 +148,12 @@
                </div>
                <div class="ti-modal-body ">
                    <p class="mt-1 text-gray-800 dark:text-white/70">
+                        <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                    </p>

                    <div class="flex justify-end mt-2rem mb-1rem">
@@ -159,7 +164,7 @@
                        </button>
                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
                            data-hs-overlay="#grade-management-alert-delete-modal"
-                            (click)="deleteCompetencyGroupGradeList();">
+                            (click)="deleteCompetencyGroupGradeList();"  *ngIf="numDataListChecked">
                            ลบข้อมูล
                        </a>
                    </div>

--- a/src/app/components/competency-assessment/grade-registration/grade-management/sub-grade-registration/sub-grade-registration.component.html
+++ b/src/app/components/competency-assessment/grade-registration/grade-management/sub-grade-registration/sub-grade-registration.component.html
@@ -320,7 +320,12 @@
            </div>
            <div class="ti-modal-body ">
                <p class="mt-1 text-gray-800 dark:text-white/70">
-                    ยืนยันการลบข้อมูลหรือไม่!
+                    <ng-container *ngIf="numDataListChecked">
+                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>!
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -331,7 +336,7 @@
                    </button>
                    <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
                        data-hs-overlay="#sub-grade-registration-alert-delete-modal"
-                        (click)="updateCompetencyGroupGrade()">
+                        (click)="updateCompetencyGroupGrade()"  *ngIf="numDataListChecked">
                        ลบข้อมูล
                    </a>
                </div>

--- a/src/app/components/competency-assessment/name-registration/competency-topic/competency-topic.component.html
+++ b/src/app/components/competency-assessment/name-registration/competency-topic/competency-topic.component.html
@@ -590,8 +590,13 @@
                        ยืนยันการบันทึกข้อมูลหรือไม่
                    </ng-container>
                    <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+                        <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+                    </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -612,7 +617,7 @@
                            data-hs-overlay="#competency-topic-page-alert-modal">
                            ย้อนกลับ
                        </button>
-                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
+                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"  *ngIf="numDataListChecked"
                            data-hs-overlay="#competency-topic-page-alert-modal" (click)="deleteCompetency_topic()">
                            ลบข้อมูล
                        </a>

--- a/src/app/components/competency-assessment/name-registration/type-registration/type-registration.component.html
+++ b/src/app/components/competency-assessment/name-registration/type-registration/type-registration.component.html
@@ -271,8 +271,13 @@
                        ยืนยันการบันทึกข้อมูลหรือไม่
                    </ng-container>
                    <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+                        <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+                    </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -294,7 +299,7 @@
                            data-hs-overlay="#type-registration-component-page-alert-modal">
                            ย้อนกลับ
                        </button>
-                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
+                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"  *ngIf="numDataListChecked"
                            data-hs-overlay="#type-registration-component-page-alert-modal"
                            (click)="deleteType_registration()">
                            ลบข้อมูล

--- a/src/app/components/competency-assessment/tool-register/assessment-tool/assessment-tool.component.html
+++ b/src/app/components/competency-assessment/tool-register/assessment-tool/assessment-tool.component.html
@@ -300,7 +300,12 @@
                </p>
                <p class="mt-1 text-gray-800 dark:text-white/70"
                    *ngIf="currentModal=='delete'||currentModal=='deleteGroup'">
+                    <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                </p>
                <div class="flex justify-end mt-2rem mb-1rem" *ngIf="currentModal=='add'||currentModal=='edit'">
                    <button type="button"
@@ -320,7 +325,7 @@
                        data-hs-overlay="#assessment-tool-alert-modal">
                        ย้อนกลับ
                    </button>
-                    <button type="button" class="ti-btn ti-btn-danger" data-hs-overlay="#assessment-tool-alert-modal"
+                    <button type="button" class="ti-btn ti-btn-danger" data-hs-overlay="#assessment-tool-alert-modal"  *ngIf="numDataListChecked"
                        (click)="updateAssessment('delete')">
                        ลบข้อมูล
                    </button>

--- a/src/app/components/job-detail-components/command-structure/sub-command-structure/sub-command-structure.component.html
+++ b/src/app/components/job-detail-components/command-structure/sub-command-structure/sub-command-structure.component.html
 <div class="w-full min-height-50px mb-10px justify-between items-center">
-    <div class="flex justify-between">
-        <div class="flex pr-2">
-            <div class="px-1">
-                <button type="button" class="ti-btn ti-btn-soft-secondary h-20px m-0 shadow-md"
-                    data-hs-overlay="#company-registration-page-upload-modal">
-                    <i class="ri-add-line"></i>
-                    นำเข้าข้อมูล
-                </button>
-                <a class="mx-2 justify-center  -mb-px  inline-flex items-center gap-2 font-weight-500 font-size-12px text-center text-secondary border-secondary border-b-2 align-items-end"
-                    href="javascript:void(0);">
-                    ดาวน์โหลดตัวอย่างไฟล์
-                </a>
-            </div>
-        </div>
    <div class="flex justify-end">
        <div class="px-1">
            <div class="relative shadow-md">
                <input type="text" id="hs-leading-icon" name="hs-leading-icon"
-                                class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 "
-                                placeholder="Search by No. or Name" [(ngModel)]="search"
-                                (ngModelChange)="searchChange()">
+                    class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name"
+                    [(ngModel)]="search" (ngModelChange)="searchChange()">

                <div
                    class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
@@ -28,6 +13,14 @@
            </div>
        </div>
        <div class="px-1">
+            <button type="button"
+                class=" h-45px ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-10 m-0 shadow-md"
+                data-hs-overlay="#company-registration-page-upload-modal">
+                <i class="ti ti-file-plus"></i>
+                import
+            </button>
+        </div>
+        <div class="px-1">
            <button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-45px m-0 shadow-md"
                data-hs-overlay="#sub-command-structure-alert-delete-modal">
                <i class="ri-delete-bin-6-line"></i>
@@ -41,10 +34,9 @@
                    </button>
                </div> -->
    </div>
-            </div>
-        </div>
+</div>

-        <div class="page px-rem">
+<div class="page px-rem">
    <div class="overflow-auto table-bordered rounded-t-md">
        <div id="card-type-1" role="tabpanel" aria-labelledby="card-type-item-1">
            <div class="overflow-auto shadow-md">
@@ -53,7 +45,8 @@
                        <tr>
                            <ng-container
                                *ngFor="let item of ['ลำดับ','รหัสงาน','ชื่อลักษณะงาน (ไทย)','ชื่อลักษณะงาน (อังกฤษ)','การจัดการ']; let f = first; let l = last">
-                                        <th scope="col" class="relative px-10px py-10px bg-soft-secondary text-primary !text-center">
+                                <th scope="col"
+                                    class="relative px-10px py-10px bg-soft-secondary text-primary !text-center">
                                    <span class="font-size-12px font-weight-700">{{ item }}</span>
                                    <div class="absolute top-1/2 transform -translate-y-1/2 right-0" *ngIf="!l">
                                        <i class="ti ti-dots-vertical fs-l"></i>
@@ -97,8 +90,7 @@
            </li>
            <li *ngFor="let item of page;let f = first;let l = last">
                <ng-container *ngIf="item==3&&currentPage!=1&&currentPage!=2&&currentPage!=3">
-                            <a aria-label="anchor" class="page-link" href="javascript:void(0);"><i
-                                    class="ri-more-line"></i>
+                    <a aria-label="anchor" class="page-link" href="javascript:void(0);"><i class="ri-more-line"></i>
                    </a>
                </ng-container>
                <ng-container *ngIf="(f||l)||(item==currentPage-1||item==currentPage||item==currentPage+1)">
@@ -108,8 +100,7 @@
                </ng-container>
                <ng-container
                    *ngIf="item==page.length-2&&currentPage!=page.length&&currentPage!=page.length-1&&currentPage!=page.length-2">
-                            <a aria-label="anchor" class="page-link" href="javascript:void(0);"><i
-                                    class="ri-more-line"></i>
+                    <a aria-label="anchor" class="page-link" href="javascript:void(0);"><i class="ri-more-line"></i>
                    </a>
                </ng-container>
            </li>
@@ -121,10 +112,10 @@
            </li>
        </ul>
    </nav>
-        </div>
+</div>


-        <div id="sub-command-structure-modal-add" class="hs-overlay hidden ti-modal">
+<div id="sub-command-structure-modal-add" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)]">
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
@@ -144,8 +135,8 @@
                    <div class="px-1">
                        <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md">
                            <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
-                                        xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA"
-                                        stroke-width="3.84" transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
+                                xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
+                                transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
                                <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
                                <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round">
                                </g>
@@ -160,8 +151,7 @@
                        </button>
                    </div>
                    <div class="px-1">
-                                <button href="javascript:void(0);"
-                                    class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
+                        <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                            <i class="ti ti-book fs-l"></i>
                            Help
                        </button>
@@ -171,10 +161,13 @@
            <div class="ti-modal-body mt-1">
                <label for="input-label" class="ti-form-label">รหัสงาน</label>
                <input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly" readonly value="001">
-                        <label for="input-label" class="ti-form-label mt-2rem">ชื่อลักษณะงาน (ไทย)<span class="text-danger">*</span></label>
-                        <input type="text" id="input-label" class="ti-form-input h-10 bg-input-readonly" readonly value="Department Manager 1">
+                <label for="input-label" class="ti-form-label mt-2rem">ชื่อลักษณะงาน (ไทย)<span
+                        class="text-danger">*</span></label>
+                <input type="text" id="input-label" class="ti-form-input h-10 bg-input-readonly" readonly
+                    value="Department Manager 1">
                <label for="input-label" class="ti-form-label mt-2rem">ชื่อลักษณะงาน (อังกฤษ)</label>
-                        <input type="text" id="input-label" class="ti-form-input h-10 bg-input-readonly" readonly value="Department Manager 1">
+                <input type="text" id="input-label" class="ti-form-input h-10 bg-input-readonly" readonly
+                    value="Department Manager 1">
                <label class="ti-form-label mt-2rem">ชื่อตำแหน่งผู้บังคับบัญชาโดยตรง</label>
                <div class="relative flex rounded-md">
                    <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
@@ -229,9 +222,9 @@
            </div>
        </div>
    </div>
-        </div>
+</div>

-        <div id="sub-command-structure-modal-edit" class="hs-overlay hidden ti-modal">
+<div id="sub-command-structure-modal-edit" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)]">
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
@@ -251,8 +244,8 @@
                    <div class="px-1">
                        <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md">
                            <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
-                                        xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA"
-                                        stroke-width="3.84" transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
+                                xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
+                                transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
                                <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
                                <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round">
                                </g>
@@ -267,8 +260,7 @@
                        </button>
                    </div>
                    <div class="px-1">
-                                <button href="javascript:void(0);"
-                                    class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
+                        <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                            <i class="ti ti-book fs-l"></i>
                            Help
                        </button>
@@ -278,10 +270,13 @@
            <div class="ti-modal-body mt-1">
                <label for="input-label" class="ti-form-label">รหัสงาน</label>
                <input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly" readonly value="001">
-                        <label for="input-label" class="ti-form-label mt-2rem">ชื่อลักษณะงาน (ไทย)<span class="text-danger">*</span></label>
-                        <input type="text" id="input-label" class="ti-form-input h-10 bg-input-readonly" readonly value="Department Manager 1">
+                <label for="input-label" class="ti-form-label mt-2rem">ชื่อลักษณะงาน (ไทย)<span
+                        class="text-danger">*</span></label>
+                <input type="text" id="input-label" class="ti-form-input h-10 bg-input-readonly" readonly
+                    value="Department Manager 1">
                <label for="input-label" class="ti-form-label mt-2rem">ชื่อลักษณะงาน (อังกฤษ)</label>
-                        <input type="text" id="input-label" class="ti-form-input h-10 bg-input-readonly" readonly value="Department Manager 1">
+                <input type="text" id="input-label" class="ti-form-input h-10 bg-input-readonly" readonly
+                    value="Department Manager 1">
                <label class="ti-form-label mt-2rem">ชื่อตำแหน่งผู้บังคับบัญชาโดยตรง</label>
                <div class="relative flex rounded-md">
                    <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
@@ -336,9 +331,9 @@
            </div>
        </div>
    </div>
-        </div>
+</div>

-        <div id="sub-command-structure-alert-add-modal" class="hs-overlay hidden ti-modal">
+<div id="sub-command-structure-alert-add-modal" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
        <div class="max-h-full overflow-hidden ti-modal-content w-full">
            <div class="ti-modal-header">
@@ -372,8 +367,8 @@
            </div>
        </div>
    </div>
-        </div>
-        <div id="sub-command-structure-alert-delete-modal" class="hs-overlay hidden ti-modal">
+</div>
+<div id="sub-command-structure-alert-delete-modal" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
        <div class="max-h-full overflow-hidden ti-modal-content w-full">
            <div class="ti-modal-header">
@@ -408,4 +403,4 @@
            </div>
        </div>
    </div>
-        </div>
+</div>
\ No newline at end of file
--- a/src/app/components/job-detail-components/job-competency/sub-job-competency/sub-job-competency.component.html
+++ b/src/app/components/job-detail-components/job-competency/sub-job-competency/sub-job-competency.component.html
 <div class="w-full min-height-50px mb-10px justify-between items-center">
-    <div class="flex justify-between">
-        <div class="flex pr-2">
-            <div class="px-1">
-                <button type="button" class="ti-btn ti-btn-soft-secondary h-20px m-0 shadow-md"
-                    data-hs-overlay="#supjob-upload-modal" (click)="fileInput.value = '';selectedFile=null;selectedFileName = 'กรุณาเลือกไฟล์'">
-                    <i class="ri-add-line"></i>
-                    นำเข้าข้อมูล
-                </button>
-                <a class="mx-2 justify-center  -mb-px  inline-flex items-center gap-2 font-weight-500 font-size-12px text-center text-secondary border-secondary border-b-2 align-items-end"
-                    href="javascript:void(0);" (click)="downloadFile()">
-                    ดาวน์โหลดตัวอย่างไฟล์
-                </a>
-            </div>
-        </div>
    <div class="flex justify-end">
        <div class="px-1">
            <div class="relative shadow-md">
                <input type="text" id="hs-leading-icon" name="hs-leading-icon"
-                                class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 "
-                                placeholder="Search by No. or Name" [(ngModel)]="search" (ngModelChange)="searchChange()" >
+                    class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name"
+                    [(ngModel)]="search" (ngModelChange)="searchChange()">

                <div
                    class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
@@ -26,6 +12,14 @@
                </div>
            </div>
        </div>
+        <div class="px-1">
+            <button type="button"
+                class=" h-45px ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-10 m-0 shadow-md"
+                data-hs-overlay="#supjob-upload-modal">
+                <i class="ti ti-file-plus"></i>
+                import
+            </button>
+        </div>
        <!-- <div class="px-1">
                        <button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-45px m-0 shadow-md"
                            data-hs-overlay="#sub-command-structure-alert-delete-modal">
@@ -40,10 +34,9 @@
                        </button>
                    </div> -->
    </div>
-            </div>
-        </div>
+</div>

-        <div class="page px-rem">
+<div class="page px-rem">
    <div class="overflow-auto shadow-md rounded-t-md">
        <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover table-bordered">
            <thead>
@@ -93,11 +86,12 @@
            </tbody>
        </table>
    </div>
-             <app-pagination [totalItems]="jobcodeFilter().length" [pageSize]="pageSize" (pageChange)="currentPage = $event" (pageSizeChange)="pageSize = $event;currentPage = 1"></app-pagination>
-         </div>
+    <app-pagination [totalItems]="jobcodeFilter().length" [pageSize]="pageSize" (pageChange)="currentPage = $event"
+        (pageSizeChange)="pageSize = $event;currentPage = 1"></app-pagination>
+</div>


- <div id="sub-job-competency-component-modal-edit" class="hs-overlay hidden ti-modal">
+<div id="sub-job-competency-component-modal-edit" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)]">
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
@@ -115,7 +109,8 @@
            <div class="ti-modal-center">
                <div class="flex justify-end" style="padding-right: 1rem;">
                    <div class="px-1">
-                         <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md" (click)="clearValue()">
+                        <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md"
+                            (click)="clearValue()">
                            <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
                                xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
                                transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
@@ -131,23 +126,28 @@
                            Clear
                        </button>
                    </div>
-                     <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                     </div>
+                     </div> -->
                </div>
            </div>
            <div class="ti-modal-body" style="padding-top: 0px;">
                <label for="input-label" class="ti-form-label mt-1rem">รหัสงาน</label>
-                 <input type="text" id="input-label" class="ti-form-input  bg-input-readonly" readonly [(ngModel)]="selectJob.jobcodeId">
+                <input type="text" id="input-label" class="ti-form-input  bg-input-readonly" readonly
+                    [(ngModel)]="selectJob.jobcodeId">
                <label for="detail_th" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (ไทย)</label>
-                 <input type="text" id="detail_th" class="ti-form-input bg-input-readonly" readonly [(ngModel)]="selectJob.tdesc">
+                <input type="text" id="detail_th" class="ti-form-input bg-input-readonly" readonly
+                    [(ngModel)]="selectJob.tdesc">
                <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (อังกฤษ)</label>
-                 <input type="text" id="detail_eng" class="ti-form-input bg-input-readonly" readonly [(ngModel)]="selectJob.edesc">
-                 <label for="detail_eng" class="ti-form-label mt-2rem">ความรู้ ทักษะ ความสามารถในตำเเหน่งงาน ( Job Competency)</label>
-                <textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="5" cols="50" [(ngModel)]="selectJob.competencyWorkText"></textarea>
+                <input type="text" id="detail_eng" class="ti-form-input bg-input-readonly" readonly
+                    [(ngModel)]="selectJob.edesc">
+                <label for="detail_eng" class="ti-form-label mt-2rem">ความรู้ ทักษะ ความสามารถในตำเเหน่งงาน ( Job
+                    Competency)</label>
+                <textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="5" cols="50"
+                    [(ngModel)]="selectJob.competencyWorkText"></textarea>
                <div class="flex justify-end mt-2rem mb-1rem">
                    <button type="button"
                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
@@ -163,9 +163,9 @@
        </div>

    </div>
- </div>
+</div>

- <div id="company-registration-page-alert-modal" class="hs-overlay hidden ti-modal">
+<div id="company-registration-page-alert-modal" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
        <div class="max-h-full overflow-hidden ti-modal-content w-full">
            <div class="ti-modal-header">
@@ -219,7 +219,7 @@
    </div>
 </div>

- <div id="supjob-upload-modal" class="hs-overlay hidden ti-modal">
+<div id="supjob-upload-modal" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out rounded-md">
        <div class="ti-modal-header bg-primary !rounded-none !rounded-t-sm">
            <h5 class="text-xxl font-bold text-white">
@@ -238,6 +238,11 @@
                        <i class="ti ti-upload"></i>
                    </button>
                </div>
+                <div class="flex justify-center mt-2rem ">
+                    <h1 class="cursor-pointer justify-center -mb-px inline-flex items-center gap-2 font-weight-500 font-size-12px
+                    text-center text-secondary border-secondary border-b-2 align-items-end" (click)="downloadFile()">
+                        ดาวน์โหลดตัวอย่างไฟล์</h1>
+                </div>
                <div class="flex justify-center mt-2rem mb-1rem space-x-4">
                    <button type="submit" class="ti-btn ti-btn-secondary"
                        data-hs-overlay="#section-registration-upload-modal" (click)="uploadFile()"

--- a/src/app/components/job-detail-components/job-detail-management/import-data/import-data.component.html
+++ b/src/app/components/job-detail-components/job-detail-management/import-data/import-data.component.html
 <div class="w-full min-height-50px mb-10px justify-between items-center">
-    <div class="flex justify-between">
-        <div class="flex pr-2">
-            <div class="px-1">
-                <button type="button" class="ti-btn ti-btn-soft-secondary h-20px m-0 shadow-md"
-                    data-hs-overlay="#supjob-upload-modal" (click)="fileInput.value = '';selectedFile=null;selectedFileName = 'กรุณาเลือกไฟล์'">
-                    <i class="ri-add-line"></i>
-                    นำเข้าข้อมูล
-                </button>
-                <a class="mx-2 justify-center  -mb-px  inline-flex items-center gap-2 font-weight-500 font-size-12px text-center text-secondary border-secondary border-b-2 align-items-end"
-                    href="javascript:void(0);" (click)="downloadFile()">
-                    ดาวน์โหลดตัวอย่างไฟล์
-                </a>
-            </div>
-        </div>
    <div class="flex justify-end">
        <div class="px-1">
            <div class="relative shadow-md">
                <input type="text" id="hs-leading-icon" name="hs-leading-icon"
-                                class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 "
-                                placeholder="Search by No. or Name" [(ngModel)]="search" (ngModelChange)="searchChange()" >
+                    class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name"
+                    [(ngModel)]="search" (ngModelChange)="searchChange()">

                <div
                    class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
@@ -27,6 +13,15 @@
            </div>
        </div>
        <div class="px-1">
+            <button type="button"
+                class=" h-45px ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-10 m-0 shadow-md"
+                data-hs-overlay="#supjob-upload-modal"
+                (click)="fileInput.value = '';selectedFile=null;selectedFileName = 'กรุณาเลือกไฟล์'">
+                <i class="ti ti-file-plus"></i>
+                import
+            </button>
+        </div>
+        <div class="px-1">
            <button type="button" class="ti-btn ti-btn-soft-secondary h-45px m-0 shadow-md"
                data-hs-overlay="#sub-job-competency-component-modal-edit" (click)="add();modalStatus='add';">
                <i class="ri-add-line"></i>
@@ -47,10 +42,9 @@
                    </button>
                </div> -->
    </div>
-            </div>
-        </div>
+</div>

-        <div class="page px-rem">
+<div class="page px-rem">
    <div class="overflow-auto shadow-md rounded-t-md">
        <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover table-bordered">
            <thead>
@@ -102,12 +96,13 @@
            </tbody>
        </table>
    </div>
-                <app-pagination [totalItems]="jobcodeFilter().length" [pageSize]="pageSize" (pageChange)="currentPage = $event" (pageSizeChange)="pageSize = $event;currentPage = 1"></app-pagination>
+    <app-pagination [totalItems]="jobcodeFilter().length" [pageSize]="pageSize" (pageChange)="currentPage = $event"
+        (pageSizeChange)="pageSize = $event;currentPage = 1"></app-pagination>

-         </div>
+</div>


- <div id="sub-job-competency-component-modal-edit" class="hs-overlay hidden ti-modal">
+<div id="sub-job-competency-component-modal-edit" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)]">
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
@@ -125,7 +120,8 @@
            <div class="ti-modal-center">
                <div class="flex justify-end" style="padding-right: 1rem;">
                    <div class="px-1">
-                         <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md" (click)="clearValue()">
+                        <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md"
+                            (click)="clearValue()">
                            <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
                                xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
                                transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
@@ -141,70 +137,84 @@
                            Clear
                        </button>
                    </div>
-                     <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                     </div>
+                     </div> -->
                </div>
            </div>
            <div class="ti-modal-body" style="padding-top: 0px;">
                <label for="input-label" class="ti-form-label mt-1rem">รหัสงาน<span class="text-danger">*</span></label>
-                 <input type="text" id="input-label" class="ti-form-input {{modalStatus == 'edit' ? 'bg-input-readonly' : ''}}" [attr.readonly]="modalStatus == 'edit' ? true : null"   [(ngModel)]="selectJob.jobcodeId" (ngModelChange)="checkJodid()">
+                <input type="text" id="input-label"
+                    class="ti-form-input {{modalStatus == 'edit' ? 'bg-input-readonly' : ''}}"
+                    [attr.readonly]="modalStatus == 'edit' ? true : null" [(ngModel)]="selectJob.jobcodeId"
+                    (ngModelChange)="checkJodid()">
                <span *ngIf="checkJobCodeId&&modalStatus=='add'" class="text-danger">รหัสงานซ้ำ</span>
-                 <label for="detail_th" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (ไทย)<span class="text-danger">*</span></label>
+                <label for="detail_th" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (ไทย)<span
+                        class="text-danger">*</span></label>
                <input type="text" id="detail_th" class="ti-form-input " [(ngModel)]="selectJob.tdesc">
                <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (อังกฤษ)</label>
                <input type="text" id="detail_eng" class="ti-form-input " [(ngModel)]="selectJob.edesc">

                <label for="detail_eng" class="ti-form-label mt-2rem">ตำแหน่ง</label>
-                <ng-select class="ti-form-select"  data-trigger  name="choices-single-position" id="choices-single-position" [(ngModel)]="positionId" (ngModelChange)="changPosition()" >
+                <ng-select class="ti-form-select" data-trigger name="choices-single-position"
+                    id="choices-single-position" [(ngModel)]="positionId" (ngModelChange)="changPosition()">
                    <ng-option *ngFor="let item of positionList" [value]="item.positionId">{{item.tdesc}}</ng-option>
                </ng-select>

                <label for="detail_eng" class="ti-form-label mt-2rem">ฝ่าย</label>
-                <ng-select class="ti-form-select"  data-trigger  name="choices-single-bu1" id="choices-single-bu1" [(ngModel)]="bu1Id" (ngModelChange)="changBu1()" >
+                <ng-select class="ti-form-select" data-trigger name="choices-single-bu1" id="choices-single-bu1"
+                    [(ngModel)]="bu1Id" (ngModelChange)="changBu1()">
                    <ng-option *ngFor="let item of bu1List" [value]="item.bu1id">{{item.tdesc}}</ng-option>
                </ng-select>

                <label for="detail_eng" class="ti-form-label mt-2rem">แผนก</label>
-                <ng-select class="ti-form-select"  data-trigger  name="choices-single-bu2" id="choices-single-bu2" [(ngModel)]="bu2Id" (ngModelChange)="changBu2()" >
+                <ng-select class="ti-form-select" data-trigger name="choices-single-bu2" id="choices-single-bu2"
+                    [(ngModel)]="bu2Id" (ngModelChange)="changBu2()">
                    <ng-option *ngFor="let item of bu2List" [value]="item.bu2id">{{item.tdesc}}</ng-option>
                </ng-select>

                <label for="detail_eng" class="ti-form-label mt-2rem">ส่วน</label>
-                <ng-select class="ti-form-select"  data-trigger  name="choices-single-bu3" id="choices-single-bu3" [(ngModel)]="bu3Id" (ngModelChange)="changBu3()" >
+                <ng-select class="ti-form-select" data-trigger name="choices-single-bu3" id="choices-single-bu3"
+                    [(ngModel)]="bu3Id" (ngModelChange)="changBu3()">
                    <ng-option *ngFor="let item of bu3List" [value]="item.bu3id">{{item.tdesc}}</ng-option>
                </ng-select>

                <label for="detail_eng" class="ti-form-label mt-2rem">ส่วนย่อย1</label>
-                <ng-select class="ti-form-select"  data-trigger  name="choices-single-bu4" id="choices-single-bu4" [(ngModel)]="bu4Id" (ngModelChange)="changBu4()" >
+                <ng-select class="ti-form-select" data-trigger name="choices-single-bu4" id="choices-single-bu4"
+                    [(ngModel)]="bu4Id" (ngModelChange)="changBu4()">
                    <ng-option *ngFor="let item of bu4List" [value]="item.bu4id">{{item.tdesc}}</ng-option>
                </ng-select>

                <label for="detail_eng" class="ti-form-label mt-2rem">ส่วนย่อย2</label>
-                <ng-select class="ti-form-select"  data-trigger  name="choices-single-bu5" id="choices-single-bu5" [(ngModel)]="bu5Id" (ngModelChange)="changBu5()" >
+                <ng-select class="ti-form-select" data-trigger name="choices-single-bu5" id="choices-single-bu5"
+                    [(ngModel)]="bu5Id" (ngModelChange)="changBu5()">
                    <ng-option *ngFor="let item of bu5List" [value]="item.bu5id">{{item.tdesc}}</ng-option>
                </ng-select>

                <label for="detail_eng" class="ti-form-label mt-2rem">ส่วนย่อย3</label>
-                <ng-select class="ti-form-select"  data-trigger  name="choices-single-bu6" id="choices-single-bu6" [(ngModel)]="bu6Id" (ngModelChange)="changBu6()" >
+                <ng-select class="ti-form-select" data-trigger name="choices-single-bu6" id="choices-single-bu6"
+                    [(ngModel)]="bu6Id" (ngModelChange)="changBu6()">
                    <ng-option *ngFor="let item of bu6List" [value]="item.bu6id">{{item.tdesc}}</ng-option>
                </ng-select>

                <label for="detail_eng" class="ti-form-label mt-2rem">ส่วนย่อย4</label>
-                <ng-select class="ti-form-select"  data-trigger  name="choices-single-bu7" id="choices-single-bu7" [(ngModel)]="bu7Id" (ngModelChange)="changBu7()" >
+                <ng-select class="ti-form-select" data-trigger name="choices-single-bu7" id="choices-single-bu7"
+                    [(ngModel)]="bu7Id" (ngModelChange)="changBu7()">
                    <ng-option *ngFor="let item of bu7List" [value]="item.bu7id">{{item.tdesc}}</ng-option>
                </ng-select>

                <label for="detail_eng" class="ti-form-label mt-2rem">ตำแหน่งผู้บังคับบัญชา</label>
-                <ng-select class="ti-form-select"  data-trigger  name="choices-single-position" id="choices-single-position" [(ngModel)]="supervisorPositionId" (ngModelChange)="changSupervisorPosition()" >
+                <ng-select class="ti-form-select" data-trigger name="choices-single-position"
+                    id="choices-single-position" [(ngModel)]="supervisorPositionId"
+                    (ngModelChange)="changSupervisorPosition()">
                    <ng-option *ngFor="let item of positionList" [value]="item.positionId">{{item.tdesc}}</ng-option>
                </ng-select>

                <label for="detail_eng" class="ti-form-label mt-2rem">วัตถุประสงค์ของตำแหน่งงาน (Objective)</label>
-                <input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="selectJob.jobObjective" >
+                <input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="selectJob.jobObjective">

                <div class="flex justify-end mt-2rem mb-1rem">
                    <button type="button"
@@ -212,7 +222,9 @@
                        data-hs-overlay="#sub-job-competency-component-modal-edit">
                        ย้อนกลับ
                    </button>
-                <button class="ti-btn ti-btn-success {{checkJobCodeId&&modalStatus=='add'||!selectJob.jobcodeId||!selectJob.tdesc ? 'ti-btn-disabled' : ''}}" [disabled]="checkJobCodeId&&modalStatus=='add'||!selectJob.jobcodeId||!selectJob.tdesc"
+                    <button
+                        class="ti-btn ti-btn-success {{checkJobCodeId&&modalStatus=='add'||!selectJob.jobcodeId||!selectJob.tdesc ? 'ti-btn-disabled' : ''}}"
+                        [disabled]="checkJobCodeId&&modalStatus=='add'||!selectJob.jobcodeId||!selectJob.tdesc"
                        data-hs-overlay="#company-registration-page-alert-modal">
                        บันทึกข้อมูล
                    </button>
@@ -220,10 +232,10 @@
            </div>
        </div>
    </div>
- </div>
+</div>

- <div id="company-registration-page-alert-modal" class="hs-overlay hidden ti-modal">
-    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center" >
+<div id="company-registration-page-alert-modal" class="hs-overlay hidden ti-modal">
+    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
        <div class="max-h-full overflow-hidden ti-modal-content w-full">
            <div class="ti-modal-header">
                <h3 class="text-xxl font-bold text-primary">
@@ -276,7 +288,7 @@
    </div>
 </div>

- <div id="supjob-upload-modal" class="hs-overlay hidden ti-modal">
+<div id="supjob-upload-modal" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out rounded-md">
        <div class="ti-modal-header bg-primary !rounded-none !rounded-t-sm">
            <h5 class="text-xxl font-bold text-white">
@@ -295,6 +307,11 @@
                        <i class="ti ti-upload"></i>
                    </button>
                </div>
+                <div class="flex justify-center mt-2rem ">
+                    <h1 class="cursor-pointer justify-center -mb-px inline-flex items-center gap-2 font-weight-500 font-size-12px
+                    text-center text-secondary border-secondary border-b-2 align-items-end" (click)="downloadFile()">
+                        ดาวน์โหลดตัวอย่างไฟล์</h1>
+                </div>
                <div class="flex justify-center mt-2rem mb-1rem space-x-4">
                    <button type="submit" class="ti-btn ti-btn-secondary"
                        data-hs-overlay="#section-registration-upload-modal" (click)="uploadFile()"
@@ -306,4 +323,3 @@
        </div>
    </div>
 </div>
\ No newline at end of file
-
--- a/src/app/components/job-detail-components/job-detail/work-detail/work-detail.component.html
+++ b/src/app/components/job-detail-components/job-detail/work-detail/work-detail.component.html
 <div class="w-full min-height-50px mb-10px justify-between items-center">
-    <div class="flex justify-between">
-        <div class="flex pr-2">
-            <div class="px-1">
-                <button type="button" class="ti-btn ti-btn-soft-secondary h-20px m-0 shadow-md"
-                    data-hs-overlay="#supjob-upload-modal" (click)="fileInput.value = '';selectedFile=null;selectedFileName = 'กรุณาเลือกไฟล์'">
-                    <i class="ri-add-line"></i>
-                    นำเข้าข้อมูล
-                </button>
-                <a class="mx-2 justify-center  -mb-px  inline-flex items-center gap-2 font-weight-500 font-size-12px text-center text-secondary border-secondary border-b-2 align-items-end"
-                    href="javascript:void(0);" (click)="downloadFile()">
-                    ดาวน์โหลดตัวอย่างไฟล์
-                </a>
-            </div>
-        </div>
+
    <div class="flex justify-end">
        <div class="px-1">
            <div class="relative shadow-md">
                <input type="text" id="hs-leading-icon" name="hs-leading-icon"
-                                class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 "
-                                placeholder="Search by No. or Name" [(ngModel)]="search" (ngModelChange)="searchChange()" >
+                    class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name"
+                    [(ngModel)]="search" (ngModelChange)="searchChange()">

                <div
                    class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
@@ -26,6 +13,14 @@
                </div>
            </div>
        </div>
+        <div class="px-1">
+            <button type="button"
+                class=" h-45px ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-10 m-0 shadow-md"
+                data-hs-overlay="#supjob-upload-modal">
+                <i class="ti ti-file-plus"></i>
+                import
+            </button>
+        </div>
        <!-- <div class="px-1">
                        <button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-45px m-0 shadow-md"
                            data-hs-overlay="#sub-command-structure-alert-delete-modal">
@@ -40,10 +35,9 @@
                        </button>
                    </div> -->
    </div>
-            </div>
-        </div>
+</div>

-        <div class="page px-rem">
+<div class="page px-rem">
    <div class="overflow-auto shadow-md rounded-t-md">
        <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover table-bordered">
            <thead>
@@ -95,12 +89,13 @@
            </tbody>
        </table>
    </div>
-             <app-pagination [totalItems]="jobcodeFilter().length" [pageSize]="pageSize" (pageChange)="currentPage = $event" (pageSizeChange)="pageSize = $event;currentPage = 1"></app-pagination>
+    <app-pagination [totalItems]="jobcodeFilter().length" [pageSize]="pageSize" (pageChange)="currentPage = $event"
+        (pageSizeChange)="pageSize = $event;currentPage = 1"></app-pagination>

-         </div>
+</div>


- <div id="sub-job-competency-component-modal-edit" class="hs-overlay hidden ti-modal">
+<div id="sub-job-competency-component-modal-edit" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)]">
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
@@ -118,7 +113,8 @@
            <div class="ti-modal-center">
                <div class="flex justify-end" style="padding-right: 1rem;">
                    <div class="px-1">
-                         <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md" (click)="clearValue()">
+                        <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md"
+                            (click)="clearValue()">
                            <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
                                xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
                                transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
@@ -134,81 +130,97 @@
                            Clear
                        </button>
                    </div>
-                     <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                     </div>
+                     </div> -->
                </div>
            </div>
            <div class="ti-modal-body" style="padding-top: 0px;">
                <label for="input-label" class="ti-form-label mt-1rem">รหัสงาน<span class="text-danger">*</span></label>
-                 <input type="text" id="input-label" class="ti-form-input  bg-input-readonly" readonly [(ngModel)]="selectJob.jobcodeId">
-                 <label for="detail_th" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (ไทย)<span class="text-danger">*</span></label>
-                 <input type="text" id="detail_th" class="ti-form-input  bg-input-readonly" readonly [(ngModel)]="selectJob.tdesc">
+                <input type="text" id="input-label" class="ti-form-input  bg-input-readonly" readonly
+                    [(ngModel)]="selectJob.jobcodeId">
+                <label for="detail_th" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (ไทย)<span
+                        class="text-danger">*</span></label>
+                <input type="text" id="detail_th" class="ti-form-input  bg-input-readonly" readonly
+                    [(ngModel)]="selectJob.tdesc">
                <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (อังกฤษ)</label>
-                 <input type="text" id="detail_eng" class="ti-form-input  bg-input-readonly" readonly [(ngModel)]="selectJob.edesc">
+                <input type="text" id="detail_eng" class="ti-form-input  bg-input-readonly" readonly
+                    [(ngModel)]="selectJob.edesc">
                <div class="flex space-x-4 justify-center">
                    <div class="flex flex-col w-full">
                        <label for="input-label" class="ti-form-label mt-2rem">งานบริหาร (Management) </label>
-                        <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50" [(ngModel)]="selectJob.serviceWorkText"></textarea>
+                        <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50"
+                            [(ngModel)]="selectJob.serviceWorkText"></textarea>
                    </div>

                    <!-- label และ input ที่สอง -->
                    <div class="flex flex-col w-1/2">
                        <label for="input-label" class="ti-form-label mt-2rem">เปอร์เซ็นต์ %</label>
-                        <input type="text" id="input-label" class="ti-form-input w-auto" oninput="value = value.replace(/[^0-9.]/g, '');" onclick="value = value=='0'?'':value" [(ngModel)]="selectJob.serviceWorkPercent">
+                        <input type="text" id="input-label" class="ti-form-input w-auto"
+                            oninput="value = value.replace(/[^0-9.]/g, '');" onclick="value = value=='0'?'':value"
+                            [(ngModel)]="selectJob.serviceWorkPercent">
                    </div>
                </div>
                <div class="flex space-x-4 justify-center">
                    <div class="flex flex-col w-full">
                        <label for="input-label" class="ti-form-label mt-2rem">งานที่รับผิดชอบ
                            (งานปฏิบัติ)</label>
-                        <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50" [(ngModel)]="selectJob.responsibleWorkText"></textarea>
+                        <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50"
+                            [(ngModel)]="selectJob.responsibleWorkText"></textarea>
                    </div>

                    <!-- label และ input ที่สอง -->
                    <div class="flex flex-col w-1/2">
                        <label for="input-label" class="ti-form-label mt-2rem">เปอร์เซ็นต์ %</label>
-                        <input type="text" id="input-label" class="ti-form-input w-auto"oninput="value = value.replace(/[^0-9.]/g, '');"  [(ngModel)]="selectJob.responsibleWorkPercent">
+                        <input type="text" id="input-label" class="ti-form-input w-auto"
+                            oninput="value = value.replace(/[^0-9.]/g, '');"
+                            [(ngModel)]="selectJob.responsibleWorkPercent">
                    </div>
                </div>
                <div class="flex space-x-4 justify-center">
                    <div class="flex flex-col w-full">
                        <label for="input-label" class="ti-form-label mt-2rem">งานที่ได้รับมอบหมายพิเศษ</label>
-                        <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50" [(ngModel)]="selectJob.specialWorkText"></textarea>
+                        <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50"
+                            [(ngModel)]="selectJob.specialWorkText"></textarea>
                    </div>

                    <!-- label และ input ที่สอง -->
                    <div class="flex flex-col w-1/2">
                        <label for="input-label" class="ti-form-label mt-2rem">เปอร์เซ็นต์ %</label>
-                        <input type="text" id="input-label" class="ti-form-input w-auto" oninput="value = value.replace(/[^0-9]/g, '');"  [(ngModel)]="selectJob.specialWorkPercent">
+                        <input type="text" id="input-label" class="ti-form-input w-auto"
+                            oninput="value = value.replace(/[^0-9]/g, '');" [(ngModel)]="selectJob.specialWorkPercent">
                    </div>
                </div>
                <div class="flex space-x-4 justify-center">
                    <div class="flex flex-col w-full">
-                        <label for="input-label"
-                            class="ti-form-label mt-2rem">งานที่ทุกตำแหน่งต้องปฏิบัติ</label>
-                        <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50"  [(ngModel)]="selectJob.allPositionWorkText"></textarea>
+                        <label for="input-label" class="ti-form-label mt-2rem">งานที่ทุกตำแหน่งต้องปฏิบัติ</label>
+                        <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50"
+                            [(ngModel)]="selectJob.allPositionWorkText"></textarea>
                    </div>

                    <!-- label และ input ที่สอง -->
                    <div class="flex flex-col w-1/2">
                        <label for="input-label" class="ti-form-label mt-2rem">เปอร์เซ็นต์ %</label>
-                        <input type="text" id="input-label" class="ti-form-input w-auto" oninput="value = value.replace(/[^0-9]/g, '');" [(ngModel)]="selectJob.allPositionWorkPercent">
+                        <input type="text" id="input-label" class="ti-form-input w-auto"
+                            oninput="value = value.replace(/[^0-9]/g, '');"
+                            [(ngModel)]="selectJob.allPositionWorkPercent">
                    </div>
                </div>
                <div class="flex space-x-4 justify-center">
                    <div class="flex flex-col w-full">
                        <label for="input-label" class="ti-form-label mt-2rem">อื่นๆ</label>
-                        <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50"  [(ngModel)]="selectJob.otherWorkText"></textarea>
+                        <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50"
+                            [(ngModel)]="selectJob.otherWorkText"></textarea>
                    </div>

                    <!-- label และ input ที่สอง -->
                    <div class="flex flex-col w-1/2">
                        <label for="input-label" class="ti-form-label mt-2rem">เปอร์เซ็นต์ %</label>
-                        <input type="text" id="input-label" class="ti-form-input w-auto" oninput="value = value.replace(/[^0-9]/g, '');" [(ngModel)]="selectJob.otherWorkPercent" >
+                        <input type="text" id="input-label" class="ti-form-input w-auto"
+                            oninput="value = value.replace(/[^0-9]/g, '');" [(ngModel)]="selectJob.otherWorkPercent">
                    </div>
                </div>
                <div class="flex justify-end mt-2rem mb-1rem">
@@ -226,9 +238,9 @@
        </div>

    </div>
- </div>
+</div>

- <div id="company-registration-page-alert-modal" class="hs-overlay hidden ti-modal">
+<div id="company-registration-page-alert-modal" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
        <div class="max-h-full overflow-hidden ti-modal-content w-full">
            <div class="ti-modal-header">
@@ -282,7 +294,7 @@
    </div>
 </div>

- <div id="supjob-upload-modal" class="hs-overlay hidden ti-modal">
+<div id="supjob-upload-modal" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out rounded-md">
        <div class="ti-modal-header bg-primary !rounded-none !rounded-t-sm">
            <h5 class="text-xxl font-bold text-white">
@@ -301,6 +313,11 @@
                        <i class="ti ti-upload"></i>
                    </button>
                </div>
+                <div class="flex justify-center mt-2rem ">
+                    <h1 class="cursor-pointer justify-center -mb-px inline-flex items-center gap-2 font-weight-500 font-size-12px
+                    text-center text-secondary border-secondary border-b-2 align-items-end" (click)="downloadFile()">
+                        ดาวน์โหลดตัวอย่างไฟล์</h1>
+                </div>
                <div class="flex justify-center mt-2rem mb-1rem space-x-4">
                    <button type="submit" class="ti-btn ti-btn-secondary"
                        data-hs-overlay="#section-registration-upload-modal" (click)="uploadFile()"
@@ -312,6 +329,3 @@
        </div>
    </div>
 </div>
\ No newline at end of file
-
- 
-
--- a/src/app/components/job-detail-components/job-position-indicators/sub-job-position-indicators/sub-job-position-indicators.component.html
+++ b/src/app/components/job-detail-components/job-position-indicators/sub-job-position-indicators/sub-job-position-indicators.component.html
 <div class="w-full min-height-50px mb-10px justify-between items-center">
-    <div class="flex justify-between">
-        <div class="flex pr-2">
-            <div class="px-1">
-                <button type="button" class="ti-btn ti-btn-soft-secondary h-20px m-0 shadow-md"
-                    data-hs-overlay="#supjob-upload-modal" (click)="fileInput.value = '';selectedFile=null;selectedFileName = 'กรุณาเลือกไฟล์'">
-                    <i class="ri-add-line"></i>
-                    นำเข้าข้อมูล
-                </button>
-                <a class="mx-2 justify-center  -mb-px  inline-flex items-center gap-2 font-weight-500 font-size-12px text-center text-secondary border-secondary border-b-2 align-items-end"
-                    href="javascript:void(0);" (click)="downloadFile()">
-                    ดาวน์โหลดตัวอย่างไฟล์
-                </a>
-            </div>
-        </div>
    <div class="flex justify-end">
        <div class="px-1">
            <div class="relative shadow-md">
                <input type="text" id="hs-leading-icon" name="hs-leading-icon"
-                                class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 "
-                                placeholder="Search by No. or Name" [(ngModel)]="search" (ngModelChange)="searchChange()" >
+                    class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name"
+                    [(ngModel)]="search" (ngModelChange)="searchChange()">

                <div
                    class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
@@ -26,6 +12,14 @@
                </div>
            </div>
        </div>
+        <div class="px-1">
+            <button type="button"
+                class=" h-45px ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-10 m-0 shadow-md"
+                data-hs-overlay="#supjob-upload-modal">
+                <i class="ti ti-file-plus"></i>
+                import
+            </button>
+        </div>
        <!-- <div class="px-1">
                        <button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-45px m-0 shadow-md"
                            data-hs-overlay="#sub-command-structure-alert-delete-modal">
@@ -40,10 +34,9 @@
                        </button>
                    </div> -->
    </div>
-            </div>
-        </div>
+</div>

-        <div class="page px-rem">
+<div class="page px-rem">
    <div class="overflow-auto shadow-md rounded-t-md">
        <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover table-bordered">
            <thead>
@@ -95,11 +88,12 @@
            </tbody>
        </table>
    </div>
-             <app-pagination [totalItems]="jobcodeFilter().length" [pageSize]="pageSize" (pageChange)="currentPage = $event" (pageSizeChange)="pageSize = $event;currentPage = 1"></app-pagination>
-         </div>
+    <app-pagination [totalItems]="jobcodeFilter().length" [pageSize]="pageSize" (pageChange)="currentPage = $event"
+        (pageSizeChange)="pageSize = $event;currentPage = 1"></app-pagination>
+</div>


- <div id="sub-job-competency-component-modal-edit" class="hs-overlay hidden ti-modal">
+<div id="sub-job-competency-component-modal-edit" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)]">
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
@@ -117,7 +111,8 @@
            <div class="ti-modal-center">
                <div class="flex justify-end" style="padding-right: 1rem;">
                    <div class="px-1">
-                         <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md" (click)="clearValue()">
+                        <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md"
+                            (click)="clearValue()">
                            <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
                                xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
                                transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
@@ -133,23 +128,29 @@
                            Clear
                        </button>
                    </div>
-                     <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                     </div>
+                     </div> -->
                </div>
            </div>
            <div class="ti-modal-body" style="padding-top: 0px;">
                <label for="input-label" class="ti-form-label mt-1rem">รหัสงาน<span class="text-danger">*</span></label>
-                 <input type="text" id="input-label" class="ti-form-input  bg-input-readonly" readonly [(ngModel)]="selectJob.jobcodeId">
-                 <label for="detail_th" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (ไทย)<span class="text-danger">*</span></label>
-                 <input type="text" id="detail_th" class="ti-form-input bg-input-readonly" readonly [(ngModel)]="selectJob.tdesc">
+                <input type="text" id="input-label" class="ti-form-input  bg-input-readonly" readonly
+                    [(ngModel)]="selectJob.jobcodeId">
+                <label for="detail_th" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (ไทย)<span
+                        class="text-danger">*</span></label>
+                <input type="text" id="detail_th" class="ti-form-input bg-input-readonly" readonly
+                    [(ngModel)]="selectJob.tdesc">
                <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (อังกฤษ)</label>
-                 <input type="text" id="detail_eng" class="ti-form-input bg-input-readonly" readonly [(ngModel)]="selectJob.edesc">
-                <label for="detail_eng" class="ti-form-label mt-2rem">ตัวชี้วัดของตำแหน่งงาน (Key Performance Indicators: KPIs)</label>
-                <textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="5" cols="50" [(ngModel)]="selectJob.kpiWorkText"></textarea>
+                <input type="text" id="detail_eng" class="ti-form-input bg-input-readonly" readonly
+                    [(ngModel)]="selectJob.edesc">
+                <label for="detail_eng" class="ti-form-label mt-2rem">ตัวชี้วัดของตำแหน่งงาน (Key Performance
+                    Indicators: KPIs)</label>
+                <textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="5" cols="50"
+                    [(ngModel)]="selectJob.kpiWorkText"></textarea>
                <div class="flex justify-end mt-2rem mb-1rem">
                    <button type="button"
                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
@@ -165,9 +166,9 @@
        </div>

    </div>
- </div>
+</div>

- <div id="company-registration-page-alert-modal" class="hs-overlay hidden ti-modal">
+<div id="company-registration-page-alert-modal" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
        <div class="max-h-full overflow-hidden ti-modal-content w-full">
            <div class="ti-modal-header">
@@ -221,7 +222,7 @@
    </div>
 </div>

- <div id="supjob-upload-modal" class="hs-overlay hidden ti-modal">
+<div id="supjob-upload-modal" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out rounded-md">
        <div class="ti-modal-header bg-primary !rounded-none !rounded-t-sm">
            <h5 class="text-xxl font-bold text-white">
@@ -240,6 +241,11 @@
                        <i class="ti ti-upload"></i>
                    </button>
                </div>
+                <div class="flex justify-center mt-2rem ">
+                    <h1 class="cursor-pointer justify-center -mb-px inline-flex items-center gap-2 font-weight-500 font-size-12px
+                    text-center text-secondary border-secondary border-b-2 align-items-end" (click)="downloadFile()">
+                        ดาวน์โหลดตัวอย่างไฟล์</h1>
+                </div>
                <div class="flex justify-center mt-2rem mb-1rem space-x-4">
                    <button type="submit" class="ti-btn ti-btn-secondary"
                        data-hs-overlay="#section-registration-upload-modal" (click)="uploadFile()"

--- a/src/app/components/job-detail-components/job-qualifications/sub-job-qualifications/sub-job-qualifications.component.html
+++ b/src/app/components/job-detail-components/job-qualifications/sub-job-qualifications/sub-job-qualifications.component.html
 <div class="w-full min-height-50px mb-10px justify-between items-center">
-    <div class="flex justify-between">
-        <div class="flex pr-2">
-            <div class="px-1">
-                <button type="button" class="ti-btn ti-btn-soft-secondary h-20px m-0 shadow-md"
-                    data-hs-overlay="#supjob-upload-modal" (click)="fileInput.value = '';selectedFile=null;selectedFileName = 'กรุณาเลือกไฟล์'">
-                    <i class="ri-add-line"></i>
-                    นำเข้าข้อมูล
-                </button>
-                <a class="mx-2 justify-center  -mb-px  inline-flex items-center gap-2 font-weight-500 font-size-12px text-center text-secondary border-secondary border-b-2 align-items-end"
-                    href="javascript:void(0);" (click)="downloadFile()">
-                    ดาวน์โหลดตัวอย่างไฟล์
-                </a>
-            </div>
-        </div>
    <div class="flex justify-end">
        <div class="px-1">
            <div class="relative shadow-md">
                <input type="text" id="hs-leading-icon" name="hs-leading-icon"
-                                class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 "
-                                placeholder="Search by No. or Name" [(ngModel)]="search" (ngModelChange)="searchChange()" >
+                    class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name"
+                    [(ngModel)]="search" (ngModelChange)="searchChange()">

                <div
                    class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
@@ -26,6 +12,15 @@
                </div>
            </div>
        </div>
+        <div class="px-1">
+            <button type="button"
+                class=" h-45px ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-10 m-0 shadow-md"
+                data-hs-overlay="#supjob-upload-modal"
+                (click)="fileInput.value = '';selectedFile=null;selectedFileName = 'กรุณาเลือกไฟล์'">
+                <i class="ti ti-file-plus"></i>
+                import
+            </button>
+        </div>
        <!-- <div class="px-1">
                        <button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-45px m-0 shadow-md"
                            data-hs-overlay="#sub-command-structure-alert-delete-modal">
@@ -40,10 +35,9 @@
                        </button>
                    </div> -->
    </div>
-            </div>
-        </div>
+</div>

-        <div class="page px-rem">
+<div class="page px-rem">
    <div class="overflow-auto shadow-md rounded-t-md">
        <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover table-bordered">
            <thead>
@@ -95,11 +89,12 @@
            </tbody>
        </table>
    </div>
-             <app-pagination [totalItems]="jobcodeFilter().length" [pageSize]="pageSize" (pageChange)="currentPage = $event" (pageSizeChange)="pageSize = $event;currentPage = 1"></app-pagination>
-         </div>
+    <app-pagination [totalItems]="jobcodeFilter().length" [pageSize]="pageSize" (pageChange)="currentPage = $event"
+        (pageSizeChange)="pageSize = $event;currentPage = 1"></app-pagination>
+</div>


- <div id="sub-job-competency-component-modal-edit" class="hs-overlay hidden ti-modal">
+<div id="sub-job-competency-component-modal-edit" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)]">
        <div class="max-h-full overflow-hidden ti-modal-content">
            <div class="ti-modal-header">
@@ -117,7 +112,8 @@
            <div class="ti-modal-center">
                <div class="flex justify-end" style="padding-right: 1rem;">
                    <div class="px-1">
-                         <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md" (click)="clearValue()">
+                        <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md"
+                            (click)="clearValue()">
                            <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
                                xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
                                transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
@@ -133,29 +129,39 @@
                            Clear
                        </button>
                    </div>
-                     <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                     </div>
+                     </div> -->
                </div>
            </div>
            <div class="ti-modal-body" style="padding-top: 0px;">
                <label for="input-label" class="ti-form-label mt-1rem">รหัสงาน<span class="text-danger">*</span></label>
-                 <input type="text" id="input-label" class="ti-form-input  bg-input-readonly" readonly [(ngModel)]="selectJob.jobcodeId">
-                 <label for="detail_th" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (ไทย)<span class="text-danger">*</span></label>
-                 <input type="text" id="detail_th" class="ti-form-input bg-input-readonly" readonly [(ngModel)]="selectJob.tdesc">
+                <input type="text" id="input-label" class="ti-form-input  bg-input-readonly" readonly
+                    [(ngModel)]="selectJob.jobcodeId">
+                <label for="detail_th" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (ไทย)<span
+                        class="text-danger">*</span></label>
+                <input type="text" id="detail_th" class="ti-form-input bg-input-readonly" readonly
+                    [(ngModel)]="selectJob.tdesc">
                <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (อังกฤษ)</label>
-                 <input type="text" id="detail_eng" class="ti-form-input bg-input-readonly" readonly [(ngModel)]="selectJob.edesc">
+                <input type="text" id="detail_eng" class="ti-form-input bg-input-readonly" readonly
+                    [(ngModel)]="selectJob.edesc">
                <label for="detail_eng" class="ti-form-label mt-2rem">การศึกษา/ประสบการณ์ (Education/Experience)</label>
-                 <textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="4" cols="50" [(ngModel)]="selectJob.educationExperienceText"></textarea>
-                <label for="detail_eng" class="ti-form-label mt-2rem">ใบประกาศนียบัตร (Certificate)/ใบประกอบวิชาชีพ (Licensed Professional)</label>
-                    <textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="4" cols="50"[(ngModel)]="selectJob.cerLicensedText"></textarea>
-                <label for="detail_eng" class="ti-form-label mt-2rem">การฝึกอบรมที่จำเป็นต่อการปฏิบัติงาน (Especially Training Course)</label>
-                    <textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="4" cols="50"[(ngModel)]="selectJob.especiallyTrainingText"></textarea>
+                <textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="4" cols="50"
+                    [(ngModel)]="selectJob.educationExperienceText"></textarea>
+                <label for="detail_eng" class="ti-form-label mt-2rem">ใบประกาศนียบัตร (Certificate)/ใบประกอบวิชาชีพ
+                    (Licensed Professional)</label>
+                <textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="4" cols="50"
+                    [(ngModel)]="selectJob.cerLicensedText"></textarea>
+                <label for="detail_eng" class="ti-form-label mt-2rem">การฝึกอบรมที่จำเป็นต่อการปฏิบัติงาน (Especially
+                    Training Course)</label>
+                <textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="4" cols="50"
+                    [(ngModel)]="selectJob.especiallyTrainingText"></textarea>
                <label for="detail_eng" class="ti-form-label mt-2rem">ความสามารถอื่นๆ (Other Abillities)</label>
-                    <textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="5" cols="50"[(ngModel)]="selectJob.otherAbilitiesText"></textarea>
+                <textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="5" cols="50"
+                    [(ngModel)]="selectJob.otherAbilitiesText"></textarea>
                <div class="flex justify-end mt-2rem mb-1rem">
                    <button type="button"
                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
@@ -171,9 +177,9 @@
        </div>

    </div>
- </div>
+</div>

- <div id="company-registration-page-alert-modal" class="hs-overlay hidden ti-modal">
+<div id="company-registration-page-alert-modal" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
        <div class="max-h-full overflow-hidden ti-modal-content w-full">
            <div class="ti-modal-header">
@@ -227,7 +233,7 @@
    </div>
 </div>

- <div id="supjob-upload-modal" class="hs-overlay hidden ti-modal">
+<div id="supjob-upload-modal" class="hs-overlay hidden ti-modal">
    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out rounded-md">
        <div class="ti-modal-header bg-primary !rounded-none !rounded-t-sm">
            <h5 class="text-xxl font-bold text-white">
@@ -246,6 +252,11 @@
                        <i class="ti ti-upload"></i>
                    </button>
                </div>
+                <div class="flex justify-center mt-2rem ">
+                    <h1 class="cursor-pointer justify-center -mb-px inline-flex items-center gap-2 font-weight-500 font-size-12px
+                    text-center text-secondary border-secondary border-b-2 align-items-end" (click)="downloadFile()">
+                        ดาวน์โหลดตัวอย่างไฟล์</h1>
+                </div>
                <div class="flex justify-center mt-2rem mb-1rem space-x-4">
                    <button type="submit" class="ti-btn ti-btn-secondary"
                        data-hs-overlay="#section-registration-upload-modal" (click)="uploadFile()"
@@ -257,5 +268,3 @@
        </div>
    </div>
 </div>
\ No newline at end of file
-
-
--- a/src/app/components/performance-management-evaluation/assessment-management/evaluation-grouping/edit-evaluation-grouping/edit-evaluation-grouping.component.html
+++ b/src/app/components/performance-management-evaluation/assessment-management/evaluation-grouping/edit-evaluation-grouping/edit-evaluation-grouping.component.html
@@ -357,7 +357,12 @@
                </p>
                <p class="mt-1 text-gray-800 dark:text-white/70"
                    *ngIf="currentModal=='delete'||currentModal=='deleteGroup'">
+                    <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem" *ngIf="currentModal=='save'">
@@ -379,7 +384,7 @@
                        ย้อนกลับ
                    </button>
                    <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-                        data-hs-overlay="#edit-evaluation-grouping-alert-modal" (click)="deletePmsGroupAssessment()">
+                        data-hs-overlay="#edit-evaluation-grouping-alert-modal" (click)="deletePmsGroupAssessment()"  *ngIf="numDataListChecked">
                        ลบข้อมูล
                    </a>
                </div>

--- a/src/app/components/performance-management-evaluation/evaluation-cycle-performance/document-form/document-form.component.html
+++ b/src/app/components/performance-management-evaluation/evaluation-cycle-performance/document-form/document-form.component.html
@@ -255,7 +255,12 @@
            </div>
            <div class="ti-modal-body ">
                <p class="mt-1 text-gray-800 dark:text-white/70">
-                    ยืนยันการลบข้อมูลหรือไม่!
+                    <ng-container *ngIf="numDataListChecked">
+                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>!
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -264,7 +269,7 @@
                        data-hs-overlay="#document-form-table-modal-edit">
                        ย้อนกลับ
                    </button>
-                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
+                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"  *ngIf="numDataListChecked"
                        data-hs-overlay="#document-form-alert-delete-modal" (click)="addUser();showSuccessDelete()">
                        ลบข้อมูล
                    </a>

--- a/src/app/components/performance-management-evaluation/evaluation-cycle-performance/management-evaluation-cycle/management-evaluation-cycle.component.html
+++ b/src/app/components/performance-management-evaluation/evaluation-cycle-performance/management-evaluation-cycle/management-evaluation-cycle.component.html
@@ -378,8 +378,13 @@
            ยืนยันการบันทึกข้อมูลหรือไม่
          </ng-container>
          <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+            <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+          </ng-container>
          <ng-container *ngIf="modalStatus=='createForm'">
            คุณต้องการสร้างแบบฟอร์มการประเมินใหม่หรือไม่
          </ng-container>
@@ -403,7 +408,7 @@
              data-hs-overlay="#management-evaluation-cycle-page-alert-modal">
              ย้อนกลับ
            </button>
-            <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
+            <a class="ti-btn ti-btn-danger" href="javascript:void(0);"  *ngIf="numDataListChecked"
              data-hs-overlay="#management-evaluation-cycle-page-alert-modal" (click)="deletePmsMasfromEvaluation()">
              ลบข้อมูล
            </a>

--- a/src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-topics/assessment-topics.component.html
+++ b/src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-topics/assessment-topics.component.html
@@ -313,8 +313,13 @@
            ยืนยันการบันทึกข้อมูลหรือไม่
          </ng-container>
          <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+            <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+          </ng-container>
        </p>

        <div class="flex justify-end mt-2rem mb-1rem">
@@ -335,7 +340,7 @@
              data-hs-overlay="#assessment-topics-alert-modal">
              ย้อนกลับ
            </button>
-            <a class="ti-btn ti-btn-danger" href="javascript:void(0);" data-hs-overlay="#assessment-topics-alert-modal"
+            <a class="ti-btn ti-btn-danger" href="javascript:void(0);" data-hs-overlay="#assessment-topics-alert-modal"  *ngIf="numDataListChecked"
              (click)="updatePmstopic('delete')">
              ลบข้อมูล
            </a>

--- a/src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-types/assessment-types.component.html
+++ b/src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-types/assessment-types.component.html
@@ -263,8 +263,13 @@
                        ยืนยันการบันทึกข้อมูลหรือไม่
                    </ng-container>
                    <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+                        <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+                    </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -285,7 +290,7 @@
                            data-hs-overlay="#assessment-types-alert-modal">
                            ย้อนกลับ
                        </button>
-                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
+                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"  *ngIf="numDataListChecked"
                            data-hs-overlay="#assessment-types-alert-modal" (click)="updatePmstype('delete')">
                            ลบข้อมูล
                        </a>

--- a/src/app/components/performance-management-evaluation/pms-grade-registration/pms-grade-management/pms-grade-management.component.html
+++ b/src/app/components/performance-management-evaluation/pms-grade-registration/pms-grade-management/pms-grade-management.component.html
@@ -149,7 +149,12 @@
                </div>
                <div class="ti-modal-body ">
                    <p class="mt-1 text-gray-800 dark:text-white/70">
+                        <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                    </p>

                    <div class="flex justify-end mt-2rem mb-1rem">
@@ -159,7 +164,7 @@
                            ย้อนกลับ
                        </button>
                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-                            data-hs-overlay="#grade-management-alert-delete-modal"
+                            data-hs-overlay="#grade-management-alert-delete-modal"  *ngIf="numDataListChecked"
                            (click)="deletePmsGroupGradeList();">
                            ลบข้อมูล
                        </a>

--- a/src/app/components/performance-management-evaluation/pms-grade-registration/pms-grade-management/pms-sub-grade-registration/pms-sub-grade-registration.component.html
+++ b/src/app/components/performance-management-evaluation/pms-grade-registration/pms-grade-management/pms-sub-grade-registration/pms-sub-grade-registration.component.html
@@ -43,12 +43,12 @@
                    Delete
                </button>
            </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
                    <i class="ti ti-book fs-l"></i>
                    Help
                </button>
-            </div>
+            </div> -->
        </div>
    </div>
 </div>
@@ -322,7 +322,12 @@
            </div>
            <div class="ti-modal-body ">
                <p class="mt-1 text-gray-800 dark:text-white/70">
-                    ยืนยันการลบข้อมูลหรือไม่!
+                    <ng-container *ngIf="numDataListChecked">
+                        ยืนยันการลบข้อมูลหรือไม่
+                    </ng-container>
+                    <ng-container *ngIf="!numDataListChecked">
+                        เลือกข้อมูลที่ต้องการลบ
+                    </ng-container>!
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -331,9 +336,8 @@
                        data-hs-overlay="#sub-grade-registration-alert-delete-modal">
                        ย้อนกลับ
                    </button>
-                    <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-                        data-hs-overlay="#sub-grade-registration-alert-delete-modal"
-                        (click)="updatePmsGroupGrade()">
+                    <a class="ti-btn ti-btn-danger" href="javascript:void(0);" *ngIf="numDataListChecked"
+                        data-hs-overlay="#sub-grade-registration-alert-delete-modal" (click)="updatePmsGroupGrade()">
                        ลบข้อมูล
                    </a>
                </div>

--- a/src/app/components/performance-management-evaluation/time-attendance/time-attendance.component.html
+++ b/src/app/components/performance-management-evaluation/time-attendance/time-attendance.component.html
@@ -436,8 +436,13 @@
                        ยืนยันการบันทึกข้อมูลหรือไม่
                    </ng-container>
                    <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+                        <ng-container *ngIf="numDataListChecked">
                            ยืนยันการลบข้อมูลหรือไม่
                        </ng-container>
+                        <ng-container *ngIf="!numDataListChecked">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
+                    </ng-container>
                </p>

                <div class="flex justify-end mt-2rem mb-1rem">
@@ -458,7 +463,7 @@
                            data-hs-overlay="#time-attendance-alert-modal">
                            ย้อนกลับ
                        </button>
-                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
+                        <a class="ti-btn ti-btn-danger" href="javascript:void(0);"  *ngIf="numDataListChecked"
                            data-hs-overlay="#time-attendance-alert-modal" (click)="deletePmsWorkingTime()">
                            ลบข้อมูล
                        </a>