Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mySkill-x
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
angular
mySkill-x
Commits
6e0ab1a3
Commit
6e0ab1a3
authored
Mar 27, 2025
by
Nattana Chaiyamat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PMS แก้ให้แสดงกรณีข้อมูลเป็นnull
parent
79b5b9fc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
16 deletions
+17
-16
pms-evalution.component.html
...ce-evaluation/pms-evaluation/pms-evalution.component.html
+9
-8
appraisal-pms-form.model.ts
src/app/shared/model/appraisal-pms-form.model.ts
+8
-8
No files found.
src/app/components/performance-evaluation/pms-evaluation/pms-evalution.component.html
View file @
6e0ab1a3
...
...
@@ -41,7 +41,8 @@
<span>
ชื่อ-สกุล
</span>
</div>
<div
class=
"col-span-3 p-2 border pb-4"
>
<span>
{{appraisalPms.data.apsassessy.prefix.tdesc || ""}}
<span>
{{appraisalPms.data.apsassessy.prefix?.tdesc || ""}}
{{appraisalPms.data.apsassessy.thFullName || ""}}
</span>
</div>
</div>
...
...
@@ -50,7 +51,7 @@
<span>
ชื่อ-สกุล
</span>
</div>
<div
class=
"col-span-3 p-2 border pb-4"
>
<span>
{{appraisalPms.data.apsapprove1.prefix.tdesc || ""}}
<span>
{{appraisalPms.data.apsapprove1.prefix
?
.tdesc || ""}}
{{appraisalPms.data.apsapprove1.thFullName || ""}}
</span>
</div>
</div>
...
...
@@ -67,7 +68,7 @@
<span>
ตำแหน่ง (Position)
</span>
</div>
<div
class=
"col-span-1 p-2 border pb-4"
>
<span>
{{appraisalPms.data.apsassessy.position.tdesc || ""}}
</span>
<span>
{{appraisalPms.data.apsassessy.position
?
.tdesc || ""}}
</span>
</div>
</div>
<div
class=
"col-span-3 grid grid-cols-4"
>
...
...
@@ -81,7 +82,7 @@
<span>
ตำแหน่ง (Position)
</span>
</div>
<div
class=
"col-span-1 p-2 border pb-4"
>
<span>
{{appraisalPms.data.apsapprove1.position.tdesc || ""}}
</span>
<span>
{{appraisalPms.data.apsapprove1.position
?
.tdesc || ""}}
</span>
</div>
</div>
</div>
...
...
@@ -91,13 +92,13 @@
<span>
ฝ่าย (Department)
</span>
</div>
<div
class=
"col-span-1 p-2 border pb-4"
>
<span>
{{appraisalPms.data.apsassessy.bu1.tdesc || ""}}
</span>
<span>
{{appraisalPms.data.apsassessy.bu1
?
.tdesc || ""}}
</span>
</div>
<div
class=
"col-span-1 p-2 border pb-4"
>
<span>
แผนก (Section)
</span>
</div>
<div
class=
"col-span-1 p-2 border pb-4"
>
<span>
{{appraisalPms.data.apsassessy.bu2.tdesc || ""}}
</span>
<span>
{{appraisalPms.data.apsassessy.bu2
?
.tdesc || ""}}
</span>
</div>
</div>
<div
class=
"col-span-3 grid grid-cols-4"
>
...
...
@@ -105,13 +106,13 @@
<span>
ฝ่าย (Department)
</span>
</div>
<div
class=
"col-span-1 p-2 border pb-4"
>
<span>
{{appraisalPms.data.apsapprove1.bu1.tdesc || ""}}
</span>
<span>
{{appraisalPms.data.apsapprove1.bu1
?
.tdesc || ""}}
</span>
</div>
<div
class=
"col-span-1 p-2 border pb-4"
>
<span>
แผนก (Section)
</span>
</div>
<div
class=
"col-span-1 p-2 border pb-4"
>
<span>
{{appraisalPms.data.apsapprove1.bu2.tdesc || ""}}
</span>
<span>
{{appraisalPms.data.apsapprove1.bu2
?
.tdesc || ""}}
</span>
</div>
</div>
</div>
...
...
src/app/shared/model/appraisal-pms-form.model.ts
View file @
6e0ab1a3
...
...
@@ -116,17 +116,17 @@ export interface MasfromStatusType {
export
interface
Apsassessy
{
employeeId
:
string
bossId
:
string
prefix
:
Prefix
prefix
?
:
Prefix
fname
:
string
lname
:
string
efname
:
string
elname
:
string
bu1
:
Bu1
bu2
:
Bu2
bu1
?
:
Bu1
bu2
?
:
Bu2
bu3
:
Bu3
bu4
:
Bu4
bu5
:
Bu5
position
:
Position
position
?
:
Position
job
:
Job
pl
:
Pl
status
:
Status
...
...
@@ -223,17 +223,17 @@ export interface Time0 {
export
interface
Apsapprove1
{
employeeId
:
string
bossId
:
string
prefix
:
Prefix2
prefix
?
:
Prefix2
fname
:
string
lname
:
string
efname
:
string
elname
:
string
bu1
:
Bu12
bu2
:
Bu22
bu1
?
:
Bu12
bu2
?
:
Bu22
bu3
:
Bu32
bu4
:
Bu42
bu5
:
Bu52
position
:
Position2
position
?
:
Position2
job
:
Job2
pl
:
Pl2
status
:
Status2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment