ข้อมูลทั่วไป

src/app/components/company-components/account-settings/role-permission-config/role-permission-config.component.ts

@@ -70,6 +70,7 @@ export class RolePermissionConfigComponent {
   getConfigList() {
     this.configPermission.loading = true
     this.configPermission.dataList = []
+    this.selectedItems.data.clear()
     this.configPermissionService.getList().subscribe({
       next: response => {
         this.configPermission.dataList = response.map(x => {

src/app/components/company-components/account-settings/user-settings/user-settings.component.ts

@@ -166,6 +166,7 @@ export class UserSettingsComponent {
 
   getUserList() {
     this.user.loading = true
+    this.selectedItems.data.clear()
     this.userService.getList().subscribe({
       next: response => {
         this.user.dataList = response.map(x => {

src/app/components/company-components/employee-registration/sub-employee-registration/sub-employee-registration.component.ts

@@ -514,6 +514,7 @@ export class SubEmployeeRegistrationComponent {
 
   getEmployeeList() {
     this.employee.loading = true
+    this.selectedItems.data.clear()
     this.employeeService.getList().subscribe({
       next: response => {
         this.employee.dataList = response.map(x => {

src/app/components/job-detail-components/job-detail-management/import-data/import-data.component.html

@@ -28,6 +28,13 @@
                 Add
             </button>
         </div>
+        <div class="px-1">
+            <button type="button" class="ti-btn ti-btn-soft-danger  h-45px m-0 shadow-md"
+                data-hs-overlay="#company-registration-page-alert-modal" (click)="currentModal='delete'">
+                <i class="ri-delete-bin-6-line"></i>
+                Delete
+            </button>
+        </div>
     </div>
 </div>
 
@@ -36,7 +43,6 @@
         [columns]="columns" [selectedItems]="selectedItems" modalName="#sub-job-competency-component-modal-edit"
         (sendSelectData)="currentModal='edit';edit($event)" (sendSelectedItems)="onSelectItemChange($event)">
     </app-datagrid-syncfution>
-
 </div>
 
 
@@ -75,12 +81,6 @@
                             Clear
                         </button>
                     </div>
-                    <!-- <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 class="ti-modal-body" style="padding-top: 0px;">
@@ -196,7 +196,12 @@
                         ยืนยันการบันทึกข้อมูลหรือไม่
                     </ng-container>
                     <ng-container *ngIf="currentModal=='delete'">
-                        ยืนยันการลบข้อมูลหรือไม่
+                        <ng-container *ngIf="numSelectItem()">
+                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numSelectItem()">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                     </ng-container>
                 </p>
 
@@ -219,7 +224,8 @@
                             ย้อนกลับ
                         </button>
                         <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-                            data-hs-overlay="#company-registration-page-alert-modal" (click)="deleteJob()">
+                            data-hs-overlay="#company-registration-page-alert-modal" (click)="deleteJob()"
+                            *ngIf="numSelectItem()">
                             ลบข้อมูล
                         </a>
                     </ng-container>

src/app/components/job-detail-components/job-detail-management/import-data/import-data.component.ts

@@ -131,6 +131,7 @@ export class ImportDataComponent {
 
   getListJob() {
     this.loading = false
+    this.selectedItems.data.clear()
     this.jobcodeService.getList().subscribe({
       next: response => {
         this.jobCodeList = response.map((x: any) => {

src/app/components/job-detail-components/job-detail/work-detail/work-detail.component.ts

@@ -55,6 +55,7 @@ export class WorkDetailComponent {
   }
   getListJob() {
     this.loading = false
+    this.selectedItems.data.clear()
     this.jobcodeService.getList().subscribe({
       next: response => {
         this.jobCodeList = response.map((x: any) => {