Skip to content

M
mySkill-x
Commit 714e59a4 by Nattana Chaiyamat
Options

แผนพัฒนาบุคคลากร

parent b7e5d4c4
Showing with 101 additions and 25 deletions
src/app/components/performance-evaluation/pms-form-employee/pms-form-employee.component.html
...@@ -98,6 +98,13 @@ ...@@ -98,6 +98,13 @@
</td> </td>
</tr> </tr>
<tr class="!border-0"> <tr class="!border-0">
<td class="font-medium !p-2 align-start">ชื่อ - สกุล</td>
<td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start">
{{evaluatee.data.thFullName}}
</td>
</tr>
<tr class="!border-0">
<td class="font-medium !p-2 align-start">ตำเเหน่ง</td> <td class="font-medium !p-2 align-start">ตำเเหน่ง</td>
<td class="!p-2 align-start">:</td> <td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start !text-warp"> <td class="font-medium !p-2 align-start !text-warp">
...@@ -119,24 +126,17 @@ ...@@ -119,24 +126,17 @@
</td> </td>
</tr> </tr>
<tr class="!border-0"> <tr class="!border-0">
<td class="font-medium !p-2 align-start">ส่วน</td> <td class="font-medium !p-2 align-start">ระดับ</td>
<td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start !text-warp">
{{evaluatee.data.bu3.tdesc}}
</td>
</tr>
<tr class="!border-0">
<td class="font-medium !p-2 align-start">ส่วนย่อย 1</td>
<td class="!p-2 align-start">:</td> <td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start !text-warp"> <td class="font-medium !p-2 align-start !text-warp">
{{evaluatee.data.bu4.tdesc}} {{evaluatee.data.pl.tdesc}}
</td> </td>
</tr> </tr>
<tr class="!border-0"> <tr class="!border-0">
<td class="font-medium !p-2 align-start">ส่วนย่อย 2</td> <td class="font-medium !p-2 align-start">E-mail</td>
<td class="!p-2 align-start">:</td> <td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start !text-warp"> <td class="font-medium !p-2 align-start !text-warp">
{{evaluatee.data.bu5.tdesc}} {{evaluatee.data.email}}
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
src/app/components/performance-evaluation/pms-form-employee/pms-idp/pms-idp.component.html
...@@ -2,18 +2,93 @@ ...@@ -2,18 +2,93 @@
<ng-template #idpEvaluation> <ng-template #idpEvaluation>
<ng-container *ngIf="appraisalIdp"> <ng-container *ngIf="appraisalIdp">
<div style="overflow-y: auto;" [ngStyle]="{'height': canSave?'calc(100vh - 414px)':'calc(100vh - 285px)'}"> <div style="overflow-y: auto;" [ngStyle]="{'height': canSave?'calc(100vh - 414px)':'calc(100vh - 285px)'}">
<div class="pb-2rem"> <div class="pt-1 pb-2">
<div class="font-size-18px font-weight-700 text-primary">
แผนพัฒนาบุคคลากรรายบุคคล
</div>
</div>
<div class="pb-2rem">
<div class="font-size-18px font-weight-700 text-gray-500"> <div class="font-size-18px font-weight-700 text-gray-500">
ส่วนที่ 1: ข้อมูลทั่วไป ส่วนที่ 1: ข้อมูลทั่วไป
</div> </div>
</div> </div>
<div class="pb-2rem"> <div class="pt-2 pb-2rem">
<div class="grid grid-cols-6"> <div class="flex flex-row gap-2 ">
<div class="w-1/2 border flex flex-col shadow" style="border-radius: 20px;">
<div class="w-full bg-soft-secondary text-primary p-3" style="border-radius: 20px 20px 0 0;">
<span class="font-size-18px font-weight-700">ผู้ใต้บังคับบัญชา</span>
</div>
<div class="w-full p-2">
<table class="ti-custom-table border-0 ellipsis-text">
<tbody>
<tr class="!border-0">
<td class="font-medium !p-2 align-start">ชื่อ - สกุล</td>
<td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start">
{{appraisalIdp.apsassessy.thFullName || ''}}
</td>
</tr>
<tr class="!border-0">
<td class="font-medium !p-2 align-start">ตำเเหน่ง</td>
<td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start !text-warp">
{{appraisalIdp.apsassessy.position.tdesc || ''}}
</td>
</tr>
<tr class="!border-0">
<td class="font-medium !p-2 align-start">งาน</td>
<td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start !text-warp">
{{appraisalIdp.apsassessy.job.tdesc || ""}}
</td>
</tr>
<tr class="!border-0">
<td class="font-medium !p-2 align-start">ฝ่าย</td>
<td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start !text-warp">
{{appraisalIdp.apsassessy.bu1.tdesc}}
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="w-1/2 border flex flex-col shadow" style="border-radius: 20px;">
<div class="w-full bg-soft-secondary text-primary p-3" style="border-radius: 20px 20px 0 0;">
<span class="font-size-18px font-weight-700">ผู้บังคับบัญชา</span>
</div>
<div class="w-full p-2">
<table class="ti-custom-table border-0 ellipsis-text">
<tbody>
<tr class="!border-0">
<td class="font-medium !p-2 align-start">ชื่อ - สกุล</td>
<td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start">
{{appraisalIdp.boss.thFullName || ''}}
</td>
</tr>
<tr class="!border-0">
<td class="font-medium !p-2 align-start">ตำเเหน่ง</td>
<td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start !text-warp">
{{appraisalIdp.boss.position.tdesc || ''}}
</td>
</tr>
<tr class="!border-0">
<td class="font-medium !p-2 align-start">งาน</td>
<td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start !text-warp">
{{appraisalIdp.boss.job.tdesc || ""}}
</td>
</tr>
<tr class="!border-0">
<td class="font-medium !p-2 align-start">ฝ่าย</td>
<td class="!p-2 align-start">:</td>
<td class="font-medium !p-2 align-start !text-warp">
{{appraisalIdp.boss.bu1.tdesc}}
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<!-- <div class="grid grid-cols-6">
<div class="col-span-6 grid grid-cols-6"> <div class="col-span-6 grid grid-cols-6">
<div class="col-span-3 border p-2 pb-4"> <div class="col-span-3 border p-2 pb-4">
<span>ผู้ใต้บังคับบัญชา</span> <span>ผู้ใต้บังคับบัญชา</span>
...@@ -82,14 +157,14 @@ ...@@ -82,14 +157,14 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
</div> </div>
<div class="pb-2rem"> <div class="pb-2">
<div class="font-size-18px font-weight-700 text-gray-500"> <div class="font-size-18px font-weight-700 text-gray-500">
ส่วนที่ 2: แนวทางการพัฒนา ส่วนที่ 2: แนวทางการพัฒนา
</div> </div>
</div> </div>
<div class="py-1rem"> <div class="pb-2">
<div class="py-2 grid grid-cols-6 gap-3"> <div class="py-2 grid grid-cols-6 gap-3">
<div class="col-span-6">หมายเหตุ : กรณี HR จัดอบรมให้ต้องเป็นไปตามเกณฑ์ที่ส่วนกลางกำหนดขึ้น</div> <div class="col-span-6">หมายเหตุ : กรณี HR จัดอบรมให้ต้องเป็นไปตามเกณฑ์ที่ส่วนกลางกำหนดขึ้น</div>
<div class="col-span-6 grid grid-cols-6 gap-2"> <div class="col-span-6 grid grid-cols-6 gap-2">
...@@ -126,13 +201,14 @@ ...@@ -126,13 +201,14 @@
</div> </div>
</div> </div>
</div> </div>
<div class="pb-2rem"> <div>
<div class=" rounded-top-0.65rem"> <div class=" rounded-top-0.65rem">
<table class="ti-custom-table ti-custom-table-head ti-custom-table-hover2"> <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover2">
<thead class="height-50px"> <thead class="height-50px">
<tr class="font-size-12px"> <tr class="font-size-12px">
<th scope="col" rowspan="3" <th scope="col" rowspan="3"
class="relative px-10px py-10px bg-soft-secondary text-primary !text-center"> class="relative px-10px py-10px bg-soft-secondary text-primary !text-center"
style="border-radius: 20px 20px 0 0;">
<span <span
class="font-size-12px font-weight-700 ">{{'สมรรถนะที่พัฒนา\n(Competency)'}}</span> class="font-size-12px font-weight-700 ">{{'สมรรถนะที่พัฒนา\n(Competency)'}}</span>
<div class="absolute top-1/2 transform -translate-y-1/2 right-0"> <div class="absolute top-1/2 transform -translate-y-1/2 right-0">
......
src/app/shared/model/employee.model.ts
...@@ -288,7 +288,7 @@ export class MyEmployeeModel implements EmployeeModel { ...@@ -288,7 +288,7 @@ export class MyEmployeeModel implements EmployeeModel {
this.ssoFlag = data?.ssoFlag || "" this.ssoFlag = data?.ssoFlag || ""
this.thFullName = data?.thFullName || "" this.thFullName = data?.thFullName || ""
this.engFullName = data?.engFullName || "" this.engFullName = data?.engFullName || ""
this.pl = new MyPLModel(data?.workarea || {}) this.pl = new MyPLModel(data?.pl || {})
this.resignDate = data?.resignDate || "" this.resignDate = data?.resignDate || ""
} }
} }
......
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