parent
89490e800c
commit
c4c88cf246
1 changed files with 4 additions and 1 deletions
|
|
@ -200,6 +200,9 @@ export class ReoportController {
|
||||||
"evaluation.commanderAbovePositionOld",
|
"evaluation.commanderAbovePositionOld",
|
||||||
"evaluation.commanderAboveOrg",
|
"evaluation.commanderAboveOrg",
|
||||||
"evaluation.commanderAboveOrgOld",
|
"evaluation.commanderAboveOrgOld",
|
||||||
|
"evaluation.root",
|
||||||
|
"evaluation.assignedPosition",
|
||||||
|
"evaluation.assignedPosLevel",
|
||||||
|
|
||||||
"education.educationLevel",
|
"education.educationLevel",
|
||||||
"education.institute",
|
"education.institute",
|
||||||
|
|
@ -345,7 +348,7 @@ export class ReoportController {
|
||||||
oc: evaluation.oc ? evaluation.oc.replace(/\n/g, " ") : "-",
|
oc: evaluation.oc ? evaluation.oc.replace(/\n/g, " ") : "-",
|
||||||
org: org ? org : "-", //สังกัด
|
org: org ? org : "-", //สังกัด
|
||||||
orgNoNewLine: _orgNoNewLine ? _orgNoNewLine : "-", //สังกัดแบบไม่เว้นวรรค
|
orgNoNewLine: _orgNoNewLine ? _orgNoNewLine : "-", //สังกัดแบบไม่เว้นวรรค
|
||||||
root: evaluation.salaries.length > 0 ? evaluation.salaries[0].orgRoot : "-", //หน่วยงาน
|
root: evaluation.root ?evaluation.root : "-", //หน่วยงาน
|
||||||
child1: evaluation.salaries.length > 0 // กอง / ศูนย์ / ส่วน
|
child1: evaluation.salaries.length > 0 // กอง / ศูนย์ / ส่วน
|
||||||
? evaluation.salaries[0].orgChild1
|
? evaluation.salaries[0].orgChild1
|
||||||
: "-",
|
: "-",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue