Skip to content

M
myAppraisal
Commit 12b28a7f by kantavee
Options

Merge branch 'DEV' of https://mygit.myhr.co.th/angular/myAppraisal into DEV

parents ba1fe705 9ad9b4b8
Showing with 53 additions and 45 deletions
src/app/components/job-detail-components/job-detail-management/import-data/import-data.component.html
<div class="text-lg font-sm pt-2rem pb-1rem text-primary"> <div class="w-full min-height-50px mb-10px justify-between items-center">
<!-- รายละเอียดสาขาและหน่วยธุรกิจ -->
</div>
<div class="page">
<div class=" border-gray-200 dark:border-white/10">
<nav class="flex rtl:space-x-reverse">
<a class="border-b w-28 justify-center rounded-t-sm hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 text-sm font-medium text-center border-1 text-gray-600 hover:text-gray-900 dark:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-gray-300 active"
href="javascript:void(0);" id="card-type-item-1" data-hs-tab="#card-type-1" aria-controls="card-type-1">
นำเข้าข้อมูล
</a>
</nav>
</div>
<div style="padding-top: 50px;">
<div id="card-type-1" role="tabpanel" aria-labelledby="card-type-item-1">
<div class="header-title-type">
<div class="flex justify-between"> <div class="flex justify-between">
<div class="flex pr-2"> <div class="flex pr-2">
<!-- Content ของ div แรก --> <!-- Content ของ div แรก -->
...@@ -23,7 +8,7 @@ ...@@ -23,7 +8,7 @@
นำเข้าข้อมูล นำเข้าข้อมูล
</button> </button>
<a class="mx-2 justify-center -mb-px inline-flex items-center gap-2 text-sm font-medium text-center text-secondary border-secondary border-b-2 dark:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-gray-300 align-items-end" <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);"> href="javascript:void(0);">
ดาวโหลดตัวอย่างไฟล์ ดาวโหลดตัวอย่างไฟล์
</a> </a>
...@@ -63,10 +48,11 @@ ...@@ -63,10 +48,11 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="page px-rem"> <div class="page px-rem">
<div class="overflow-auto shadow-md rounded-t-md"> <div class="overflow-auto rounded-top-0.65rem">
<table class="ti-custom-table ti-custom-table-head ti-custom-table-hover"> <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover">
<thead> <thead>
<tr> <tr>
...@@ -185,12 +171,25 @@ ...@@ -185,12 +171,25 @@
</div> </div>
</div> </div>
<div class="ti-modal-body "> <div class="ti-modal-body ">
<label for="input-label" class="ti-form-label mt-2rem">ฝ่าย</label> <label for="input-label" class="ti-form-label mt-2rem">รหัสงาน</label>
<input type="text" id="input-label" class="ti-form-input w-1/2" [(ngModel)]="job.jobid"> <input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly" readonly>
<label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)</label> <label for="detail_th" class="ti-form-label mt-2rem">ชื่อลักษณะงาน (ไทย)</label>
<input type="text" id="detail_th" class="ti-form-input h-16" [(ngModel)]="job.tdesc"> <input type="text" id="detail_th" class="ti-form-input w-1/2">
<label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)</label> <label for="detail_eng" class="ti-form-label mt-2rem">ชื่อลักษณะงาน (อังกฤษ)</label>
<input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="job.edesc"> <input type="text" id="detail_eng" class="ti-form-input w-1/2">
<label for="detail_eng" class="ti-form-label mt-2rem">ตำแหน่ง</label>
<input type="text" id="detail_eng" class="ti-form-input w-1/2">
<label for="detail_eng" class="ti-form-label mt-2rem">ระดับงาน</label>
<input type="text" id="detail_eng" class="ti-form-input w-1/2">
<label for="detail_eng" class="ti-form-label mt-2rem">แผนก</label>
<input type="text" id="detail_eng" class="ti-form-input w-1/2">
<label for="detail_eng" class="ti-form-label mt-2rem">ส่วน</label>
<input type="text" id="detail_eng" class="ti-form-input w-1/2">
<label for="detail_eng" class="ti-form-label mt-2rem">ฝ่าย</label>
<input type="text" id="detail_eng" class="ti-form-input w-1/2">
<label for="detail_eng" class="ti-form-label mt-2rem">ตำแหน่งผู้บังคับบัญชา</label>
<input type="text" id="detail_eng" class="ti-form-input h-16">
<label for="detail_eng" class="ti-form-label mt-2rem">วัตถุประสงค์ของตำแหน่งงาน (Objective)</label>
<div class="flex justify-end mt-2rem mb-1rem"> <div class="flex justify-end mt-2rem mb-1rem">
<button type="button" <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" 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"
...@@ -250,13 +249,26 @@ ...@@ -250,13 +249,26 @@
</div> </div>
</div> </div>
<div class="ti-modal-body "> <div class="ti-modal-body ">
<label for="input-label" class="ti-form-label mt-2rem">ฝ่าย</label> <label for="input-label" class="ti-form-label mt-2rem">รหัสงาน</label>
<input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly" <input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly" readonly>
[(ngModel)]="job.jobid" readonly> <label for="detail_th" class="ti-form-label mt-2rem">ชื่อลักษณะงาน (ไทย)</label>
<label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)</label> <input type="text" id="detail_th" class="ti-form-input w-1/2">
<input type="text" id="detail_th" class="ti-form-input h-16" [(ngModel)]="job.tdesc"> <label for="detail_eng" class="ti-form-label mt-2rem">ชื่อลักษณะงาน (อังกฤษ)</label>
<label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)</label> <input type="text" id="detail_eng" class="ti-form-input w-1/2">
<input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="job.edesc"> <label for="p_eng" class="ti-form-label mt-2rem">ตำแหน่ง</label>
<input type="text" id="p_eng" class="ti-form-input w-1/2">
<label for="bu1" class="ti-form-label mt-2rem">ระดับงาน</label>
<input type="text" id="bu1" class="ti-form-input w-1/2">
<label for="bu2" class="ti-form-label mt-2rem">แผนก</label>
<input type="text" id="bu2" class="ti-form-input w-1/2">
<label for="bu3" class="ti-form-label mt-2rem">ส่วน</label>
<input type="text" id="bu3" class="ti-form-input w-1/2">
<label for="bu4" class="ti-form-label mt-2rem">ฝ่าย</label>
<input type="text" id="bu4" class="ti-form-input w-1/2">
<label for="bu5" class="ti-form-label mt-2rem">ตำแหน่งผู้บังคับบัญชา</label>
<input type="text" id="bu5" class="ti-form-input w-1/2">
<label for="obj" class="ti-form-label mt-2rem">วัตถุประสงค์ของตำแหน่งงาน (Objective)</label>
<input type="text" id="obj" class="ti-form-input h-16">
<div class="flex justify-end mt-2rem mb-1rem"> <div class="flex justify-end mt-2rem mb-1rem">
<button type="button" <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" 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"
...@@ -308,7 +320,3 @@ ...@@ -308,7 +320,3 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div>
\ No newline at end of file
src/app/components/job-detail-components/job-detail-management/job-detail-management.component.html
<app-page-header [pathTitle]="pathTitle"></app-page-header> <app-page-header [pathTitle]="pathTitle"></app-page-header>
<div class="bg-card-white"> <div class="bg-card-white">
</div> </div>
<div class="block-main-content"> <div class="block-main-content">
<div class="text-lg font-bold py-2 text-primary px-8 "> <div class="font-size-18px font-weight-700 pt-1.5rem text-primary px-2rem">
ข้อมูลทั่วไป ข้อมูลทั่วไป
</div> </div>
<div class="page"> <div class="page pt-0.75rem">
<div class="border-b border-gray-200 dark:border-white/10 px-8"> <div class="border-b border-gray-200 dark:border-white/10 px-2rem">
<nav class="-mb-0.5 flex space-x-6 rtl:space-x-reverse"> <nav class="-mb-0.5 flex space-x-6 rtl:space-x-reverse">
<a class="text-base font-medium hs-tab-active:text-lg hs-tab-active:font-bold hs-tab-active:border-secondary hs-tab-active:text-secondary pb-3 inline-flex items-center gap-2 border-b-[3px] border-transparent whitespace-nowrap text-gray-500 dark:text-white/70 hover:text-secondary active" <a class="font-size-16px font-weight-500 hs-tab-active:font-weight-700 hs-tab-active:border-secondary hs-tab-active:text-secondary pb-3 inline-flex items-center gap-2 border-b-[3px] border-transparent whitespace-nowrap text-gray-500 hover:text-secondary active"
href="javascript:void(0);" id="underline-item-1" data-hs-tab="#underline-1" href="javascript:void(0);" id="underline-item-1" data-hs-tab="#underline-1"
aria-controls="underline-1" aria-controls="underline-1"
(click)="pathTitle = ['การจัดการรายละเอียดงาน', 'ข้อมูลทั่วไป']"> (click)="pathTitle = ['การจัดการรายละเอียดงาน', 'นำเข้าข้อมูล']">
ข้อมูลทั่วไป นำเข้าข้อมูล
</a> </a>
</nav> </nav>
</div> </div>
<div class="mt-3 px-3rem"> <div class="mt-3 px-2rem">
<div id="underline-1" role="tabpanel" aria-labelledby="underline-item-1"> <div id="underline-1" role="tabpanel" aria-labelledby="underline-item-1">
<app-import-data></app-import-data> <app-import-data ></app-import-data>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment