From f727f67ed93b60dcbe33db546f3201537bf71bc3 Mon Sep 17 00:00:00 2001 From: Nakarin <nakarin.lua@myhr.co.th> Date: Wed, 29 Jan 2025 14:04:08 +0700 Subject: [PATCH] UPDATE การจัดการข้อมูลองค์กร > ทะเบียนบริษัท --- src/app/components/company-components/company-registration/branch-business-unit/department-register/department-register.component.html | 17 +++++++---------- src/app/components/company-components/company-registration/company-registration-page/company-registration-page.component.html | 13 ++++++------- src/app/shared/components/header/header.component.html | 4 ++-- src/assets/css/style.css | 1 + 4 files changed, 16 insertions(+), 19 deletions(-) diff --git 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 index 230a74d..6a15a7d 100644 --- 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 @@ -48,14 +48,13 @@ </div> <div class="page px-rem"> - <div class="overflow-auto rounded-top-0.65rem"> - <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover"> - <thead class="height-50px"> - <tr class="font-size-12px"> + <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> + <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" - [class.!text-center]="f||l"> + <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> @@ -74,10 +73,8 @@ <tbody *ngIf="bu1ListFilter().length"> <tr *ngFor="let item of bu1ListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index"> - <td class="flex justify-center"> - {{((currentPage-1) * 10)+(i+1)}} - </td> - <td>{{item.bu1id}}</td> + <td class="text-center">{{((currentPage-1) * 10)+(i+1)}}</td> + <td class="text-center">{{item.bu1id}}</td> <td>{{item.tdesc}}</td> <td>{{item.edesc}}</td> <td class="flex justify-center"> diff --git 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 index 14b1b97..7b1727e 100644 --- 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 @@ -51,14 +51,13 @@ </div> <div class="page px-rem"> - <div class="overflow-auto rounded-top-0.65rem"> - <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover"> - <thead class="height-50px"> - <tr class="font-size-12px"> + <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> + <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" - [class.!text-center]="f||l"> + <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> @@ -77,7 +76,7 @@ <tbody *ngIf="dataListFilter().length"> <tr *ngFor="let item of dataListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index"> - <td class="flex justify-center items-center"> + <td class="text-center"> <input type="checkbox" class="ti-form-checkbox cursor-pointer" id="checkbox-{{item.data.code}}" [(ngModel)]="item.check"> <label for="checkbox-{{item.data.code}}"> {{item.data.code}}</label> </td> diff --git a/src/app/shared/components/header/header.component.html b/src/app/shared/components/header/header.component.html index b4008dc..6c863d8 100644 --- a/src/app/shared/components/header/header.component.html +++ b/src/app/shared/components/header/header.component.html @@ -17,7 +17,7 @@ <!-- End Navigation Toggle --> </div> - <div class="responsive-logo"> + <!-- <div class="responsive-logo"> <a class="responsive-logo-dark" routerLink="/dashboard/sales" @@ -36,7 +36,7 @@ alt="logo" class="mx-auto" /></a> - </div> + </div> --> <div class="header-right"> <div class="responsive-headernav"> diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 12b458a..da8df9a 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -1967,6 +1967,7 @@ select option:focus { border-color: rgb(255 255 255 / 0.1); } .ti-form-checkbox { + margin-top: -3px; flex-shrink: 0; border-radius: 0.25rem; --tw-border-opacity: 1; -- libgit2 0.26.0